Nay 24cd72c8e1 Merge remote-tracking branch 'origin/master' into mmaps ...

Conflicts:
	src/server/game/Maps/Map.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/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.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/Spells/SpellEffects.cpp

2012-11-23 23:39:03 +00:00

..

Management

Merge remote-tracking branch 'origin/master' into mmaps

2012-09-11 01:13:41 +01:00

Maps

Merge remote-tracking branch 'origin/master' into mmaps

2012-09-11 01:13:41 +01:00

Models

Merge remote-tracking branch 'origin/master' into mmaps

2012-11-23 23:39:03 +00:00

PrecompiledHeaders

…

BoundingIntervalHierarchy.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

BoundingIntervalHierarchy.h

Core/Misc: Code-style + some const methods.

2012-06-21 21:05:45 +03:00

BoundingIntervalHierarchyWrapper.h

Fix a lot of warnings

2012-02-16 13:56:28 +01:00

CMakeLists.txt

Merge remote-tracking branch 'origin/master' into mmaps

2012-11-23 23:39:03 +00:00

DynamicTree.cpp

Fix a lot of warnings

2012-02-16 13:56:28 +01:00

DynamicTree.h

Core: Clean up whitespace and tabs in the base sourcetree

2012-02-18 16:52:08 +01:00

RegularGrid.h

Core/Build: Enable Clang PCH support and OS X specific features

2012-11-09 13:13:45 +01:00

VMapDefinitions.h

Core/Maps

2012-03-07 13:09:35 +01:00

VMapTools.h

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00