Commit Graph
18015 Commits
Author SHA1 Message Date
Vincent-Michael 3eb2d615f3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
2014-04-23 06:22:39 +02:00
joschiwald 465e4a0b0f Core/Achievements: achievement earned message will now use broadcasttext instead of trinity_string 2014-04-23 01:14:20 +02:00
Vincent-Michael 5bb19ce017 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
2014-04-22 20:06:40 +02:00
joschiwald 583039c1c5 Core/SmartScripts: use broadcasttext instead of trinity_string in SMART_ACTION_FLEE_FOR_ASSIST and SMART_ACTION_CALL_FOR_HELP 2014-04-22 19:24:47 +02:00
joschiwald 742f32f15a Core/Texts: Implemented loading BroadcastTexts 2014-04-22 17:57:23 +02:00
joschiwald 805a026c6c DB/CreatureText: readd accidentally deleted text 2014-04-22 16:07:27 +02:00
joschiwald 6c0ff5717f Scripts/Gnomeregan: moved Blastmaster Emi gossip to db 2014-04-21 21:39:51 +02:00
Discover- 30e6b64551 Merge pull request #11917 from warmech/master
Fixed spelling typo in gnomeregan.cpp script.
2014-04-21 19:13:58 +02:00
Vincent-Michael cec7c9f07e Misc/Guild: Fix guild_xp_for_level structure (startup errors) 2014-04-21 17:46:53 +02:00
Vincent-Michael f5b02d1278 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:57:46 +02:00
Vincent-Michael 3a26a570f7 Core: Fix whitespace / tabs 2014-04-21 16:57:32 +02:00
joschiwald 6b52cef5bc Core/Spells: corrected implementation of SPELL_EFFECT_QUEST_START 2014-04-21 16:48:05 +02:00
Vincent-Michael 0ab9f938ad Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:35:36 +02:00
warmech 12b895e5ba Fixed spelling typo in gnomeregan.cpp script.
Fixed a typo on line 32 where [GOSSIP_START_EVENT "I am ready to being"] should read [GOSSIP_START_EVENT "I am ready to begin."]
2014-04-20 23:00:32 -05:00
Vincent-Michael d1618d2422 Core/Creature: Added better error output for wrong spawn mask 2014-04-21 01:09:43 +02:00
Vincent-Michael 81c99b3338 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/tools/map_extractor/dbcfile.h
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/adtfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
2014-04-20 22:54:39 +02:00
ZackTsuna 518190ee88 Core/Units: Don't set new power type if old power type is the same 2014-04-20 21:22:21 +02:00
Shauren 0f5632c70e Core/Misc: Fixed some -Weffc++ warnings 2014-04-20 16:48:35 +02:00
jackpoz e830225b21 Core/Misc: Fix change faction on dead Night Elves keeping the speed buff
Fix change faction on dead Night Elves causing the new player keeping the 175% wisp speed buff.
Players will be resurrected automatically on change faction.
Closes #255
2014-04-20 15:02:19 +02:00
Shauren fc538c5088 Tools: Enabled struct packing to ensure that structures are read from files properly 2014-04-20 14:49:44 +02:00
Vincent-Michael 40a29a3c99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
2014-04-20 11:33:40 +02:00
jackpoz fb6365ac68 Core/Misc: Check GetVictim() for NULL before dereferencing it
Add additional NULL checks all around the code before dereferencing GetVictim() result.
Keep in mind UpdateVictim() result has nothing to do with GetVictim() result and the caller shouldn't assume anything about GetVictim() based on UpdateVictim().
2014-04-20 00:38:25 +02:00
Vincent-Michael aa6ae2773f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
2014-04-19 22:49:25 +02:00
jackpoz 8ca6371793 Core/Misc: Ensure GetVictim() returns a valid reference when expected
Add a new method EnsureVictim() which asserts a valid not NULL reference will be returned to the caller. Use this whenever the GetVictim() would be dereferenced .
2014-04-19 21:48:22 +02:00
Vincent-Michael 8a110f2645 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Spells/spell_paladin.cpp
2014-04-19 19:57:46 +02:00
Warpten d9493d9cc9 Scripts/Ruby Sanctum: Fixed corporeality scaling changes.
Thanks to Unholychick.

P.S.: #9231 if still valid will be fixed soon (tm)
2014-04-19 19:18:51 +02:00
jackpoz 93a68a66c3 Core/MMAPs: Improve NPC behavior with fences and high climbs
Increase the max walkable angle and max walkable climb in MMAPs generator to allow NPCs to jump on fences and climb steps.
This requires MMAPs to be extracted again with mmaps_generator, old extracted MMAPs are still compatible but will not provide the benefits of this commit.
Fixes #9965
2014-04-19 15:35:13 +02:00
Unholychick 574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript
Closes #11896
Closes #3464
2014-04-18 20:21:05 +02:00
Vincent-Michael 89cc056a50 Fix 2014-04-18 17:02:04 +02:00
Vincent-Michael 20c9981578 Core/Misc: Added missing field in npc_text table for loading 2014-04-18 16:56:05 +02:00
QAston 57e78dac6b Merge pull request #11853 from Unholychick/patch-2
Done & taken procs & a few trinket fixes
2014-04-17 18:18:02 +02:00
joschiwald 8877a87c99 Merge pull request #11614 from MitchesD/kelthuzad
Scripts/Kelthuzad: move spells into spelldifficulty_dbc and cleanup
2014-04-17 02:02:51 +02:00
joschiwald fa472c6142 Merge pull request #11787 from MitchesD/misc
Scripts/ZulGurub: clean up the old code
2014-04-17 02:01:05 +02:00
joschiwald 0a014e1431 Scripts/UtgardeKeep: fixed some issues on Ingvar the Plunderer
Closes #10859
2014-04-17 00:09:43 +02:00
Unholychick 057169c21c Fix done & taken procs
Corrects the logic for dot/hot procs and fixes spells such as althor's abacus, egg of mortal essence, black magic, spiritual attunement etc etc.
Reverts the remaining part of 8edf6247c0
2014-04-15 00:03:01 +02:00
joschiwald 533cbf20bb Core/Spells: addition to b9a62115b1 2014-04-14 21:12:05 +02:00
untaught b9a62115b1 Core/Spells: fixed Relic of the Earthen Ring
Closes #11282
2014-04-14 19:48:13 +02:00
jackpoz ba61ec085d Scripts/Commands: Add comment about 9d58410739 changes 2014-04-13 16:02:41 +02:00
jackpoz 9d58410739 Scripts/Commands: Fix memory leak in ".gobject add" command
Valgrind log:
 158 (104 direct, 54 indirect) bytes in 1 blocks are definitely lost in loss record 24 of 73
 at operator new(unsigned long) (vg_replace_malloc.c:319)
 by GameObjectModel::Create(GameObject const&) (GameObjectModel.cpp:152)
 by GameObject::Create(unsigned int, unsigned int, Map*, unsigned int, float, float, float, float, float, float, float, float, unsigned int, GOState, unsigned int) (GameObject.cpp:237)
 by gobject_commandscript::HandleGameObjectAddCommand(ChatHandler*, char const*) (cs_gobject.cpp:155)
2014-04-13 15:01:20 +02:00
jackpoz dc58ec0d6c Scripts/Commands: ".modify speed" targets current Player by default
Allow ".modify speed" command to target current Player if there is no target or if the selected Unit is a Creature.
This behavior could be extended to other commands that require target Players.
2014-04-13 14:06:21 +02:00
jackpoz a07e82530f Scripts/Commands: Fix .mmap loc wrong coordinates
Fix .mmap loc command printing swapped x and y tile coordinates
2014-04-13 13:40:42 +02:00
Shauren e51976e17a Core/Spells: Fixed players being able to mount with all transform auras
Closes #11852
2014-04-13 01:06:46 +02:00
Warpten 17923c3c44 Scripts/Commands: Ensure gameobject template is valid from .gob add temp [...]
As per Aokrome's spamming. "Avoids false positive logs"
2014-04-12 14:45:51 +02:00
Vincent-Michael 5454e10b52 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
2014-04-11 23:12:12 +02:00
Nyeriah 870d5d9c45 [TW278] - Core/Scripts: Prevent multiple spawns of Ulag
http://www.wowhead.com/quest=1819/ulag-the-cleaver
2014-04-11 22:36:38 +02:00
MitchesD ab602837b1 Scripts/ZulGurub: clean up the code and remove old hacks 2014-04-11 18:43:38 +02:00
jackpoz 7b9b0edb5d Core/GameObjects: Fix crash with Summoning Ritual GOs
Fix a crash happening with GAMEOBJECT_TYPE_SUMMONING_RITUAL GameObjects if a Player clicked on the GO, logged out and let another Player click on it.
Issue added in 464c0c1611
Fixes #11856
2014-04-10 20:41:34 +02:00
Warpten 335fe8e1b0 Scripts/Ruby Sanctum: Fixed Halion engaging combat outside of his Flame Ring. 2014-04-10 14:28:58 +02:00
Vincent-Michael 4e59d0b922 Core/Chat: Fix build 2014-04-09 22:03:28 +02:00
Vincent-Michael 6131e4d722 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
2014-04-09 21:03:08 +02:00