Ovahlord 98fdf72c7b Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld ...

# Conflicts:
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h

2018-01-02 01:23:06 +01:00

..

Commands

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld

2018-01-02 01:23:06 +01:00

Custom

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

EasternKingdoms

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld

2018-01-02 01:23:06 +01:00

Events

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

Kalimdor

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld

2018-01-02 01:23:06 +01:00

Maelstrom

Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.

2018-01-01 16:02:22 +01:00

Northrend

Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.

2018-01-01 16:02:22 +01:00

OutdoorPvP

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

Outland

Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.

2018-01-01 16:02:22 +01:00

Pet

Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.

2018-01-01 16:02:22 +01:00

Spells

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld

2018-01-02 01:23:06 +01:00

World

Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.

2018-01-01 16:02:22 +01:00

CMakeLists.txt

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

ScriptLoader.cpp.in.cmake

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

ScriptLoader.h

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

ScriptPCH.cpp

Update copyright note for 2018

2018-01-01 01:06:19 +01:00

ScriptPCH.h

Update copyright note for 2018

2018-01-01 01:06:19 +01:00