Merge remote-tracking branch 'origin/Weapons' into Movement

# Conflicts: # resources/Schema/Entities/PlayerDefenderBlue.xml
2016-03-08 14:34:21 +01:00
parent 8d1877321a 77b9112f55
commit f934f972e8
90 changed files with 20404 additions and 4825 deletions
@@ -18,7 +18,7 @@ public:
    
    void LoadBindings(std::string file);
 	void Update(double dt);
-    void Process();
+    void Process(bool suppressNewEvents = false);
    template <typename T>
    void AddHandler();
    void Publish(const Events::InputCommand& e);