Jace 47f4711b85 Merge remote-tracking branch 'origin/Menu' into WeaponSystem ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Systems/PlayerSpawnSystem.cpp

2016-02-12 07:18:20 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-02-12 07:18:20 +01:00

Shaders

Merge pull request #103 from teamfisk/WeaponSystem

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

DefaultConfig.ini

Hopeless attempts to fix network bugs

2016-02-12 05:17:09 +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