viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp

2016-02-10 14:13:08 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-02-10 14:13:08 +01:00

Shaders

Merge fixes

2016-02-10 13:44:47 +01:00

DefaultConfig.ini

Used config for soundsystem properties.

2016-02-08 16:40:13 +01:00

DefaultInput.ini

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

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