Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

# Conflicts: # include/Game/InterpolationSystem.h # src/Game/InterpolationSystem.cpp
2016-01-18 18:13:19 +01:00
parent 88eb3ca2db 3e90ed564c
commit a6425160fd
4 changed files with 11 additions and 4 deletions
@@ -12,9 +12,11 @@

 #include "Network/EInterpolate.h"

+
 class InterpolationSystem : public PureSystem
 {
-    struct Transform {
+    struct Transform 
+    {
        glm::vec3 Position;
        glm::vec3 Scale;
        glm::vec3 Orientation;