viktorljung ea9c4d19d0 Merge remote-tracking branch 'origin/master' into TextRendering ...

# Conflicts:
#	include/Game/Game.h

2016-01-21 10:19:32 +01:00

..

Collision

Can add any objects that inherit from AABB into the Octree.

2016-01-19 14:50:46 +01:00

Core

Merge pull request #37 from teamfisk/OctTree

2016-01-21 09:57:46 +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

Added logic to go from spectator to player.

2016-01-20 17:41:16 +01:00

Rendering

Clean up

2016-01-21 10:16:03 +01:00

Sound

Now calculating the velocity for the listener correctly.

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

Common.h

Added runtime type size check to ComponentWrapper to avoid corruption when types don't match

2016-01-17 00:59:26 +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