viktorljung 6442254575 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	src/Game/Game.cpp

2016-02-12 02:09:14 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-02-12 02:09:14 +01:00

Shaders

Merge pull request #103 from teamfisk/WeaponSystem

2016-02-11 23:16:44 +01:00

DefaultConfig.ini

Merge branch 'master' into Respawning

2016-02-12 00:29:51 +01:00

DefaultInput.ini

DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem.

2016-02-12 00:52:58 +01:00