Jace be3cfef65f Merge remote-tracking branch 'origin/master' into EditorUsefulness ...

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp

2016-02-01 16:00:46 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-01-27 15:41:31 +01:00

Shaders

Some wierd shader faults and merge error fixe

2016-01-27 15:54:36 +01:00

DefaultConfig.ini

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

2016-01-22 16:19:35 +01:00

DefaultInput.ini

Functional translation widget in global and local space

2016-02-01 15:47:56 +01:00