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

..

Core

Merge branch 'master' into gui

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

Game

Merge branch 'master' into gui

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

GUI

Frame is now sized to parent by default

2015-10-08 21:50:04 +02:00

Input

Initial structure

2015-09-04 10:02:06 +02:00

Physics

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

2015-10-08 21:44:50 +02:00

Rendering

Base lightrendering started, still some work to be done.

2015-09-10 22:13:37 +02:00

Sound

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

2015-10-07 18:34:36 +02:00

Transform

WIP Level System + Pad

2015-09-10 20:28:48 +02:00

PrecompiledHeader.h

Initial structure

2015-09-04 10:02:06 +02:00