William Moberg ce7b26ccac Merge branch 'master' into OctTree ...

# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp

2015-12-10 16:37:55 +01:00

..

Core

Merge branch 'master' into OctTree

2015-12-10 16:37:55 +01:00

GUI

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Input

Added Input

2015-11-24 10:37:50 +01:00

Network

Renamed Networking -> Network

2015-12-07 15:22:26 +01:00

Rendering

Fixed absoute positioning, I think...

2015-12-10 10:16:03 +01:00

Sound

Initial directory structure

2015-11-20 15:01:37 +01:00

Common.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

GLM.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

OpenGL.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00