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

..

Engine

Merge. Also fixed interpolation for scale and rotation.

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

Game

Merge. Also fixed interpolation for scale and rotation.

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