antc13 aa20b48188 Merge remote-tracking branch 'origin/master' into Importer ...

# Conflicts:
#	resources/Schema/Entities/MovementTest.xml
#	resources/Schema/Entities/Player.xml

2016-01-24 16:22:22 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-01-24 16:22:22 +01:00

Shaders

Removed temp variables & the "forced" animation in DrawFinalPass

2016-01-24 15:30:20 +01:00

DefaultConfig.ini

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

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

DefaultInput.ini

Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!

2016-01-15 16:32:04 +01:00