verysecrethero 3301f66ad1 Merge remote-tracking branch 'origin/master' into DamageIndicator ...

# Conflicts:
#	resources/Shaders/Sprite.vert.glsl

2016-02-11 16:36:48 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-02-11 16:36:48 +01:00

Shaders

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

2016-02-11 14:43:30 +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