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

..

Collision

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

2016-01-21 16:16:35 +01:00

Core

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

2016-01-21 16:16:35 +01:00

Editor

Fixed input going through editor UI

2016-01-21 17:45:20 +01:00

Input

Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.

2016-01-17 01:00:48 +01:00

Network

Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem

2016-01-21 16:30:07 +01:00

Rendering

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

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

Sound

Forgot to change the velocity for the emitters as well...

2016-01-15 16:10:02 +01:00

CMakeLists.txt

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

2016-01-12 14:50:10 +01:00