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

..

HUD

GameOver and WinScreen Added

2015-10-08 23:18:54 +02:00

Menu

Complete main menu without event bindings.

2015-09-25 01:29:14 +02:00

Numbers

Working NumberFrame and score indicator

2015-09-25 05:30:59 +02:00

Loading.png

Added first stage story

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

Spacebar.png

Added first stage story

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

SpacebarSkip.png

Added first stage story

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