stiffly 330f08b926 Merge remote-tracking branch 'origin/master' into Networking ...

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

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

..

Collision

Fixed comment on Trigger events.

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

Core

Merge branch 'master' into OctTree

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

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

2015-12-17 14:10:02 +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