stiffly e0c4394f20 Merge. Also fixed interpolation for scale and rotation. ...

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

# Conflicts:
#	include/Game/Game.h
#	src/Game/CMakeLists.txt
#	src/Game/Game.cpp

2016-01-19 14:04:25 +01:00

..

Collision

CollisionSystem loops over Collidable components.

2016-01-18 13:29:10 +01:00

Core

Merge pull request #36 from teamfisk/PlayerMovement

2016-01-18 13:32:42 +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

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

2016-01-18 17:27:55 +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 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