kaelima 0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps ...

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h

2012-12-21 00:00:16 +01:00

..

CMakeLists.txt

Merge git://github.com/TrinityCore/TrinityCore into mmaps

2012-11-05 12:02:08 +01:00

cs_account.cpp

Core/Account: Add logs for password change and fail change password

2012-12-18 01:58:12 +01:00

cs_achievement.cpp

Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch

2012-11-27 13:03:12 +01:00

cs_ban.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_bf.cpp

Battlefield/Wintergrasp:

2012-08-20 13:50:49 -04:00

cs_cast.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_character.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_cheat.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_debug.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_disable.cpp

Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch

2012-11-27 13:03:12 +01:00

cs_event.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_gm.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

cs_go.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_gobject.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

cs_guild.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_honor.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_instance.cpp

Core: Remove Player.h dependency from all the possible headers

2012-11-17 05:18:37 +01:00

cs_learn.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_lfg.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_list.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_lookup.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

cs_message.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_misc.cpp

Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails

2012-11-24 02:45:48 +01:00

cs_mmaps.cpp

Update src/server/scripts/Commands/cs_mmaps.cpp

2012-11-12 14:43:51 +02:00

cs_modify.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

cs_npc.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_quest.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_reload.cpp

Core/Quest: Removed table quest_start_scripts

2012-12-04 11:23:10 +01:00

cs_reset.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_server.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_tele.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_ticket.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

cs_titles.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_wp.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00