1094783715
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-17 14:20:35 +02:00
4136f3c974
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Handlers/ArenaTeamHandler.cpp
2014-05-13 06:41:25 +02:00
b17e3246fe
Core/Misc: Fix static analysis issues
...
Fix uninitialized values spotted by coverity.
Remove unused "dynamic analysis" code, use Valgrind or another dynamic analysis tool instead if needed.
2014-05-12 21:18:59 +02:00
cfe644b457
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Maps/Map.cpp
src/server/game/Quests/QuestDef.cpp
2014-05-11 23:08:54 +02:00
de6eddaa35
Scripts/HoR: fixed conflict between multiple classes with same name
...
Closes #12051
2014-05-11 18:13:02 +02:00
b76bcad46e
Script/ICC: Use existing method for getting GO auto-close-time
2014-05-11 15:15:43 +02:00
8e7cf15dd1
Scripts/HallsOfReflection: Major changes
...
* corrections to Intro Event (Falric, Marwyn etc.)
* fixed issues with Frostsworn General
* improved the whole Wrath of the Lich King event
* implemented outro gunship
* optimalization code and cleanup and fixed some typos
* Big thanks to @joschiwald, he is author too ;-)
2014-05-10 21:37:33 +02:00
37d2777f27
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-09 17:20:39 +02:00
eabec73d98
Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fixed some issues there
2014-05-09 16:59:55 +02:00
d9f1d6466d
Core/Battle.net: Implemented authserver
2014-05-06 23:43:29 +02:00
5ca548602c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-05 16:13:40 +02:00
109495ac9b
Scripts/Ulduar: Fix crash when Algalon's Big Bang is casted by player
2014-05-04 20:30:19 +02:00
13ec761ad2
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.h
2014-05-03 20:23:44 +02:00
cbd36d5a4e
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
2014-05-01 11:19:32 +02:00
3ce6a9d5cf
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.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/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_item.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/scripts/World/item_scripts.cpp
2014-04-29 20:14:42 +02:00
24ae6a6802
Core/Misc: Remove obsolete C++11 backward compatibility macros
...
OVERRIDE, FINAL, DELETE_MEMBER
2014-04-29 16:35:11 +02:00
796b77ca12
Scripts: Remove old script from azuregos
2014-04-29 14:17:30 +02:00
65ae868cc8
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Commands/cs_npc.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-04-28 23:00:41 +02:00
d0cc723d2d
Scripts/Commands: Fix crash in ".wp modify wpadd"
...
Remove the old unsupported "wpadd" subcommand of ".wp modify" .
Closes #11955
2014-04-28 20:50:47 +02:00
84bff76ba0
Core/Misc: remove some obsolete parameters
2014-04-28 20:05:36 +02:00
f388020366
Merge pull request #11948 from MitchesD/misc
...
Scripts/Azuregos: converted to EventMap and WorldBossAI
2014-04-28 19:58:17 +02:00
0c0d0ed9e5
Scripts/Azuregos: converted to EventMap and WorldBossAI
2014-04-28 19:52:08 +02:00
f743ca2816
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Creature/Creature.h
src/server/game/Globals/ObjectMgr.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-04-28 09:42:20 +02:00
57cf043aec
Core/Creature: Missed changes in c536305e3a
2014-04-28 09:19:37 +02:00
c536305e3a
Core: Droped faction_H field -- only one faction table is necessary
2014-04-27 18:13:55 -04:00
908870e23f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-27 13:56:56 +02:00
c20d0cb77e
Scripts/Sholazar Basin: Reconnaissance Flight (12671)
...
Add workaround for the player/accessory mounting issue.
Some small additions.
Closes: 9443
2014-04-27 02:23:33 +03:00
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
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
f27057bf24
Core/Misc: Fix build warnings
2014-04-25 21:46:43 +02:00
2585e799f9
Core/Misc: Change how Position struct is retrieved
...
Update Position::GetPosition() and similar methods signatures to reflect 2a4c9bcaf9
2014-04-25 21:19:30 +02:00
b39ba5656e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-23 20:05:45 +02:00
3a3c332436
Correct display of output for .rbac account list command. (thanks Spp-)
2014-04-23 08:05:29 -04:00
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
805a026c6c
DB/CreatureText: readd accidentally deleted text
2014-04-22 16:07:27 +02:00
6c0ff5717f
Scripts/Gnomeregan: moved Blastmaster Emi gossip to db
2014-04-21 21:39:51 +02:00
3a26a570f7
Core: Fix whitespace / tabs
2014-04-21 16:57:32 +02:00
0ab9f938ad
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-21 16:35:36 +02:00
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
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
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
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
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
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
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
574fa30ea6
Core/Spells: Convert Avenging Wrath to spellscript
...
Closes #11896
Closes #3464
2014-04-18 20:21:05 +02:00
89cc056a50
Fix
2014-04-18 17:02:04 +02:00
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
fa472c6142
Merge pull request #11787 from MitchesD/misc
...
Scripts/ZulGurub: clean up the old code
2014-04-17 02:01:05 +02:00
0a014e1431
Scripts/UtgardeKeep: fixed some issues on Ingvar the Plunderer
...
Closes #10859
2014-04-17 00:09:43 +02:00
Shauren