viktorljung 7d4a4ed7cf Merge remote-tracking branch 'origin/master' into Animations ...

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

2016-02-11 14:38:23 +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-11 14:38:23 +01:00

Shaders

Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer

2016-02-10 17:16:14 +01:00

DefaultConfig.ini

Used config for soundsystem properties.

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

DefaultInput.ini

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

2016-02-10 17:02:00 +01:00