viktorljung 9a23d8887a Merge remote-tracking branch 'origin/master' into TextRendering ...

# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-23 11:48:10 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-01-23 11:48:10 +01:00

Shaders

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

2016-01-19 17:27:09 +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