Commit Graph
16927 Commits
Author SHA1 Message Date
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
joschiwald e87402dd05 Core/Spells:
- corrected structure of SMSG_PET_CAST_FAILED (fixes highlighted action buttons)
- simplified spell focus check
2013-08-14 15:45:36 +02:00
Vincent-Michael c8b722e4a4 Scripted/BaradinHold: Implemented Occu'thar 2013-08-14 13:36:07 +02:00
Machiavelli 783021a8cb Fix non-pch compile 2013-08-13 14:47:45 +02:00
Vincent-Michael dd171f6070 Core/Vehicle: Fix spell focus check for vehicle caster 2013-08-12 21:57:19 +02:00
Kirkhammett faa2ec9732 Core/SAI: Additions to d0bde02b21
Signed-off-by: Nay <dnpd.dd@gmail.com>
2013-08-12 14:06:48 +01:00
Vincent-Michael 617e0c476b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_hunter.cpp
2013-08-12 13:36:42 +02:00
Vincent-Michael 147c7d5243 Core/Spells: Fix Rogue T10 4P bonus
Closes #4153
2013-08-12 13:04:52 +02:00
Vincent-Michael c18b347c61 Core/Battleground: Small code optimization 2013-08-12 01:31:28 +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 eefdceea71 Core/Spells: Fix client crash on pressing ESC at Using Steam Tonk Controller / Steam Tonk Controller
Closes #3010
2013-08-11 18:26:53 +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
Nay d0bde02b21 Core/CreatureAI: Do not remove clone_caster auras on evade (in addition to control_vehicle auras) 2013-08-11 15:52:23 +01:00
Nay 54d2b73f3c Merge pull request #10513 from Discover-/SmartAI-Casted-CreatureOrGo
Core/SmartAI: Drop support for SMART_ACTION_SEND_CASTCREATUREORGO. It is...
2013-08-11 06:26:52 -07:00
Vincent-Michael 9e45731f32 Scripted/ToC5: Add missing stuff in c0bf535e5b 2013-08-11 11:51:59 +02:00
Discover- 80bd5b363a Core/SmartAI: Drop support for SMART_ACTION_SEND_CASTCREATUREORGO. It is unused in the current newest TDB, it never even worked like it should and the exact same purpose of this function is already fulfilled by SMART_ACTION_CALL_CASTEDCREATUREORGO (the correct way). 2013-08-11 02:58:53 +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
Vincent-Michael c5ff184ebd Core/Scripts: Add missing stuff in 0161012c69 2013-08-10 23:16:36 +02:00
Nay 8b08fba98d Merge pull request #10501 from Discover-/SmartAI-Action-Set-Power
Core/SmartAI: Implement MART_ACTION_SET_POWER, SMART_ACTION_ADD_POWER and SMART_ACTION_REMOVE_POWER (param1 = powertype, para...
2013-08-10 12:39:32 -07:00
Kirkhammett 0161012c69 Scripts/ZulFarrak: Convert Witch Doctor Zum'rah from SAI to Cpp
Closes #10508
2013-08-10 20:36:45 +01:00
Nay 1c35bad513 Core/Chat: Fix a compile warning, locale is no longer used 2013-08-10 17:59:47 +01:00
Nay 482720da50 Core/BattlegroundAV: Fix team variable type, "if (team == ALLIANCE)" would always return false
Ref 33f8c3ead4da07ff024a94b5e8cf0d05c2ebc23a#L4R1626
2013-08-10 17:35:23 +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
Discover- 75ca3573c8 Core/SmartAI: Implement SMART_ACTION_SET_POWER, SMART_ACTION_ADD_POWER and SMART_ACTION_REMOVE_POWER (param1 = powertype, param2 = newPower). Required for upcoming EAI to SAI conversion (for ACTION_T_SET_UNIT_FIELD) (only SMART_ACTION_SET_POWER is required for the conversion but might as well do it right when on it). 2013-08-10 14:13:17 +02:00
Shauren 0e75857702 Core/PacketIO: Fixed object update failures
Closes #8105
2013-08-10 13:44:08 +02:00
Vincent-Michael 2c6f5e1b61 Scripted: Remove Whitespace/Tabs 2013-08-09 20:37:09 +02:00
Vincent-Michael a6d2faf163 Core: Fix build
(cherry picked from commit 81daef8b22)
2013-08-09 19:28:47 +01:00
Vincent-Michael 81daef8b22 Core: Fix build 2013-08-09 20:23:49 +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
Vincent-Michael dbb40dd4fe Scripted/Pets: Move some player pets in pet_xxx.cpp 2013-08-09 19:22:16 +02:00
Nay b7d88a3c46 Merge pull request #9817 from drskull/master
Core/Spell add another condition in AnyGroupedUnitInObjectRangeCheck
2013-08-09 08:46:19 -07:00
Nay eba8c2d345 Merge pull request #10464 from Discover-/SmartAI-Set-Active
Core/SmartAI: Allow SMART_ACTION_SET_ACTIVE to take a parameter for on/o...
2013-08-09 08:44:56 -07:00
Nay edf77a4cf6 Merge pull request #10493 from Discover-/SmartAI-Action-Sound-Update
Core/SmartAI: Rename SMART_ACTION_SOUND's parameters and get rid of an e...
2013-08-09 08:38:09 -07: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
Discover- bd2120593d Core/SmartAI: Rename SMART_ACTION_SOUND's parameters and get rid of an error that shouldn't be there. The method it calls doesn't take CreatureTextRange (enum) in consideration, but a boolean called onlySelf. 2013-08-09 01:05:56 +02:00
Vincent-Michael 80d7c093eb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-08 20:56:27 +02:00
MitchesD 8f50e30904 Scripts/DrakTharonKeep: update Trollgore
Closes #10453

Signed-off-by: joschiwald <joschiwald@online.de>
2013-08-08 00:25:53 +02:00
Malcrom 090f348d59 Scripting/Sethekk Halls: Move Boss Anzu from EAI to CPP and some cleanup. 2013-08-07 18:53:17 -02:30