Commit Graph
10407 Commits
Author SHA1 Message Date
Vincent-Michael 68b508df27 Core/GameEvent: Use game_event table for blizzard birthday 2014-04-26 02:05:29 +02:00
Vincent-Michael 1390621f4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
2014-04-25 23:42:40 +02:00
Vincent-Michael c81d6e9b4b Core/Texts:
* Enable some BroadcastTexts stuff (is not finish)
* Added reload command for broadcast_text table
ToDo:
- Enable: Sound/Emote stuff, etc.
- Auth base need refresh
2014-04-25 23:25:59 +02:00
Dehravor fa950a554a Core/WorldSocket: Fix crash when CMSG_AUTH_SESSION contains modified addon size value 2014-04-25 22:59:22 +02:00
jackpoz f27057bf24 Core/Misc: Fix build warnings 2014-04-25 21:46:43 +02:00
jackpoz 2585e799f9 Core/Misc: Change how Position struct is retrieved
Update Position::GetPosition() and similar methods signatures to reflect 2a4c9bcaf9 changes by return a Position object instead of accepting a Position parameter by reference.
2014-04-25 21:19:30 +02:00
Discover- 9c68103c21 Merge pull request #11938 from Dehravor/inspect
Core/Handlers: Add inspect distance and target checks
2014-04-25 15:19:41 +02:00
jackpoz eb711fd9e9 Core/LFG: Fix crash
Fix crash added in ab1d0512ea by adding an additional NULL check.
Fixes #11941
2014-04-25 11:35:32 +02:00
Vincent-Michael b6e028eb35 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-25 08:42:40 +02:00
jackpoz ab1d0512ea Core/LFG: Fix LFG GS requirement not updated until relog
Fix Player receiving "You do not meet the requirements for the chosen dungeons" for too low Gear Score level even after equipping items with high enough Gear Score.
2014-04-25 00:13:48 +02:00
Vincent-Michael 49630f42d4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Server/WorldSession.cpp
2014-04-24 22:02:46 +02:00
Dehravor abb97bac18 Core/Handlers: Add inspect distance and target checks 2014-04-24 14:34:19 +02:00
Shauren fe99d6ef76 Core/Movement: Fixed an exploit allowing players to crash the server by using modified movement packets 2014-04-24 10:22:57 +02:00
jackpoz 9d1afbba57 Core/Player: Check Player race and class on login
Don't allow login for Players with bad race/class combination to avoid any further crash later.
2014-04-23 21:37:27 +02:00
Vincent-Michael b39ba5656e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-23 20:05:45 +02:00
jackpoz 6b42f99540 Core/AuctionHouse: Fix AuctionHouse exploit
Fix an exploit in Auction House using either CheatEngine or WPE that allowed to sell more items than the Player had in inventory or to crash worldserver.
Fixes #11831
Fixes #11928
2014-04-23 20:01:20 +02:00
velinath 3a3c332436 Correct display of output for .rbac account list command. (thanks Spp-) 2014-04-23 08:05:29 -04:00
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
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
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