Jace b2213dbe9a Merge remote-tracking branch 'origin/master' into PlayerMovement ...

# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp

2016-01-15 20:28:43 +01:00

..

Collision

Merge fixes

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

Core

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

2016-01-15 20:28:43 +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

Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!

2016-01-15 16:32:04 +01:00

Network

Removed Close method from Client, Server and Network.

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

Rendering

Merge pull request #33 from teamfisk/Forward+

2016-01-15 16:20:53 +01:00

Sound

Now calculating the velocity for the listener correctly.

2016-01-15 15:43:20 +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