Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,319 Commits 4 Branches 146 Tags
ce742dc7a07505e5e5fb015b601343b32855e325
Commit Graph

721 Commits

Author SHA1 Message Date
Vincent-Michael
ce742dc7a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
 2013-09-09 18:26:31 +02:00
joschiwald
f66120060a Scripts/Spells: drop obsolete code 2013-09-07 01:21:36 +02:00
Vincent-Michael
be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
 2013-09-06 21:55:19 +02:00
joschiwald
e5af3e25f9 -.- 2013-09-06 21:18:07 +02:00
joschiwald
49e2ad73d2 Fixed build 2013-09-06 21:16:09 +02:00
joschiwald
adef15cd0f Core/Spells: add an other condition to SpellInfo::NeedsToBeTriggeredByCaster to correct spells with are wrongly triggered by target instead of caster 
- convert archavons rock shards to spellscript (now it works properly)
- add a spellscript for one spell that can't be corrected by this (and delete the sai hack, now i uses the correct spell)
 2013-09-06 20:57:38 +02:00
Vincent-Michael
d25c2e7f5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp
 2013-09-05 16:46:14 +02:00
joschiwald
7ef1f0738b Core/Battlegrounds/IoC: fix fortress teleport pads 
(and replace a hack with an other hack)

Closes #5846
Closes #7993
Ref #8984
 2013-09-05 00:59:22 +02:00
Vincent-Michael
611d51af98 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_debug.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-09-02 22:53:44 +02:00
Aokromes
59667ee606 Core/Spells: move debug log into debug mode 2013-09-02 09:41:46 +02:00
Vincent-Michael
6c8d0e5405 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-31 21:52:15 +02:00
Vincent-Michael
b1721a65ee Core/Spells: Fix quest credit for quest "Death Comes From On High" 2013-08-31 17:42:04 +02:00
Vincent-Michael
224c5c5d3d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-08-30 21:43:02 +02:00
Nay
1903d4ca7d Core/Server: Fix a spammy warning in WorldSession and move code to .cpp 2013-08-30 15:44:17 +01:00
Vincent-Michael
738a781468 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
 2013-08-29 20:55:20 +02:00
Kirkhammett
e23b6436c5 Core/Quests: Escape from Silverbrook 12308 2013-08-29 14:37:29 +02:00
joschiwald
76171984f1 Scripts/Spells: fix codestyle in 48783b8606 2013-08-29 03:08:08 +02:00
Kirkhammett
48783b8606 Core/Quests: Fuel for the Fire (12690) 2013-08-29 00:50:14 +02:00
Vincent-Michael
3166638078 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
 2013-08-28 19:24:01 +02:00
Nay
a7527b3b48 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h
 2013-08-25 14:12:32 +01:00
Nay
12973de799 Core&Tools: Fix multiple issues found by a static code coverage tool 2013-08-24 22:57:22 +01:00
Vincent-Michael
9eb01d63bd Core: Fix warnings 2013-08-18 13:54:20 +02:00
Vincent-Michael
7dbf68cbfc Scripted/Misc: Remove some whitespace 2013-08-18 02:07:13 +02:00
joschiwald
2b19ba1879 Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes 2013-08-18 01:41:10 +02:00
Vincent-Michael
c32dbd1432 Core/Spells: Fix hunter T7 4P Bonus 
Closes #8320
 2013-08-18 00:55:44 +02:00
Xanvial
01178f5958 Core/Spells: Fix paladin talent "Grand Crusader" 
Closes #9072

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-08-16 00:04:52 +02:00
Vincent-Michael
21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren
4d260a54ae Core/Spells: Fixed warrior T10 4p dps bonus 
Closes #493
 2013-08-15 16:39:31 +02:00
Vincent-Michael
4c64e407b7 Core/Spells: Convert hunter "Improved Mend Pet" in spell script 
Closes #5597
Closes #9006
Closes #10346
 2013-08-11 19:23:21 +02:00
Vincent-Michael
fa0aaa5fa4 Core/Spells: Some cleanup and missing stuff in a6eee516bd 2013-08-11 01:46:29 +02:00
Vincent-Michael
a6eee516bd Core/Spells: Fix typo in 51a7f3408f (thx to Sar777) 2013-08-11 00:26:44 +02:00
Vincent-Michael
99aa4649d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/CMakeLists.txt
 2013-08-09 20:02:21 +02:00
Vincent-Michael
8aff3945f2 Scripted: Fix non pch build 2013-08-09 20:00:18 +02:00
untaught
92fdb7aed1 DB/SAI: Fix quest Jormuttar is Soo Fat... 
Scripts/Spells: Script spell Bear Flank Master

Closes #10484
 2013-08-09 12:55:26 +01:00
Vincent-Michael
2daa8ed56f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-08-07 20:07:05 +02:00
joschiwald
0667e89005 Scripts/DrakTharonKeep: add some spellscripts, add yells to novos, and do some cosmetic changes 2013-08-07 17:31:36 +02:00
Vincent-Michael
c0fc0f237f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/shared/DataStores/DBCFileLoader.h
 2013-08-07 11:59:51 +02:00
Kirkhammett
c8bfb9cf4d DB&Scripts/Icecrown: Fix quest The Last Line Of Defense and script Argent Cannons 
Closes #998
Closes #10460
 2013-08-06 23:16:03 +01:00
Vincent-Michael
26d090fa9a Core/Spells: Fix druid talent "Nature's Grace" 2013-08-01 22:02:14 +02:00
Shauren
3814bbdd46 Core/Misc: Fixed compile warnings 2013-08-01 18:03:48 +02:00
Vincent-Michael
b8b21ce1f8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-01 17:22:42 +02:00
Vincent-Michael
a71341bbcf Core/Spells: Fix rogue talent "Overkill" (thx to @timh52280) 
Close #10411
 2013-08-01 17:22:03 +02:00
Vincent-Michael
bab04cc5f8 Core/Spells: Fix try for logic fail in 4ba3c2e51d 2013-07-30 23:59:30 +02:00
Vincent-Michael
d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +02:00
Vincent-Michael
cb8f159cea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
 2013-07-29 17:11:25 +02:00
Nay
1bb3c4a2b4 Misc: Fix warnings and build 
Closes #10396
 2013-07-29 14:24:53 +01:00
Vincent-Michael
a08b52aa19 Core/Spells: Fix hunter talent "Improved Serpent Sting" 
Closes #10001
 2013-07-29 06:25:30 +02:00
Vincent-Michael
eef0d67bb7 Core/Spells: Cleanup for paladin 4.3.4 2013-07-28 19:07:58 +02:00
Vincent-Michael
0710f480b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2013-07-28 18:41:57 +02:00
Vincent-Michael
1a8b2ce466 DB/Spells: Fix warrior talent "Deep Wounds" 2013-07-28 17:58:10 +02:00