verysecrethero 4c1a49a8a4 Merge remote-tracking branch 'origin/master' into CapturePointTake ...

# Conflicts:
#	include/Engine/Core/ComponentWrapper.h
#	include/Game/PlayerSystem.h
#	include/Game/Systems/HealthSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Components/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/CMakeLists.txt
#	src/Game/PlayerSystem.cpp
#	src/Game/Systems/HealthSystem.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestGameClass.h
#	src/Tests/OctTreeTestGameMain.cpp
#	src/Tests/OctTreeTestHardCodedTestWorld.h

2016-01-18 16:48:49 +01:00

..

Licenses

Fixes for #34 (Licenses)

2016-01-15 17:20:11 +01:00

Schema

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

2016-01-18 16:48:49 +01:00

Shaders

Frustum culling now works correctly for all resolutions

2016-01-15 15:38:14 +01:00

DefaultConfig.ini

Added an option to disable the Pool allocation in Config.ini, in case there is a mess with the MemoryPool.

2016-01-18 10:16:35 +01:00

DefaultInput.ini

Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!

2016-01-15 16:32:04 +01:00