Jace 0334ec3fa7 Merge remote-tracking branch 'origin/Animations' ...

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/WeaponSystem.cpp

2016-01-27 13:36:49 +01:00

..

EditorGUI.cpp

Healthbar on player

2016-01-24 22:21:10 +01:00

EditorRenderSystem.cpp

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

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

EditorStats.cpp

Added a stats window

2016-01-18 18:54:57 +01:00

EditorSystem.cpp

Healthbar on player

2016-01-24 22:21:10 +01:00

EditorWidgetSystem.cpp

Some further small fizes to resolution //Tobias

2016-01-25 01:26:41 +01:00