William Moberg 9f6fa40448 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Engine/Collision/CollisionSystem.cpp

2016-01-21 17:16:55 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into BoxModelCollision

2016-01-21 17:16:55 +01:00

Shaders

Removed some debug code

2016-01-19 16:48:59 +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