William Moberg 97b915f130 Merge branch 'master' into Respawning ...

# Conflicts:
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/SoundSystem.cpp

2016-02-11 16:15:47 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into Respawning

2016-02-11 16:15:47 +01:00

Shaders

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

2016-02-11 14:43:30 +01:00

DefaultConfig.ini

WIP respawning.

2016-02-11 16:08:19 +01:00

DefaultInput.ini

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

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