FakeShemp e23ea78aeb Merge remote-tracking branch 'origin/master' into Shadows ...

# Conflicts:
#	resources/Shaders/ForwardPlus.frag.glsl

2016-03-01 13:04:11 +01:00

..

Engine

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

2016-03-01 13:04:11 +01:00

Game

Added component CapturePointGameMode that contains respawntime.

2016-02-29 18:20:14 +01:00