Merge branch 'ecsrx-update'

EcsRx · Sep 4, 2018 · 636fc69 · 636fc69
2 parents 8f1ab52 + 1bd2d72
commit 636fc69
Show file tree

Hide file tree

Showing 1,546 changed files with 47,125 additions and 31,379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,5 @@ ExportedObj/
 Icon?
 ehthumbs.db
 Thumbs.db
+
+\.idea/
diff --git a/Assets/EcsRx.meta b/Assets/EcsRx.meta
diff --git a/Assets/EcsRx/EcsRx.Infrastructure.dll b/Assets/EcsRx/EcsRx.Infrastructure.dll
diff --git a/Assets/EcsRx/EcsRx.Infrastructure.dll.meta b/Assets/EcsRx/EcsRx.Infrastructure.dll.meta
diff --git a/Assets/EcsRx/EcsRx.MicroRx.dll b/Assets/EcsRx/EcsRx.MicroRx.dll
diff --git a/Assets/EcsRx/EcsRx.MicroRx.dll.meta b/Assets/EcsRx/EcsRx.MicroRx.dll.meta
diff --git a/Assets/EcsRx/EcsRx.Systems.dll b/Assets/EcsRx/EcsRx.Systems.dll
diff --git a/Assets/EcsRx/EcsRx.Systems.dll.meta b/Assets/EcsRx/EcsRx.Systems.dll.meta
diff --git a/Assets/EcsRx/EcsRx.Views.dll b/Assets/EcsRx/EcsRx.Views.dll
diff --git a/Assets/EcsRx/EcsRx.Views.dll.meta b/Assets/EcsRx/EcsRx.Views.dll.meta
diff --git a/Assets/EcsRx/EcsRx.dll b/Assets/EcsRx/EcsRx.dll
diff --git a/Assets/EcsRx/EcsRx.dll.meta b/Assets/EcsRx/EcsRx.dll.meta
diff --git a/Assets/EcsRx/Framework.meta b/Assets/EcsRx/Framework.meta
diff --git a/Assets/EcsRx/Framework/Attributes.meta b/Assets/EcsRx/Framework/Attributes.meta
diff --git a/Assets/EcsRx/Framework/Attributes/PriorityAttribute.cs b/Assets/EcsRx/Framework/Attributes/PriorityAttribute.cs
diff --git a/Assets/EcsRx/Framework/Attributes/PriorityAttribute.cs.meta b/Assets/EcsRx/Framework/Attributes/PriorityAttribute.cs.meta
diff --git a/Assets/EcsRx/Framework/Blueprints.meta b/Assets/EcsRx/Framework/Blueprints.meta
diff --git a/Assets/EcsRx/Framework/Blueprints/IBlueprint.cs b/Assets/EcsRx/Framework/Blueprints/IBlueprint.cs
diff --git a/Assets/EcsRx/Framework/Blueprints/IBlueprint.cs.meta b/Assets/EcsRx/Framework/Blueprints/IBlueprint.cs.meta
diff --git a/Assets/EcsRx/Framework/Components.meta b/Assets/EcsRx/Framework/Components.meta
diff --git a/Assets/EcsRx/Framework/Components/IComponent.cs b/Assets/EcsRx/Framework/Components/IComponent.cs
diff --git a/Assets/EcsRx/Framework/Components/IComponent.cs.meta b/Assets/EcsRx/Framework/Components/IComponent.cs.meta
diff --git a/Assets/EcsRx/Framework/Entities.meta b/Assets/EcsRx/Framework/Entities.meta
diff --git a/Assets/EcsRx/Framework/Entities/DefaultEntityFactory.cs b/Assets/EcsRx/Framework/Entities/DefaultEntityFactory.cs
diff --git a/Assets/EcsRx/Framework/Entities/DefaultEntityFactory.cs.meta b/Assets/EcsRx/Framework/Entities/DefaultEntityFactory.cs.meta
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,3 +49,5 @@ ExportedObj/ @@
     Icon?
     ehthumbs.db
     Thumbs.db
+    \.idea/