William Moberg c4642cc530 Merge branch 'master' into OrderedSystemPipeline ...

# Conflicts:
#	include/Engine/Core/SystemPipeline.h

2016-01-07 15:07:16 +01:00

..

Collision

Fixed comment on Trigger events.

2015-12-17 13:48:35 +01:00

Core

Merge branch 'master' into OrderedSystemPipeline

2016-01-07 15:07:16 +01:00

Editor

Translation widget planes

2015-12-17 15:30:43 +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

Network not longer threaded

2015-12-18 12:00:14 +01:00

Rendering

Fixed exit crash(es)

2016-01-06 11:20:16 +01:00

Sound

Initial directory structure

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

Common.h

Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode.

2015-12-17 13:31:54 +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