William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-05 14:59:14 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into BoxModelCollision

2016-02-05 14:59:14 +01:00

Shaders

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +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