stiffly 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking ...

# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp

2015-12-15 11:50:01 +01:00

..

Schema

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

2015-12-15 11:50:01 +01:00

Shaders

Forward+ Debugging commit, dont try it.

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

DefaultConfig.ini

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

2015-12-14 17:07:12 +01:00

DefaultInput.ini

Refactored InputProxy to gracefully handle cases where multiple origins send the same command

2015-12-12 13:42:35 +01:00