William Moberg b9d6d59c62 Merge branch 'BoxModelCollision' into FrustumCulling ...

# Conflicts:
#	src/Game/Game.cpp

2016-02-09 15:03:13 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'BoxModelCollision' into FrustumCulling

2016-02-09 15:03:13 +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

Put SpecialAbility on left shift, and Sprint on left shift in DefaultInput.

2016-02-05 17:34:19 +01:00