Incorrect
d98037a75d
Core/Misc: Remove unneeded files
...
These 3 BlackRock Mountain scripts can be removed from source:
- boss_anubshiah.cpp
- boss_gorosh_the_dervish.cpp
- boss_grizzle.cpp
They already removed from the creatures in DB, and are currently causing
DBErrors.
2015-11-02 02:11:52 +02:00
joschiwald
36a205ec00
Core: fixed warning introduced in last commit
...
(cherry picked from commit fe0c07a6fe4dea8772e69ec8ad491bdda7f61746)
2015-10-31 19:13:05 +01:00
joschiwald
df88c7f278
Core/Misc: removed some useless map checks
...
(cherry picked from commit cf1e80e3d09067ca4d0078a8113a09227a9f91ae)
2015-10-31 19:11:41 +01:00
David Carlos Manuelda
a410072d6d
Removed unneeded nullptr check
...
(cherry picked from commit 20215a8c421fd93d00233213966399a0c76e626a)
2015-10-31 18:22:55 +01:00
David Carlos Manuelda
8dc10022a6
Fixed boss evade and doors closed by cr4st.
...
Should close #6377 and #15239
(cherry picked from commit e430f3f61ae45ca0e8e251f96a1605bdb9299eb1)
2015-10-31 18:21:23 +01:00
tkrokli
89107c3a8e
Core/Scripts: The Endless Hunger & Death's Challenge, creature text
...
This PR solves the following say text issues:
In quest ID 12733, Death's Challenge, the creature script npc_death_knight_initiate is supposed to target the player and refer to the player character's name in the following 2 lines from `creature_text`.`entry` 28406:
- "You don't stand a chance, $n." (`BroadcastTextId` 29267)
- "Remember this day, $n, for it is the day that you will be thoroughly owned." (`BroadcastTextId` 29270)
In quest ID 12848, The Endless Hunger, the creature script npc_unworthy_initiate is supposed to target the player and refer to the player character's race in the following 2 lines from `creature_text`.`entry` 29519, 29520, 29565, 29566 and 29567:
- "You are hopelessly outmatched, $r." (`BroadcastTextId` 30212)
- "Sate your hunger on cold steel, $r!" (`BroadcastTextId` 30214)
The untargeted variables $r and $n appear in the say lines because the existing script assigns the text to the player character instead of the creatures. This does not produce any race or name information in /say or chat.
This Pull Request closes issue #14700 and replaces PR #15678 .
2015-10-10 14:57:49 +02:00
joschiwald
ad38c27124
Core/Misc: renamed sGossipSelect parameters
2015-10-04 16:16:56 +02:00
CreshandKesh
359df54b79
Core/Scripts: Salanar the Horseman, Into the Realm of Shadows
...
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected
Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.
Closes #15603
Closes #15657
2015-10-04 15:10:29 +02: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
05429b3593
Scripts/BWL: cleanup instancescript
2015-08-29 18:20:59 +02:00
joschiwald
df21162fe4
Scripts/VioletHold: rewrote the whole instance
...
thanks @MitchesD for help
2015-08-23 14:43:11 +02:00
Nyeriah
8b27b61978
Scripts\MoltenCore: Disable Ragnaros' combat movement
2015-08-21 23:20:45 -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
52043d7b5f
Core/Scripts: Added some missing overrides
2015-08-12 22:17:47 +02:00
David Carlos Manuelda
e3c3b8f08f
Core/Misc: Added some missing overrides
2015-08-11 12:44:35 +02:00
Kittnz
b42cf8755b
Core/Script: Fix Corporal Keeshan
2015-08-01 13:53:32 +02:00
Kittnz
93ca42759d
Core/Script: Set Faction at start of escort for Corporal Keeshan
...
Request by DRJ
2015-08-01 13:38:10 +02:00
Aokromes
c80c77ff71
Core/Misc: Fix some warnings
2015-07-27 09:52:04 +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 a22e4e121a1e54b2f4154d59623ee4a94a449176)
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
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
b82a072b25
Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4
...
Conflicts:
dep/cppformat/CMakeLists.txt
dep/cppformat/ChangeLog.rst
dep/cppformat/format.cc
dep/cppformat/format.h
dep/cppformat/posix.cc
dep/cppformat/posix.h
sql/updates/world/2015_03_16_02_world.sql
sql/updates/world/2015_03_16_03_world.sql
sql/updates/world/2015_03_16_04_world.sql
sql/updates/world/2015_03_16_05_world.sql
sql/updates/world/2015_03_16_06_world.sql
sql/updates/world/2015_03_17_00_world.sql
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/worldserver/CMakeLists.txt
2015-07-21 23:46:56 +02:00
Carbenium
f7f6eae247
Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_16_00_world.sql
sql/updates/world/2015_03_16_01_world_335.sql
2015-07-21 23:35:43 +02:00
Carbenium
17bed260e3
Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_14_00_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
2015-07-21 23:27:27 +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
814ae4ba8b
Merge commit '73709e7c1334521189d8882ab1ba33fe259a12dc' into 4.3.4
...
Conflicts:
sql/updates/world/2015_02_09_14_world.sql
2015-07-21 21:59:41 +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
7bb3d51383
Fix merge fail
2015-07-21 21:13:55 +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
fc13ce42df
Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4
...
Conflicts:
sql/updates/world/2014_11_05_00_world.sql
2015-07-21 18:53:04 +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
Carbenium
63df41b6b2
Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4
...
Conflicts:
sql/updates/world/2014_10_21_00_world.sql
2015-07-21 18:17:08 +02:00
DDuarte
3c4484d782
Scripts/ScarletEnclave: Add weapons to Unworthy Initiate
...
Closes #14954
Closes #14955
(cherry picked from commit 673648ee6507597837bd2c8a7a78f425d139baea)
2015-07-20 01:16:47 +01:00
Aokromes
1c0cf6021b
DB/Misc: Other branches fixes
2015-07-19 23:02:24 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
MitchesD
db8fdd94ed
Merge pull request #14782 from doctaweeks/fixes-for-6.x
...
Minor fixes for 6.x
(cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93)
Conflicts:
src/server/bnetserver/Main.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Chat/Channels/Channel.h
src/server/game/Entities/Player/Player.h
src/server/game/Quests/QuestDef.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
src/server/shared/Cryptography/SHA256.h
2015-06-01 00:39:56 +01:00
Kittnz
3e588acfe9
Scripts: trying to fix non-pch
2015-04-25 09:15:27 +02:00
Kittnz
cf286ea9cd
Scripts/Uldaman: Fix build & fix some movement suggested by josch
2015-04-25 08:44:16 +02:00
Kittnz
9cb4cb52d8
Scripts/Uldaman: Instance update
...
- Fixup Boss Ironaya
- Add the freeze animation for minions and archaedas
- Fix attack target for minions who wake up
2015-04-24 23:11:02 +02:00
click
a09eafa104
Core: Whitespace/tab2spaces cleanup
2015-04-10 04:12:06 +02:00
Carbenium
c0b77fc216
Switch abs to std::abs
...
(cherry picked from commit 8476c2ac5a3cad03bc26b12fcc8b3f4f32854b65)
2015-04-05 00:41:39 +02:00
Carbenium
aa1971964b
Add missing override keyword in scripts
...
(cherry picked from commit b948a4275e90c59db2599a1961937d62f17736ce)
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
Nyeriah
a76722ccef
Scripts/Undercity: Update Lady Sylvanas' script and also implement few missing things to Journey to Undercity's quest end event
...
Closes https://github.com/TrinityCore/TrinityCore/pull/14094
Thans to @Killyana @Rushor @jaredjones and all others who helped with this
2015-03-17 20:18:09 -03:00
Rushor
eee10edb56
Merge pull request #13997 from Rushor/malfurion
...
Scripts/SunkenTemple: Add Eventsupport for NPC: Malfurion Stormrage
2015-03-15 15:41:27 +01:00
click
a8a5fae4f9
Core/Scripts: INFO-DEBUG changes in scripts (gawd)
2015-03-08 06:34:49 +01:00
joschiwald
2478bbcdb8
Merge pull request #14144 from Rushor/ZulAman
...
Scripts/ZulAman: Enable Script for Gazakroth
2015-02-13 22:37:30 +01:00
Rushor
ca60ae6d19
Scripts/ZulAman: Enable Script for Gazakroth
...
*removes one more startuperror from #13707
2015-02-13 22:22:22 +01:00