verysecrethero a8ab49f202 Merge remote-tracking branch 'origin/master' into DoubleJumpEffect ...

# Conflicts:
#	include/Game/Systems/PlayerMovementSystem.h

2016-02-11 15:19:01 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-02-11 15:19:01 +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 DoubleJumpEffect

2016-02-11 15:19:01 +01:00