merge commit

This commit is contained in:
Dylan Wilson
2018-02-07 22:20:05 +10:00
84 changed files with 2025 additions and 99 deletions
@@ -155,6 +155,7 @@ namespace MonoGame.Extended.Entities
return;
var entityTemplate = _dependencyResolver.Resolve<EntityTemplate>(typeInfo.AsType());
entityTemplate.Manager = this;
EntityManager.AddEntityTemplate(entityTemplateAttribute.Name, entityTemplate);
}
}