Merge remote-tracking branch 'origin/master' into Animations

# Conflicts: # resources/Schema/Types/Entity.xsd
2016-03-03 23:21:14 +01:00
parent e3fbd2082c c467d54d44
commit 66c8a17b17
63 changed files with 13161 additions and 2602 deletions
@@ -27,6 +27,7 @@ struct EntityWrapper
    bool HasComponent(const std::string& componentType);
    void AttachComponent(const char* componentName);
    EntityWrapper Parent();
+    EntityWrapper FirstParentByName(const std::string& parentEntityName);
    EntityWrapper FirstChildByName(const std::string& name);
    EntityWrapper FirstLevelChildByName(const std::string& name);
    EntityWrapper FirstParentWithComponent(const std::string& componentType);