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

..

compiler

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

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

macros

Core/Build: Restore FindOpenSSL, even when it's provided by cmake, this file also provides newbie-check (warns if you trying to use wrong libs)

2012-11-10 13:15:09 +01:00

platform

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

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

genrev.cmake

update forgotten copyright-headers for 2012

2012-03-11 20:53:08 +01:00

options.cmake

Tools: Added an experimental tool (still WIP) to replace the current mmaps generator

2012-09-28 06:59:31 -05:00

showoptions.cmake

Core: Remove the MersenneTwiser-library (SFMT is now considered stable enough for full deployment)

2012-03-27 02:27:12 +02:00