Commit Graph

2 Commits

Author SHA1 Message Date
stiffly ad9bb5fba4 Added an extra interpolation point. 2016-01-19 15:03:10 +01:00
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