William Moberg 46ae2d39af Merge branch 'master' into OctTree ...

# Conflicts:
#	src/Game/Game.cpp

2015-12-17 16:44:01 +01:00

..

Schema

Merge branch 'master' into OctTree

2015-12-17 16:44:01 +01:00

Shaders

Forward+ Debugging commit, dont try it.

2015-12-09 17:36:03 +01:00

DefaultConfig.ini

Updated default configs with editor stuff

2015-12-17 10:46:49 +01:00

DefaultInput.ini

Updated default configs with editor stuff

2015-12-17 10:46:49 +01:00