Tleety 7498cebf5e Merge remote-tracking branch 'origin/master' into Forward+ ...

# Conflicts:
#	src/Engine/Rendering/DrawFinalPassState.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-01-22 15:57:38 +01:00

..

Engine

Merge remote-tracking branch 'origin/master' into Forward+

2016-01-22 15:57:38 +01:00

Game

Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)

2016-01-21 17:36:47 +01:00