Merge branch 'master' into Weapons

2016-03-03 23:46:46 +01:00
parent 7e6d32aaec 9426942988
commit 4dd46e2e21
39 changed files with 3850 additions and 1236 deletions
@@ -10,7 +10,7 @@ public:
        : System(params)
        , PureSystem("Lifetime")
    {
-        LOG_INFO("ASDASDASSA");
+
    }

    virtual void Update(double dt) override;