Teejoon d8f9f15d34 Merge branch 'master' into DDS ...

Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp

2016-03-10 19:55:25 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into DDS

2016-03-10 19:55:25 +01:00

Shaders

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

2016-03-09 19:38:55 +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