William Moberg 04a01104b5 Merge branch 'master' into OctTree ...

# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp

2015-12-15 17:11:11 +01:00

..

Collision

Very simple CollisionSystem made, 'Z','Y' to toggle on/off.

2015-12-15 15:36:28 +01:00

Core

Merge branch 'master' into OctTree

2015-12-15 17:11:11 +01:00

Editor

Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable.

2015-12-14 16:12:52 +01:00

GUI

Engine puzzle completed

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

Input

MouseInputHandler

2015-12-12 13:42:46 +01:00

Network

Renamed Networking -> Network

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

Rendering

Created a RenderState for ImGuiRenderPass

2015-12-14 20:26:04 +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