pete318
6664a3acc3
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
...
(cherry picked from commit b1032ed620 )
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Mails/Mail.h
src/server/game/Maps/Map.cpp
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/OutdoorPvP/OutdoorPvP.h
2016-01-11 01:50:53 -03:00
ariel-
b20c9ae283
Corpses update: cd27fd38b9
2016-01-11 01:50:49 -03:00
ariel-
b3ea9fbbe5
Map local guids 6.x -> 4.3.4
...
Ported the following commits:
ca83e14f8b
ee1c1b97be
18e4ab6911
bf37446b3c
cb854a2b7b
2016-01-11 01:50:45 -03:00
Carbenium
221f1405b6
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
sql/updates/world/2015_08_29_00_world.sql
sql/updates/world/2015_08_29_01_world.sql
sql/updates/world/2015_08_30_00_world.sql
sql/updates/world/2015_08_31_01_world.sql
sql/updates/world/2015_09_02_00_world.sql
sql/updates/world/2015_09_02_01_world.sql
sql/updates/world/2015_09_02_04_world.sql
sql/updates/world/2015_09_03_00_world.sql
sql/updates/world/2015_09_03_01_world.sql
sql/updates/world/2015_09_03_02_world.sql
sql/updates/world/2015_09_03_03_world.sql
sql/updates/world/2015_09_03_04_world.sql
sql/updates/world/2015_09_03_06_world.sql
sql/updates/world/2015_09_03_07_world.sql
sql/updates/world/2015_09_03_08_world.sql
sql/updates/world/2015_09_03_09_world.sql
sql/updates/world/2015_09_03_10_world.sql
sql/updates/world/2015_09_03_11_world.sql
sql/updates/world/2015_09_04_00_world.sql
sql/updates/world/2015_09_04_01_world.sql
sql/updates/world/2015_09_04_02_world.sql
sql/updates/world/2015_09_04_03_world.sql
sql/updates/world/2015_09_07_00_world.sql
sql/updates/world/2015_09_07_01_world.sql
sql/updates/world/2015_09_07_02_world.sql
sql/updates/world/2015_09_07_03_world.sql
sql/updates/world/2015_09_07_04_world.sql
sql/updates/world/2015_09_07_05_world.sql
sql/updates/world/2015_09_08_00_world.sql
src/common/Collision/Management/MMapManager.cpp
src/common/Cryptography/Authentication/AuthCrypt.cpp
src/common/Cryptography/Authentication/AuthCrypt.h
src/common/Cryptography/HMACSHA1.cpp
src/common/Cryptography/HMACSHA1.h
src/server/CMakeLists.txt
src/server/collision/CMakeLists.txt
src/server/game/CMakeLists.txt
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.cpp
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_cheat.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
2015-09-15 20:42:34 +02:00
joschiwald
df21162fe4
Scripts/VioletHold: rewrote the whole instance
...
thanks @MitchesD for help
2015-08-23 14:43:11 +02:00
Nyeriah
b28849003c
Scripts/OnyxiasLair: Force Onyxia to enter evade mode if pulled out of her room
2015-08-22 00:14:46 -03:00
jackpoz
2f92a2f58e
Scripts/Misc: Replace some unsafe WorldObject* class members in scripts with ObjectGuid
...
Replace some unsafe WorldObject* class members and derived types in scripts with ObjectGuid.
Code cleanup.
2015-08-16 22:29:56 +02:00
Carbenium
99ab531e76
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/updates/world/2015_07_29_00_world.sql
sql/updates/world/2015_07_29_01_world.sql
sql/updates/world/2015_08_01_00_world.sql
src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_pet.cpp
2015-08-12 21:05:39 +02:00
jackpoz
5f0f152345
Scripts/Misc: Fix possible crash
...
Fix possible NULL-dereference exception happening in PlayerOrPet checks used in Ulduar and Temple Of Ahn Qiraj
2015-08-12 12:43:59 +02:00
David Carlos Manuelda
e3c3b8f08f
Core/Misc: Added some missing overrides
2015-08-11 12:44:35 +02:00
Aokromes
1b57196b4e
Core/Misc: 3.3.5a fixes
2015-08-09 10:50:16 +02:00
jackpoz
efc4c60c53
Scripts/Kalimdor: Remove unused script
...
Remove unused C++ script replaced by d69a31d238
2015-08-08 19:36:41 +02:00
Carbenium
86eb651757
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
sql/updates/world/2015_07_14_00_world.sql
sql/updates/world/2015_07_14_01_world_335.sql
sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql
sql/updates/world/2015_07_19_05_world.sql
sql/updates/world/2015_07_21_00_world.sql
sql/updates/world/2015_07_24_00_world.sql
sql/updates/world/2015_07_24_01_world.sql
sql/updates/world/2015_07_24_02_world.sql
sql/updates/world/2015_07_24_03_world.sql
sql/updates/world/2015_07_24_04_world.sql
sql/updates/world/2015_07_24_05_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/collision/Management/MMapManager.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/Utilities/Util.cpp
2015-07-26 16:52:35 +02:00
Shauren
b4adf3f5dd
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
...
(cherry picked from commit a22e4e121a )
Conflicts:
cmake/compiler/msvc/settings.cmake
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Garrison/Garrison.cpp
src/server/game/Garrison/GarrisonMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/PartyPackets.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellScript.cpp
src/server/scripts/Commands/cs_list.cpp
2015-07-24 11:51:48 +01:00
Carbenium
aaf3f090ea
Fix build
2015-07-24 01:49:34 +02:00
Carbenium
293658fb13
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
.gitattributes
dep/PackageList.txt
sql/base/characters_database.sql
sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
sql/updates/world/2015_07_01_03_world_335.sql
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Miscellaneous/Language.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2015-07-22 02:26:46 +02:00
Carbenium
6dfaec3d97
Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4
...
Conflicts:
.gitattributes
CONTRIBUTING.md
sql/updates/world/2015_05_11_04_world.sql
sql/updates/world/2015_05_27_00_world.sql
sql/updates/world/2015_05_27_01_world.sql
sql/updates/world/2015_06_06_01_world_335.sql
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_item.cpp
src/server/scripts/Spells/spell_rogue.cpp
2015-07-22 02:09:32 +02:00
Carbenium
82ea8da720
Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4
...
Conflicts:
.travis.yml
README.md
sql/updates/world/2015_04_18_00_world.sql
sql/updates/world/2015_04_18_05_world_335.sql
sql/updates/world/2015_04_26_03_world_335.sql
sql/updates/world/2015_05_09_00_world_335.sql
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/SpellInfo.cpp
2015-07-22 01:33:48 +02:00
Carbenium
224c7dc6ae
Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_04_04_00_world.sql
sql/updates/world/2015_04_04_01_world.sql
sql/updates/world/2015_04_05_06_world_335.sql
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_account.cpp
src/tools/map_extractor/System.cpp
src/tools/vmap4_extractor/adtfile.cpp
2015-07-22 00:54:34 +02:00
Carbenium
963150dc8e
Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
sql/updates/world/2015_03_22_00_world.sql
sql/updates/world/2015_03_23_00_world.sql
sql/updates/world/2015_03_23_01_world.sql
sql/updates/world/2015_03_23_02_world.sql
sql/updates/world/2015_03_23_03_world.sql
sql/updates/world/2015_03_23_07_world.sql
sql/updates/world/2015_03_24_00_world.sql
sql/updates/world/2015_03_25_00_world.sql
sql/updates/world/2015_03_25_01_world.sql
sql/updates/world/2015_03_26_00_world.sql
sql/updates/world/2015_03_26_01_world.sql
sql/updates/world/2015_03_26_02_world.sql
sql/updates/world/2015_03_28_00_world.sql
sql/updates/world/2015_03_28_01_world.sql
2015-07-22 00:37:27 +02:00
Carbenium
73933e5e39
Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4
...
Conflicts:
sql/updates/world/2015_02_14_00_world.sql
sql/updates/world/2015_02_14_01_world.sql
sql/updates/world/2015_02_14_02_world.sql
sql/updates/world/2015_02_16_02_world.sql
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
2015-07-21 22:12:57 +02:00
Carbenium
78da5d8e7e
Merge commit '2478bbcdb8f44c575714ae2f45aeef4a37556fc2' into 4.3.4
...
Conflicts:
sql/updates/world/2015_02_12_00_world.sql
sql/updates/world/2015_02_12_01_world.sql
sql/updates/world/2015_02_12_02_world.sql
sql/updates/world/2015_02_12_03_world.sql
sql/updates/world/2015_02_12_04_world.sql
sql/updates/world/2015_02_12_05_world.sql
sql/updates/world/2015_02_12_06_world.sql
sql/updates/world/2015_02_12_07_world.sql
sql/updates/world/2015_02_12_08_world.sql
sql/updates/world/2015_02_12_09_world.sql
sql/updates/world/2015_02_12_10_world.sql
sql/updates/world/2015_02_13_00_world.sql
sql/updates/world/2015_02_13_02_world.sql
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
2015-07-21 22:07:47 +02:00
Carbenium
7d5d040948
Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_02_06_13_world_335.sql
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
2015-07-21 21:45:04 +02:00
Carbenium
9d3b94f7f2
Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4
...
Conflicts:
sql/updates/world/2015_01_09_01_world.sql
sql/updates/world/2015_01_18_00_world.sql
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/tools/CMakeLists.txt
2015-07-21 21:21:09 +02:00
Carbenium
3447276d4f
Merge commit 'f3e86d3e686b8f7e29f55b884f6c8cb226ee1598' into 4.3.4
...
Conflicts:
dep/libmpq/CMakeLists.txt
doc/UnixInstall.txt
src/server/game/Accounts/RBAC.cpp
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/Commands/cs_rbac.cpp
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/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.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_felwood.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
src/server/shared/Cryptography/Authentication/AuthCrypt.h
src/server/shared/Cryptography/HMACSHA1.cpp
src/server/shared/Cryptography/HMACSHA1.h
src/server/shared/Packets/WorldPacket.h
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/mesh_extractor/ADT.cpp
src/tools/mesh_extractor/ADT.h
src/tools/mesh_extractor/CMakeLists.txt
src/tools/mesh_extractor/Cache.h
src/tools/mesh_extractor/Chunk.cpp
src/tools/mesh_extractor/Chunk.h
src/tools/mesh_extractor/ChunkedData.cpp
src/tools/mesh_extractor/ChunkedData.h
src/tools/mesh_extractor/Constants.h
src/tools/mesh_extractor/ContinentBuilder.cpp
src/tools/mesh_extractor/ContinentBuilder.h
src/tools/mesh_extractor/DBC.cpp
src/tools/mesh_extractor/DBC.h
src/tools/mesh_extractor/DoodadHandler.cpp
src/tools/mesh_extractor/DoodadHandler.h
src/tools/mesh_extractor/Geometry.cpp
src/tools/mesh_extractor/Geometry.h
src/tools/mesh_extractor/LiquidHandler.cpp
src/tools/mesh_extractor/LiquidHandler.h
src/tools/mesh_extractor/MPQ.cpp
src/tools/mesh_extractor/MPQ.h
src/tools/mesh_extractor/MPQManager.cpp
src/tools/mesh_extractor/MPQManager.h
src/tools/mesh_extractor/MapChunk.cpp
src/tools/mesh_extractor/MapChunk.h
src/tools/mesh_extractor/MeshExtractor.cpp
src/tools/mesh_extractor/Model.cpp
src/tools/mesh_extractor/Model.h
src/tools/mesh_extractor/ObjectDataHandler.cpp
src/tools/mesh_extractor/ObjectDataHandler.h
src/tools/mesh_extractor/TileBuilder.cpp
src/tools/mesh_extractor/TileBuilder.h
src/tools/mesh_extractor/Utils.cpp
src/tools/mesh_extractor/Utils.h
src/tools/mesh_extractor/WDT.cpp
src/tools/mesh_extractor/WDT.h
src/tools/mesh_extractor/WorldModelGroup.cpp
src/tools/mesh_extractor/WorldModelGroup.h
src/tools/mesh_extractor/WorldModelHandler.cpp
src/tools/mesh_extractor/WorldModelHandler.h
src/tools/mesh_extractor/WorldModelRoot.cpp
src/tools/mesh_extractor/WorldModelRoot.h
src/tools/vmap4_extractor/loadlib/loadlib.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
2015-07-21 20:58:09 +02:00
Carbenium
79eb80dcba
Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4
...
Conflicts:
README.md
sql/base/auth_database.sql
sql/updates/world/2014_12_27_01_world_335.sql
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Spells/spell_hunter.cpp
2015-07-21 20:05:44 +02:00
Carbenium
8d47083319
Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
2015-07-21 18:51:30 +02:00
Carbenium
9f1d71a53f
Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2015-07-21 18:22:27 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
Shauren
d04c9d55ac
Scripts/Zul'farrak: Fixed summoning Gahz'rilla
...
Fixes #5782 regression
(cherry picked from commit cec05ff07d )
2015-06-19 17:29:09 +02:00
Rushor
3625d83cd9
DB/Quest: No Mere Dream
...
closes #11252
2015-05-29 17:40:28 +02:00
Shauren
8a013ba0fb
Core/Misc: Moved Position to its own file
...
(cherry picked from commit 48ee1f0033 )
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Spells/Spell.cpp
2015-05-19 21:44:39 +01:00
MitchesD
4d8ddac555
Scripts/CoS: Chrono Lord Epoch converted to BossAI
...
(cherry picked from commit d74e0d823d )
2015-04-18 18:30:57 +02:00
MitchesD
f9eb3d245f
Merge pull request #14497 from tkrokli/Kodo_Roundup
...
[Quest] Kodo Roundup
2015-04-11 23:52:50 +02:00
Aokromes
16481d17aa
Scripts/Kalimdor: Ashenvale - add missing enum
2015-04-05 12:57:14 +02:00
Rushor
f49a1b0f1f
Scripts/Kalimdor: Ashenvale - Remove Torek C++ Script
2015-04-05 12:43:15 +02:00
Carbenium
aa1971964b
Add missing override keyword in scripts
...
(cherry picked from commit b948a4275e )
Conflicts:
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
2015-04-05 00:41:21 +02:00
tkrokli
1c8486e1a8
[Quest] Kodo Roundup
...
by @pete318, closes #12811
Fixes the remaining bugs in the "Kodo Roundup" quest in Desolace:
- removes combat status from creature 11627, Tamed Kodo
- sets normal walking speed as the creature's follow speed
- makes the Tamed Kodo stop at Scrabblescrew's Camp
- enables quest objective count 0/5 -> 5/5, quest complete
- SQL (by @tkrokli) links the missing gossip text in the DB
2015-04-04 15:57:06 +02:00
jackpoz
2dc97e3f3d
Core/Misc: Fix issues reported by static analysis
...
Coverity defect IDs: 1292769, 1292768, 1292765, 1292763, 1267939
2015-04-04 15:28:13 +02:00
Gacko
1995dcab76
Fix non-pch build.
2015-03-29 20:11:14 +02:00
click
058457dda9
Core/Script: Fix non-PCH build
2015-03-27 21:38:23 +01:00
MitchesD
eced90d4f8
Merge pull request #14149 from Rushor/Ending
...
Scripts/Bloodmyst Isle: Script Quest: Ending Their World
2015-03-26 15:08:23 +01:00
Rushor
f1101b145b
Scripts/Bloodmyst Isle: Script Quest: Ending Their World
...
closes #1815
* Add missing Waypoint
* Improve Aggrobehaviour
* Add BroascasttextIDs
* Update to current GUID-Handling
Original Patch by @trickerer
2015-03-18 12:11:13 +01:00
Aokromes
8fbfe677db
Merge pull request #14156 from Rushor/robot
...
Scripts/The Barrens: Add missing Text for Q: 'The Escape'
2015-02-15 14:34:40 +01:00
Rushor
8904a94856
Scripts/The Barrens: Add missing Text for 'The Escape'
...
closes #12259
2015-02-15 14:17:56 +01:00
MitchesD
89a7026898
Merge pull request #13989 from Rushor/Leaves
...
Scripts/Areatrigger: Assign Script to 'Ancient Leaves' Trigger
2015-02-15 12:21:35 +01:00
Dr-J
77bed4c4bb
Remove CPP script for Blueleaf tubers
2015-02-14 20:13:32 +00:00
Aokromes
e9263d9f71
Merge pull request #14138 from Rushor/mulgore
...
Scripts/Kalimdor: Remove Mulgorescripts
2015-02-13 14:06:48 +01:00
Rushor
87f40a5ad3
Scripts/Kalimdor: Remove Mulgorescripts
2015-02-13 14:04:19 +01:00
Aokromes
c21a600478
Delete zone_mulgore.cpp
2015-02-13 13:54:45 +01:00