Jace b2213dbe9a Merge remote-tracking branch 'origin/master' into PlayerMovement ...

# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp

2016-01-15 20:28:43 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-01-15 20:28:43 +01:00

Shaders

Frustum culling now works correctly for all resolutions

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

DefaultConfig.ini

Added a bool option to disable threads in in the configfile regarding resource loading.

2016-01-15 16:18:39 +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