Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,884 Commits 4 Branches 146 Tags
8a8f4fa0d4e518e81434adde19022378b95eb727
Commit Graph

26884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armano
8a8f4fa0d4 Cleanup some whitespaces 2015-07-04 11:31:07 +02:00
DDuarte
678a08c8c5 Core: Fix multiple warnings 
Travis should be building again now
 2015-07-04 02:43:43 +01:00
DDuarte
0f082e8f92 Core/Executables: Add --version and -v to worldserver and bnetserver arguments 
Closes #14993
 2015-07-04 00:45:52 +01:00
DJScias
7e906d7b19 Tools/ConnectionPatcher: Add 'versions' file patching method 
* This is necessary to allow connection to 6.1.2 after the 6.2.0 update released. Patching is version aware.
* Link is hardcoded to a github page after suggestion from Aokromes, it is not tied to any server this way
* The usage is optional. To patch use the "-e" option
* OOP-ify the tool a bit

Original implementation by DJScias

Closes #14980
 2015-07-03 22:15:52 +02:00
Shauren
c24787f666 Buildsystem: Fixed disabling compiler warnings in dep for clang/icc 2015-07-03 11:19:27 +02:00
DDuarte
58adb74717 Dep: Disable 2 warnings in zmqpp and CascLib 2015-07-03 02:23:58 +01:00
DDuarte
ccfaf663aa Fix build and SQL import after cherry-picks 2015-07-03 02:10:54 +01:00
DDuarte
df15f87a9a DB/Schema: Increase size of ConditionValueX fields in world.conditions 
Required by bigger masks due to new races in MoP
 2015-07-03 01:33:52 +01:00
jackpoz
dbf51eee46 Scripts/EyeOfEternity: Fix crash added in d1853f693b 
Close https://github.com/TrinityCore/TrinityCore/issues/14984#issuecomment-118044904

(cherry picked from commit 275bb93034)
 2015-07-03 01:16:58 +01:00
jackpoz
e98b8fa7c5 Dep/G3D: Backport fix from G3D10 
(cherry picked from commit b9d5b194df)
 2015-07-03 01:16:51 +01:00
jackpoz
08f11ed515 CI/Travis: Report travis build as broken if new build warnings get added to the sources 
(cherry picked from commit 2b6ddce59b)
 2015-07-03 01:16:44 +01:00
mik1893
ee168cae9b Merge pull request #14797 from czw/3.3.5 
Core/Spells: Fix DK Death rune selection
(cherry picked from commit 94bb71e5a1)

Conflicts:
	src/server/game/Spells/Spell.cpp
 2015-07-03 01:16:12 +01:00
jackpoz
2dba70c655 Dep/gsoap: Turn off build warnings 
Disable -Wunused-parameter warnings in gsoap library to have a 0-warning build till the library gets updated

(cherry picked from commit 77f7f56268)
 2015-07-03 01:14:41 +01:00
robinsch
aac7374a09 Core/Unit: Fix issue with Divine Shield immunities 
Closes #14910

(cherry picked from commit 2263cb9e10)

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2015-07-03 01:13:24 +01:00
Carbenium
878548d94c Rename files after cherry-picks 2015-07-03 01:10:48 +01:00
mik1893
d5b1c3c2f9 Merge pull request #14898 from tkrokli/improved_devouring_plague 
[3.3.5] Core/Spells: Improved Devouring Plague spell direct damage
(cherry picked from commit 551c61b7ce)

Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
 2015-07-03 01:09:38 +01:00
jackpoz
6b30fbc238 Buildsystem/Clang: Suppress warning 
Suppress -Wmismatched-tags warnings on clang to avoid false positive warnings reported using gcc 4.8

(cherry picked from commit 879af88d21)
 2015-07-03 01:08:10 +01:00
mik1893
bc59f27e0d Merge pull request #14969 from chaodhib/taunt_threat_fixes 
[Spell] Fix bugged amount of threat given by Taunt
(cherry picked from commit aacd8feb61)

Conflicts:
	src/server/game/Spells/SpellEffects.cpp
 2015-07-03 01:07:44 +01:00
mik1893
587baa9409 Merge pull request #14976 from robinsch/wgTimer 
Core/WorldState: WG Interface timer
Closes issue  #14913
(cherry picked from commit c8df10dbc0)
 2015-07-03 01:07:14 +01:00
Mik1893
c7ca739711 Core/Creature: Fix UNIT_FLAG_IMMUNE_TO_PC validity for player pets 
related to #14780 and #14744

(cherry picked from commit accab5451d)
 2015-07-03 01:06:33 +01:00
jackpoz
0b745370dc Core/Texts: Fix race conditions in CreatureTextMgr repeat group 
Fix race conditions in CreatureTextMgr repeat group happening with MapThreads > 1 reported by helgrind by moving Creature-GUID-base data from CreatureTextMgr to Creature.
Issues added in bbf86641a1

(cherry picked from commit d123c81162)

Conflicts:
	src/server/game/Texts/CreatureTextMgr.cpp
 2015-07-03 01:05:22 +01:00
Dr-J
f803178819 DB/Misc: Dire Maul Tribute stuff 
still needs core support for instance script so boss states can be checked.

* Script Mizzle the Crafty / Cho'Rush the Observer
* Add missing texts and gossips to more npcs
* Script Guard Mol'Dar, Guard Fengus and Guard Slipkik to give there buffs to a player has king of the gordoc buff
* Script Captain Kromcrush event to allow skipping with Gordoc Ogre Suit (WP not complete)
(cherry picked from commit 170794a029)
 2015-07-03 00:58:12 +01:00
Rushor
1dc373aca4 DB/Creature: Add Stranglethorn SAIs 
closes #12570

(cherry picked from commit db3b22c63e)
 2015-07-03 00:57:00 +01:00
Aokromes
8c735503c6 DB/Creature: Remy "Two Times" 
By Killyana, closes #12616
(cherry picked from commit 28ef8431ee)
 2015-07-03 00:56:14 +01:00
MitchesD
2400ce05e0 Merge pull request #14748 from Rushor/druid 
Scripts/Spells: Curing the Sick - Add Questcredit
(cherry picked from commit d898ade5a9)
 2015-07-03 00:55:11 +01:00
Rushor
1ba42a1e35 DB/Quest: Ammo for Rumbleshot 
* one remaining problem: the shootanimation of the cannon, tempfix will be http://pastebin.com/ZbwUg41v
* closes #12582

(cherry picked from commit cdb16ea27f)
 2015-07-03 00:54:03 +01:00
Aokromes
dbe47f2c2c DB/Creature: Marshal Dughan 
By Killyana, closes #12615
(cherry picked from commit 82664273cc)
 2015-07-03 00:38:25 +01:00
Aokromes
81fdc45680 DB/Creature: Mountaineer Stormpike 
By Killyana, closes #12711
(cherry picked from commit 291fc4d591)
 2015-07-03 00:37:32 +01:00
joschiwald
80bc699874 Core/BG/SOA: fixed interaction with flags and titan relic 
Closes #13091

(cherry picked from commit 8afa15ef15)

Conflicts:
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
 2015-07-03 00:28:22 +01:00
Duarte Duarte
fd1b69eb3f Merge pull request #14988 from ShinDarth/cherry-picks-6 
Some cherry picks from 3.3.5a to 6.x
 2015-07-01 17:28:28 -07:00
ShinDarth
2c358619c1 Remove SQL files wrongly added in previous cherry-pick merge 2015-07-02 01:07:27 +02:00
Aokromes
dd73dae245 DB/Quest: Protecting our Own (horde) 
By Killyana, closes #10184
 2015-07-02 00:42:08 +02:00
Aokromes
79129e8760 DB/Item: Rumsey's alcohols 
By Killyana, closes #13036
 2015-07-02 00:42:08 +02:00
Aokromes
296998ee88 DB/Misc: Hex of Jammal'an 
By Killyana, closes #12705
 2015-07-02 00:42:08 +02:00
Aokromes
8570cc2338 DB/Creature: Kodo Calf + Kodo Matriarch 
By Killyana, closes #12547
 2015-07-02 00:42:08 +02:00
Rushor
33861ef92b DB/Creature: Forsaken Crossbowman 
* Enable Shootvisual in all phases
 2015-07-02 00:42:07 +02:00
Rushor
8eba3f71f9 DB/Creature: Complete UP Movement 2015-07-02 00:42:07 +02:00
Rushor
e82841eac9 DB/Creature: Dragonflayer Fanatic 
* Add Emotescript for Dragonflayer in the Startroom of UP
 2015-07-02 00:42:07 +02:00
Rushor
2be3f0bbe7 DB/Quest: Escape from the Staging Grounds 
closes #3724
 2015-07-02 00:42:07 +02:00
Rushor
f1e5b95bc5 DB/Creature: Scarlet Hound 
by @Killyana
closes #14743
 2015-07-02 00:42:07 +02:00
Rushor
0611fdfa9d DB/Creature: Finish Grizzlyhills Movement 2015-07-02 00:42:06 +02:00
Rushor
141df25731 DB/Creature: Grizzly Hills Giant - Visual 
* Add Stonevisual which will be thrown periodically towards to Dummies
 2015-07-02 00:42:06 +02:00
Rushor
52435329e1 DB/Creature: The Farstrider Lodge - Flavor texts 
closes
 2015-07-02 00:42:06 +02:00
Shauren
37e69b6954 Tools/Mapextractor: Updated dbc list 2015-07-02 00:31:40 +02:00
Shauren
9be3985b5c Core/PacketIO: Enabled auth opcodes 2015-07-02 00:31:25 +02:00
Shauren
cc7c5d8122 DB: Updated build data to 20182 2015-07-02 00:30:54 +02:00
Kinzcool
4bbbd9540a Core/Quests: Calculate the RewardMoney value with QuestMoneyReward.dbc and defined an unknown field 2015-07-01 17:57:09 -04:00
Kinzcool
97b6933435 DB/Quests: Updated quest_template up to 6.2.0 2015-07-01 17:52:46 -04:00
Rushor
43655c8fe1 Rename SQL files after cherry-picks 2015-07-01 21:36:59 +02:00
Aokromes
db25d2e3d1 DB/Creature: Gnome Engineer 
By Killyana, closes #12619
 2015-07-01 21:35:07 +02:00