Commit Graph

4768 Commits

Author SHA1 Message Date
joschiwald
99081bcf54 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-08-22 13:48:47 +02:00
joschiwald
8e833743d4 Scripts/GruulsLair: reworked InstanceScript
Known Issue: position desynch after creature respawn
2013-08-22 13:47:54 +02:00
Vincent-Michael
dc86e87f25 Scripted/ShadeOfAkama: Some cleanups 2013-08-21 19:58:12 +02:00
joschiwald
a383885f5c Scripts/AhnKahet: reworked InstanceScript 2013-08-21 19:43:46 +02:00
Vincent-Michael
1e89ae1960 Core: Fix warnings and random changes 2013-08-21 18:46:52 +02:00
joschiwald
62c7e309ee Scripts/BlackTemple: reworked InstanceScript 2013-08-21 12:29:28 +02:00
joschiwald
7a14e366ac Scripts/AzjolNerub: reworked InstanceScript 2013-08-20 23:05:00 +02:00
Shauren
296da5df12 Core/Commands: Improved debug moveflags to also send associated opcodes 2013-08-20 21:16:54 +02:00
joschiwald
7e3a52bb42 Scripts/HallsOfLightning: reworked InstanceScript 2013-08-20 18:11:41 +02:00
Vincent-Michael
34cd8e808e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
2013-08-20 17:48:18 +02:00
Shauren
44485a74ad Scripts/Icecrown Citadel: Fixed Ice Tomb targeting tanks in phase 3 in Sindragosa encounter
Closes #8778
2013-08-19 22:16:05 +02:00
joschiwald
e0f010b310 Scripts: Random script fixes and code optimizations 2013-08-19 20:03:06 +02:00
Vincent-Michael
f16f427c48 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp
2013-08-18 18:13:14 +02: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
Vincent-Michael
da1e466bd5 Core/Misc: Implemented GetObjectScale function 2013-08-17 23:47:43 +02:00
w1sht0l1v3
1ad954e215 Core/Scripts: Placeholders for instances Maraudon and Dire Maul.
It is needed for Random Dungeon Finder credit.
2013-08-17 19:14:48 +03:00
w1sht0l1v3
7c7f19228e Core/Scripts: Placeholders for instances The Slave Pens and The Underbog.
It is needed for Random Dungeon Finder credit.
2013-08-17 17:50:33 +03:00
w1sht0l1v3
0333d22fe9 Core/Scripts: Placeholder for instance Ragefire Chasm.
It is needed for Random Dungeon Finder credit.
2013-08-17 15:25:09 +03:00
w1sht0l1v3
7b9f34afc5 Core/Scripts: Placeholder for instance The Stockade.
It is needed for Random Dungeon Finder credit.
Correct entry for last encounter in the instance.
2013-08-17 14:59:49 +03:00
Vincent-Michael
74689b1d93 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-16 18:35:54 +02:00
MitchesD
90dcb2a448 Scripts/DrakTharonKeep: update Tharon'Ja
- update Tharon Ja to BossAI
- update one creature - cosmetic npc

Closes #10524
2013-08-16 14:34:42 +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
fd10e25813 Misc: Random changes here and there 2013-08-15 07:47:31 +02:00
Vincent-Michael
d823057ab8 Scriped/BaradinHold: Small cleanup in 595fcdee70 2013-08-14 19:50:47 +02:00
Vincent-Michael
595fcdee70 Scripted/BaradinHold: Add missing door for Alizabal 2013-08-14 19:48:53 +02:00
Vincent-Michael
11ecb9c633 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
2013-08-14 16:52:13 +02:00
Vincent-Michael
c8b722e4a4 Scripted/BaradinHold: Implemented Occu'thar 2013-08-14 13:36:07 +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
f506ee3077 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
2013-08-11 18:37:31 +02:00
Vincent-Michael
795e9327f7 Core/Spells: Fix hunter talent "Rapid Killing"
Close #1166
2013-08-11 18:19:17 +02:00
Nay
2abaf6224e Core/Player: Add debug log when SendCanTakeQuestResponse(INVALIDREASON_*) is used
Intent is to find broken quest chains
Requested by Aokromes
2013-08-11 16:36:36 +01:00
Vincent-Michael
9e45731f32 Scripted/ToC5: Add missing stuff in c0bf535e5b 2013-08-11 11:51:59 +02:00
Vincent-Michael
c0bf535e5b Core/Spells: Convert "Summon Memory" in spell script 2013-08-11 02:07:42 +02:00
Vincent-Michael
fa0aaa5fa4 Core/Spells: Some cleanup and missing stuff in a6eee516bd 2013-08-11 01:46:29 +02:00
Vincent-Michael
2e9547b4ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
2013-08-11 00:27:54 +02:00
Vincent-Michael
a6eee516bd Core/Spells: Fix typo in 51a7f3408f (thx to Sar777) 2013-08-11 00:26:44 +02:00
Kirkhammett
0161012c69 Scripts/ZulFarrak: Convert Witch Doctor Zum'rah from SAI to Cpp
Closes #10508
2013-08-10 20:36:45 +01:00
Vincent-Michael
bb9614d00d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
2013-08-10 17:58:53 +02:00
Vincent-Michael
8acefbff8c Scripted: Use now override for instance scripts 2013-08-10 17:42:12 +02:00
Discover-
488128bada DB/EAI: Fix unit_field changes, outdated since initial 3.x versions 2013-08-10 16:31:52 +01:00
Nay
b33f80aa18 Scripts/Pet: Fix non pch compile 2013-08-10 16:00:58 +01:00
Vincent-Michael
16b8bce334 Scripted: Fix more fail in ba6e62fd6e -.- 2013-08-10 16:55:59 +02:00
Vincent-Michael
dfd0575111 Scripted: Fix typo in ba6e62fd6e (thx to Shauren) 2013-08-10 16:49:38 +02:00
Vincent-Michael
ba6e62fd6e Scripted/BaradinHold: Implemented Pit Lord Argaloth
Note: Need some update with sniff
2013-08-10 16:35:06 +02:00
Vincent-Michael
2c6f5e1b61 Scripted: Remove Whitespace/Tabs 2013-08-09 20:37:09 +02:00