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
b9c871fdb7
Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4
...
Conflicts:
sql/updates/world/2014_12_30_00_world.sql
sql/updates/world/2014_12_30_01_world.sql
src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
2015-07-21 20:45:16 +02:00
Carbenium
2530db5a51
Fix merge
2015-07-21 20:40:21 +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
e17af4b098
Fix merge fail
2015-07-21 19:11:36 +02:00
Carbenium
c0ee4ceac4
Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Accounts/RBAC.h
src/server/scripts/Commands/cs_modify.cpp
2015-07-21 19:02:53 +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
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
1940583e36
Fix merge error
2015-07-21 18:38:49 +02:00
Carbenium
68fd138476
Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4
...
Conflicts:
sql/updates/world/2014_10_27_00_world.sql
sql/updates/world/2014_10_27_01_world_335.sql
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
2015-07-21 18:30:05 +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
Carbenium
38027226ff
Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4
...
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.h
2015-07-21 18:04:43 +02:00
Carbenium
1350a08ee4
Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4
2015-07-21 17:54:19 +02:00
Aokromes
1c0cf6021b
DB/Misc: Other branches fixes
2015-07-19 23:02:24 +02:00
Aokromes
88cbf569a2
Fix another typo
2015-07-19 20:37:25 +02:00
Aokromes
8164d51071
Fix typo
2015-07-19 20:33:59 +02:00
Aokromes
d3fec662dd
DB/World: Backport schema changes from 6.x branch (renames)
2015-07-19 20:01:43 +02:00
Aokromes
5775457fb4
Fix Compile
2015-07-19 18:42:24 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
Your Name
dc9c3362ab
Core/Players: Fix being able to water walk after being revived
...
By IvanVojtko, closes #10950 , closes #11323
2015-07-19 10:19:23 +02:00
Nyeriah
c4ad70e7f4
Scripts/Stonecore: Prevent Slabhide from dying during air phase
2015-04-24 14:11:13 -03:00
Northstrider
b5393d4b9b
Core/Creatures: remove virtual mounts from creatures on death
...
Closes https://github.com/TrinityCore/TrinityCore/pull/14396
2015-04-19 14:56:54 +02:00
MitchesD
a3a7d65c20
Core/SAI: fix typo
...
(cherry picked from commit 9ed21eb5b1 )
2015-04-02 21:28:44 +02:00
Rat
037fd1b1bb
Core/Phases: backported 6.x phase fixes
2015-04-02 20:32:09 +02:00
MitchesD
1103f0889d
Core/SmartScripts: added SMART_ACTION_SET_COUNTER and SMART_EVENT_COUNTER_SET
...
as per request of DB developers
(cherry picked from commit 23b1c042ad )
Conflicts:
src/server/game/AI/SmartScripts/SmartScript.h
2015-04-02 18:52:19 +02:00
Rushor
5ebf89ce16
Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation
...
closes #12165
(cherry picked from commit 6080234e98 )
2015-03-25 16:35:15 +01:00
AriDEV
f4a83fc08a
Server/Entities: Should Fix Compile Error Under GCC 4.8+
...
Signed-off-by: AriDEV <aridev666@gmail.com >
2015-03-15 21:08:27 +01:00
Shauren
8460c40c6f
Core/DataStores: Corrected field names in SpellPowerEntry
2015-03-08 13:16:30 +01:00
Duarte Duarte
a324ee8a22
Typo
2015-02-22 06:06:58 +00:00
Shauren
6cc38ad7d2
Core/Spells: Restored totem category check
...
Revert "Core/Totems: In cata totem items are no longer needed"
This reverts commit 45e0cae7be
(cherry picked from commit ea9eccae85 )
Conflicts:
src/server/game/Entities/Item/ItemPrototype.h
2015-02-22 06:06:34 +00:00
Gooyeth
b68768e984
Core/Spells: Correction Stuck effect (4.3.4)
...
The player dies if heathstone is in cooldown, else the player is teleported to home.
Thanks @F03SD and @Kinzcool.
2015-01-27 14:01:45 -06:00
Gooyeth
3d49285c39
Core/Spells: Update Stuck effect 4.3.4
...
The stuck effect in Cataclysm and MoP the player dies, in WoD the player is teleported to home.
Closes #13939
2015-01-26 20:23:08 +00:00
Vincent-Michael
f3e86d3e68
Update copyright note for 2015
...
Happy new year
Conflicts:
src/server/bnetserver/Authentication/AuthCodes.h
src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
src/server/bnetserver/Packets/AchievementPackets.h
src/server/bnetserver/Packets/AuthenticationPackets.cpp
src/server/bnetserver/Packets/AuthenticationPackets.h
src/server/bnetserver/Packets/BitStream.cpp
src/server/bnetserver/Packets/BitStream.h
src/server/bnetserver/Packets/CachePackets.cpp
src/server/bnetserver/Packets/CachePackets.h
src/server/bnetserver/Packets/ChatPackets.h
src/server/bnetserver/Packets/ConnectionPackets.cpp
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/bnetserver/Packets/FriendsPackets.cpp
src/server/bnetserver/Packets/FriendsPackets.h
src/server/bnetserver/Packets/PacketManager.cpp
src/server/bnetserver/Packets/PacketManager.h
src/server/bnetserver/Packets/Packets.h
src/server/bnetserver/Packets/PacketsBase.cpp
src/server/bnetserver/Packets/PacketsBase.h
src/server/bnetserver/Packets/PresencePackets.cpp
src/server/bnetserver/Packets/PresencePackets.h
src/server/bnetserver/Packets/ProfilePackets.h
src/server/bnetserver/Packets/SupportPackets.h
src/server/bnetserver/Packets/WoWRealmPackets.cpp
src/server/bnetserver/Packets/WoWRealmPackets.h
src/server/bnetserver/Realms/RealmList.cpp
src/server/bnetserver/Realms/WorldListener.cpp
src/server/bnetserver/Realms/WorldListener.h
src/server/bnetserver/Server/ComponentManager.cpp
src/server/bnetserver/Server/ComponentManager.h
src/server/bnetserver/Server/ModuleManager.cpp
src/server/bnetserver/Server/ModuleManager.h
src/server/bnetserver/Server/Session.cpp
src/server/bnetserver/Server/Session.h
src/server/bnetserver/Server/SessionManager.cpp
src/server/bnetserver/Server/SessionManager.h
src/server/game/Accounts/BattlenetAccountMgr.cpp
src/server/game/Accounts/BattlenetAccountMgr.h
src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
src/server/game/Entities/AreaTrigger/AreaTrigger.h
src/server/game/Entities/Item/ItemTemplate.cpp
src/server/game/Guilds/GuildFinderMgr.cpp
src/server/game/Guilds/GuildFinderMgr.h
src/server/game/Handlers/GuildFinderHandler.cpp
src/server/game/Handlers/VoidStorageHandler.cpp
src/server/game/Movement/MovementStructures.cpp
src/server/game/Movement/MovementStructures.h
src/server/game/Movement/PathGenerator.cpp
src/server/game/Server/BattlenetServerManager.cpp
src/server/game/Server/BattlenetServerManager.h
src/server/game/Server/Packet.cpp
src/server/game/Server/Packet.h
src/server/game/Server/Packets/AchievementPackets.cpp
src/server/game/Server/Packets/AchievementPackets.h
src/server/game/Server/Packets/AuctionHousePackets.cpp
src/server/game/Server/Packets/AuctionHousePackets.h
src/server/game/Server/Packets/AuthenticationPackets.cpp
src/server/game/Server/Packets/AuthenticationPackets.h
src/server/game/Server/Packets/BattlegroundPackets.cpp
src/server/game/Server/Packets/BattlegroundPackets.h
src/server/game/Server/Packets/ChannelPackets.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/CharacterPackets.cpp
src/server/game/Server/Packets/CharacterPackets.h
src/server/game/Server/Packets/ChatPackets.cpp
src/server/game/Server/Packets/ChatPackets.h
src/server/game/Server/Packets/ClientConfigPackets.cpp
src/server/game/Server/Packets/ClientConfigPackets.h
src/server/game/Server/Packets/CombatLogPackets.cpp
src/server/game/Server/Packets/CombatLogPackets.h
src/server/game/Server/Packets/CombatPackets.cpp
src/server/game/Server/Packets/CombatPackets.h
src/server/game/Server/Packets/EquipmentSetPackets.cpp
src/server/game/Server/Packets/EquipmentSetPackets.h
src/server/game/Server/Packets/GameObjectPackets.cpp
src/server/game/Server/Packets/GameObjectPackets.h
src/server/game/Server/Packets/GuildPackets.cpp
src/server/game/Server/Packets/GuildPackets.h
src/server/game/Server/Packets/ItemPackets.cpp
src/server/game/Server/Packets/ItemPackets.h
src/server/game/Server/Packets/LootPackets.h
src/server/game/Server/Packets/MiscPackets.cpp
src/server/game/Server/Packets/MiscPackets.h
src/server/game/Server/Packets/MovementPackets.cpp
src/server/game/Server/Packets/MovementPackets.h
src/server/game/Server/Packets/NPCPackets.cpp
src/server/game/Server/Packets/NPCPackets.h
src/server/game/Server/Packets/QueryPackets.cpp
src/server/game/Server/Packets/QueryPackets.h
src/server/game/Server/Packets/QuestPackets.cpp
src/server/game/Server/Packets/QuestPackets.h
src/server/game/Server/Packets/ReputationPackets.cpp
src/server/game/Server/Packets/ReputationPackets.h
src/server/game/Server/Packets/SpellPackets.cpp
src/server/game/Server/Packets/SpellPackets.h
src/server/game/Server/Packets/SystemPackets.cpp
src/server/game/Server/Packets/SystemPackets.h
src/server/game/Server/Packets/TalentPackets.cpp
src/server/game/Server/Packets/TalentPackets.h
src/server/game/Server/Packets/TradePackets.h
src/server/game/Server/Packets/WorldStatePackets.cpp
src/server/game/Server/Packets/WorldStatePackets.h
src/server/game/Server/WorldSocket.cpp
src/server/ipc/CMakeLists.txt
src/server/ipc/Commands.cpp
src/server/ipc/Commands.h
src/server/ipc/ZMQTask.cpp
src/server/ipc/ZMQTask.h
src/server/ipc/ZmqContext.cpp
src/server/ipc/ZmqContext.h
src/server/ipc/ZmqListener.cpp
src/server/ipc/ZmqListener.h
src/server/ipc/ZmqMux.cpp
src/server/ipc/ZmqMux.h
src/server/ipc/ZmqWorker.cpp
src/server/ipc/ZmqWorker.h
src/server/scripts/Commands/cs_battlenet_account.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.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/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
src/server/scripts/Kalimdor/Firelands/firelands.h
src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.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/Maelstrom/Stonecore/boss_corborus.cpp
src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.h
src/server/shared/Cryptography/Authentication/AuthCrypt.h
src/server/shared/Cryptography/Authentication/PacketCrypt.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
src/server/shared/Cryptography/HmacHash.cpp
src/server/shared/Cryptography/SHA256.cpp
src/server/shared/Cryptography/SHA256.h
src/server/shared/Database/Implementation/HotfixDatabase.cpp
src/server/shared/Database/Implementation/HotfixDatabase.h
src/server/shared/Realm/Realm.cpp
src/server/shared/Realm/Realm.h
src/tools/connection_patcher/CMakeLists.txt
src/tools/connection_patcher/Constants/BinaryTypes.hpp
src/tools/connection_patcher/Helper.cpp
src/tools/connection_patcher/Helper.hpp
src/tools/connection_patcher/Patcher.cpp
src/tools/connection_patcher/Patcher.hpp
src/tools/connection_patcher/Patches/Common.hpp
src/tools/connection_patcher/Patches/Mac.hpp
src/tools/connection_patcher/Patches/Windows.hpp
src/tools/connection_patcher/Patterns/Common.hpp
src/tools/connection_patcher/Patterns/Mac.hpp
src/tools/connection_patcher/Patterns/Windows.hpp
src/tools/connection_patcher/Program.cpp
src/tools/map_extractor/loadlib/DBFilesClientList.h
2015-01-01 00:32:50 +01:00
Rat
e6cc39258d
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into phases
...
Conflicts:
sql/updates/world/2014_10_30_00_world.sql
2014-12-30 10:22:55 +01:00
Nyeriah
9671d51327
Scripts/Ulduar: Fixes Flame Leviathan entering evade mode if Pursue returns no target
...
* Pursue is never cast on players at retail, however, being there without a vehicle doesn't prevent the boss from attacking you, nor does it enter evade mode.
Closes #11199
2014-12-29 04:05:10 -02:00
MitchesD
d3e2918c57
Scripts/Nexus: Keristrasza converted to BossAI and EventMap
2014-12-28 22:02:05 +01:00
Duarte Duarte
cd0ad4739c
Merge pull request #13796 from Unholychick/3.3.5
...
Scripts/Spells: Move death grip from DB
2014-12-28 19:36:21 +00:00
Unholychick
77887ab32f
Scripts/Spells: Move death grip from DB
...
Moves death grip from DB to spellscript for clarity and to reduce confusion in future.
2014-12-28 20:07:00 +01:00
pete318
17f6dcb762
Core: NPC Interaction change for unfriendly reputation.
...
For units with unfriendly reputation, check using the normal reaction function, instead of reading faction directly.
This allows specific buffs that alter creature reaction to work on the player, this allowing players to complete quests.
Closes #13629
2014-12-28 19:01:32 +00:00
pete318
f2444eedf9
Scripts/Quests: Fix Quest A Spirit Guide
...
- Ensures rep adjustment buff is always applied (overrides evade, implements existing evade + re-apply buff)
- Removes un-owned ravagers with incorrect faction from DB (the correct ones are spawned with their masters without the DB entries)
- Create some extra steps in the wolf's waypoints in order to generate some AI events for the Ryga NPC. I think it's a bit of a dirty solution, but it seems to work with minimal changes.
- Created RP series of events with Ryga NPC and Ancestral Wolf Spirit (Ryga Kneels, talks to wolf, then returns to spawn position after around a minute).
Closes #13619
Fix #4028
2014-12-28 18:43:14 +00:00
Gooyeth
bb002803bc
Scripts/Spells: Adding overrides Death Grip Initial.
...
Thanks @Goatform
2014-12-28 12:24:44 -06:00
Mihapro
9a941ae125
Scripts/Instance: The Stonecore updates
...
Stonecore Teleporters scripted. Some corrections, better handlings, fixed Travis warnings ...
Closes #13626
2014-12-28 17:52:16 +00:00
Nayd
81a0e68c9f
Core/Spells: Remove a not-required spell dbc correction ( b0b7a55bdb)
2014-12-28 17:08:32 +00:00
Gooyeth
b0b7a55bdb
Scripts/Quests: Fix Red Snapper - Very Tasty! GOb
...
Fix 'School of Red Snapper' now disappear correctly when using 'Draenei Fishing Net', the bug is caused because the GameObject is SpellFocus type.
Fix #1673
Closes #13748
2014-12-28 17:03:33 +00:00
Natureknight
e8955cf6dd
Scripts/Spells: Death Grip should not be castable while jumping/falling and should have 8-30 yards range in PvP instead of 0-30 yards
...
Closes #13499
2014-12-28 16:54:41 +00:00
Duarte Duarte
32d9a71a42
Merge pull request #13547 from heihachi/master
...
Core/Player: Fix Restes/RaF exp on the exp bar and from kills
2014-12-28 15:57:28 +00:00
MitchesD
3d3dafbe38
Scripts/ICC: fixed situations when LK tried to cast Necrotic Plague on pets and then Necrotic Plague was omitted
2014-12-28 12:09:12 +01:00
Rat
708b09e9f7
Core/Logs: fixing typos
2014-12-28 10:44:10 +01:00
Rat
d1e7c6d080
Core/Logs: fixing typos
2014-12-28 10:41:08 +01:00