Jace 7f344263da Merge branch 'master' into gui ...

Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp

2015-10-08 23:47:25 +02:00

..

ELoadingFrameComplete.h

fixup: Loading frame

2015-10-08 23:40:58 +02:00

FPSCounter.h

Moved game GUI to its own subfolder

2015-10-08 10:46:28 +02:00

HUD.h

Merge branch 'master' into gui

2015-10-08 23:47:25 +02:00

LoadingFrame.h

fixup: Loading frame

2015-10-08 23:40:58 +02:00

MainMenu.h

Moved game GUI to its own subfolder

2015-10-08 10:46:28 +02:00

MainMenuMain.h

Added first stage story

2015-10-08 23:41:59 +02:00

MainMenuOptions.h

Moved game GUI to its own subfolder

2015-10-08 10:46:28 +02:00

Story1.h

Added first stage story

2015-10-08 23:41:59 +02:00

StoryboardFrame.h

Added first stage story

2015-10-08 23:41:59 +02:00