Teejoon 77eaa45702 Merge remote-tracking branch 'origin/master' into HEAD ...

Conflicts:
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/DrawFinalPass.cpp

2016-03-01 12:11:27 +01:00

..

EditorCameraInputController.h

Fixes #66 warnings

2016-02-01 17:53:01 +01:00

EditorGUI.h

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

2016-03-01 12:11:27 +01:00

EditorRenderSystem.h

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

EditorStats.h

Added a stats window

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

EditorSystem.h

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

2016-03-01 12:11:27 +01:00

EditorWidgetSystem.h

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