Jace 567173c565 Merge branch 'master' into PlayerMovement ...

# Conflicts:
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp

2016-01-14 18:24:34 +01:00

..

Collision

Merge fixes

2016-01-14 18:20:51 +01:00

Core

Merge branch 'master' into PlayerMovement

2016-01-14 18:24:34 +01:00

Editor

Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)

2016-01-14 15:26:06 +01:00

GUI

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

Input

MouseInputHandler

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

Network

Removed Close method from Client, Server and Network.

2016-01-12 17:47:03 +01:00

Rendering

Merge fixes

2016-01-14 18:20:51 +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