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

# Conflicts: # resources/Schema/Entities/RayAssaultBlue.xml
2016-03-13 16:45:57 +01:00
parent 3cee4e4248 041050ab2f
commit 0d287ad5d1
14 changed files with 1290 additions and 129 deletions
@@ -11,7 +11,7 @@ void FadeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade,
        return;
    }

-    if (!(bool)cFade["Out"]) {
+    if ((bool)cFade["Out"]) {
        dTime *= -1;
    }