FakeShemp 6c072aae45 Merge remote-tracking branch 'origin/master' into ExplosionEffectV2 ...

# Conflicts:
#	resources/Schema/Components/ExplosionEffect.xml
#	resources/Shaders/ExplosionEffect.geom.glsl
#	src/Game/Systems/ExplosionEffectSystem.cpp

2016-03-10 11:49:51 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-03-10 11:49:51 +01:00

Shaders

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

2016-03-10 11:49:51 +01:00

DefaultConfig.ini

Fixes

2016-03-03 22:58:45 +01:00

DefaultInput.ini

SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked.

2016-03-04 05:41:29 +01:00