FakeShemp 28e9ba1208 Merge branch 'master' into Shadows ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-03-03 03:00:05 +01:00

..

EditorGUI.cpp

Fixed editor keyboard shortcuts getting mixed up with GUI input actions

2016-03-01 13:38:51 +01:00

EditorRenderSystem.cpp

Merge branch 'master' into Shadows

2016-03-03 03:00:05 +01:00

EditorStats.cpp

Added a stats window

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

EditorSystem.cpp

Fix the remainder of errors. Might have borked splatmap in the process.

2016-03-02 10:57:22 +01:00

EditorWidgetSystem.cpp

Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.

2016-02-08 13:33:55 +01:00