Folder order standardized.

ertanturan · Jan 6, 2020 · 5c80b1e · 5c80b1e
1 parent ebd56fe
commit 5c80b1e
Show file tree

Hide file tree

Showing 44 changed files with 36 additions and 4 deletions.
diff --git a/Assets/CustomTools.meta b/Assets/CustomTools.meta
diff --git a/Assets/CustomTools/ObjectPooling.meta b/Assets/CustomTools/ObjectPooling.meta
diff --git a/Assets/CustomTools/ObjectPooling/Resources.meta b/Assets/CustomTools/ObjectPooling/Resources.meta
diff --git a/Assets/Default.physicMaterial → ...tPooling/Resources/Default.physicMaterial b/Assets/Default.physicMaterial → ...tPooling/Resources/Default.physicMaterial
diff --git a/Assets/Default.physicMaterial.meta → ...ing/Resources/Default.physicMaterial.meta b/Assets/Default.physicMaterial.meta → ...ing/Resources/Default.physicMaterial.meta
diff --git a/Assets/Materials.meta → ...ls/ObjectPooling/Resources/Materials.meta b/Assets/Materials.meta → ...ls/ObjectPooling/Resources/Materials.meta
diff --git a/Assets/Materials/Gray.mat → ...bjectPooling/Resources/Materials/Gray.mat b/Assets/Materials/Gray.mat → ...bjectPooling/Resources/Materials/Gray.mat
diff --git a/Assets/Materials/Gray.mat.meta → ...Pooling/Resources/Materials/Gray.mat.meta b/Assets/Materials/Gray.mat.meta → ...Pooling/Resources/Materials/Gray.mat.meta
diff --git a/Assets/Materials/White.mat → ...jectPooling/Resources/Materials/White.mat b/Assets/Materials/White.mat → ...jectPooling/Resources/Materials/White.mat
diff --git a/Assets/Materials/White.mat.meta → ...ooling/Resources/Materials/White.mat.meta b/Assets/Materials/White.mat.meta → ...ooling/Resources/Materials/White.mat.meta
diff --git a/Assets/Prefabs.meta → ...ools/ObjectPooling/Resources/Prefabs.meta b/Assets/Prefabs.meta → ...ools/ObjectPooling/Resources/Prefabs.meta
diff --git a/Assets/Prefabs/Dummies.meta → ...ectPooling/Resources/Prefabs/Dummies.meta b/Assets/Prefabs/Dummies.meta → ...ectPooling/Resources/Prefabs/Dummies.meta
diff --git a/...ts/Prefabs/Dummies/Cube And Sphere.prefab → ...es/Prefabs/Dummies/Cube And Sphere.prefab b/...ts/Prefabs/Dummies/Cube And Sphere.prefab → ...es/Prefabs/Dummies/Cube And Sphere.prefab
diff --git a/...efabs/Dummies/Cube And Sphere.prefab.meta → ...efabs/Dummies/Cube And Sphere.prefab.meta b/...efabs/Dummies/Cube And Sphere.prefab.meta → ...efabs/Dummies/Cube And Sphere.prefab.meta
diff --git a/Assets/Prefabs/Dummies/Cube.prefab → ...ing/Resources/Prefabs/Dummies/Cube.prefab b/Assets/Prefabs/Dummies/Cube.prefab → ...ing/Resources/Prefabs/Dummies/Cube.prefab
diff --git a/Assets/Prefabs/Dummies/Cube.prefab.meta → ...esources/Prefabs/Dummies/Cube.prefab.meta b/Assets/Prefabs/Dummies/Cube.prefab.meta → ...esources/Prefabs/Dummies/Cube.prefab.meta
diff --git a/Assets/Prefabs/Dummies/Sphere.prefab → ...g/Resources/Prefabs/Dummies/Sphere.prefab b/Assets/Prefabs/Dummies/Sphere.prefab → ...g/Resources/Prefabs/Dummies/Sphere.prefab
diff --git a/Assets/Prefabs/Dummies/Sphere.prefab.meta → ...ources/Prefabs/Dummies/Sphere.prefab.meta b/Assets/Prefabs/Dummies/Sphere.prefab.meta → ...ources/Prefabs/Dummies/Sphere.prefab.meta
diff --git a/Assets/Prefabs/Spawner.prefab → ...tPooling/Resources/Prefabs/Spawner.prefab b/Assets/Prefabs/Spawner.prefab → ...tPooling/Resources/Prefabs/Spawner.prefab
diff --git a/Assets/Prefabs/Spawner.prefab.meta → ...ing/Resources/Prefabs/Spawner.prefab.meta b/Assets/Prefabs/Spawner.prefab.meta → ...ing/Resources/Prefabs/Spawner.prefab.meta
diff --git a/Assets/Scenes.meta → Assets/CustomTools/ObjectPooling/Scenes.meta b/Assets/Scenes.meta → Assets/CustomTools/ObjectPooling/Scenes.meta
diff --git a/Assets/Scenes/Main.unity → ...stomTools/ObjectPooling/Scenes/Main.unity b/Assets/Scenes/Main.unity → ...stomTools/ObjectPooling/Scenes/Main.unity
diff --git a/Assets/Scenes/Main.unity.meta → ...ools/ObjectPooling/Scenes/Main.unity.meta b/Assets/Scenes/Main.unity.meta → ...ools/ObjectPooling/Scenes/Main.unity.meta
diff --git a/Assets/Scripts.meta → ...ts/CustomTools/ObjectPooling/Scripts.meta b/Assets/Scripts.meta → ...ts/CustomTools/ObjectPooling/Scripts.meta
diff --git a/Assets/Scripts/ObjectPool.meta → ...ols/ObjectPooling/Scripts/ObjectPool.meta b/Assets/Scripts/ObjectPool.meta → ...ols/ObjectPooling/Scripts/ObjectPool.meta
diff --git a/Assets/Scripts/ObjectPool/IPooledObject.cs → ...oling/Scripts/ObjectPool/IPooledObject.cs b/Assets/Scripts/ObjectPool/IPooledObject.cs → ...oling/Scripts/ObjectPool/IPooledObject.cs
diff --git a/.../Scripts/ObjectPool/IPooledObject.cs.meta → .../Scripts/ObjectPool/IPooledObject.cs.meta b/.../Scripts/ObjectPool/IPooledObject.cs.meta → .../Scripts/ObjectPool/IPooledObject.cs.meta
diff --git a/Assets/Scripts/ObjectPool/ObjectPooler.cs → ...ooling/Scripts/ObjectPool/ObjectPooler.cs b/Assets/Scripts/ObjectPool/ObjectPooler.cs → ...ooling/Scripts/ObjectPool/ObjectPooler.cs
diff --git a/...s/Scripts/ObjectPool/ObjectPooler.cs.meta → ...g/Scripts/ObjectPool/ObjectPooler.cs.meta b/...s/Scripts/ObjectPool/ObjectPooler.cs.meta → ...g/Scripts/ObjectPool/ObjectPooler.cs.meta
diff --git a/Assets/Scripts/ObjectPool/PooledObject.cs → ...ooling/Scripts/ObjectPool/PooledObject.cs b/Assets/Scripts/ObjectPool/PooledObject.cs → ...ooling/Scripts/ObjectPool/PooledObject.cs
diff --git a/...s/Scripts/ObjectPool/PooledObject.cs.meta → ...g/Scripts/ObjectPool/PooledObject.cs.meta b/...s/Scripts/ObjectPool/PooledObject.cs.meta → ...g/Scripts/ObjectPool/PooledObject.cs.meta
diff --git a/...ts/Scripts/ObjectPool/PooledObjectType.cs → ...ng/Scripts/ObjectPool/PooledObjectType.cs b/...ts/Scripts/ObjectPool/PooledObjectType.cs → ...ng/Scripts/ObjectPool/PooledObjectType.cs
diff --git a/...ripts/ObjectPool/PooledObjectType.cs.meta → ...ripts/ObjectPool/PooledObjectType.cs.meta b/...ripts/ObjectPool/PooledObjectType.cs.meta → ...ripts/ObjectPool/PooledObjectType.cs.meta
diff --git a/Assets/Scripts/ObjectPool/PooledObjects.cs → ...oling/Scripts/ObjectPool/PooledObjects.cs b/Assets/Scripts/ObjectPool/PooledObjects.cs → ...oling/Scripts/ObjectPool/PooledObjects.cs
diff --git a/.../Scripts/ObjectPool/PooledObjects.cs.meta → .../Scripts/ObjectPool/PooledObjects.cs.meta b/.../Scripts/ObjectPool/PooledObjects.cs.meta → .../Scripts/ObjectPool/PooledObjects.cs.meta
diff --git a/Assets/Scripts/PooledObjects.meta → .../ObjectPooling/Scripts/PooledObjects.meta b/Assets/Scripts/PooledObjects.meta → .../ObjectPooling/Scripts/PooledObjects.meta
diff --git a/Assets/Scripts/PooledObjects/Cube.cs → ...jectPooling/Scripts/PooledObjects/Cube.cs b/Assets/Scripts/PooledObjects/Cube.cs → ...jectPooling/Scripts/PooledObjects/Cube.cs
diff --git a/Assets/Scripts/PooledObjects/Cube.cs.meta → ...ooling/Scripts/PooledObjects/Cube.cs.meta b/Assets/Scripts/PooledObjects/Cube.cs.meta → ...ooling/Scripts/PooledObjects/Cube.cs.meta
diff --git a/Assets/Scripts/PooledObjects/Sphere.cs → ...ctPooling/Scripts/PooledObjects/Sphere.cs b/Assets/Scripts/PooledObjects/Sphere.cs → ...ctPooling/Scripts/PooledObjects/Sphere.cs
diff --git a/Assets/Scripts/PooledObjects/Sphere.cs.meta → ...ling/Scripts/PooledObjects/Sphere.cs.meta b/Assets/Scripts/PooledObjects/Sphere.cs.meta → ...ling/Scripts/PooledObjects/Sphere.cs.meta
diff --git a/Assets/Scripts/Spawner.cs → ...tomTools/ObjectPooling/Scripts/Spawner.cs b/Assets/Scripts/Spawner.cs → ...tomTools/ObjectPooling/Scripts/Spawner.cs
diff --git a/Assets/Scripts/Spawner.cs.meta → ...ols/ObjectPooling/Scripts/Spawner.cs.meta b/Assets/Scripts/Spawner.cs.meta → ...ols/ObjectPooling/Scripts/Spawner.cs.meta
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,15 +1,23 @@
 {
   "dependencies": {
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ads": "2.0.8",
     "com.unity.analytics": "3.3.2",
     "com.unity.collab-proxy": "1.2.16",
+    "com.unity.ext.nunit": "1.0.0",
+    "com.unity.ide.rider": "1.1.0",
+    "com.unity.ide.vscode": "1.1.3",
     "com.unity.multiplayer-hlapi": "1.0.2",
-    "com.unity.package-manager-ui": "2.1.2",
+    "com.unity.package-manager-ui": "2.2.0",
     "com.unity.purchasing": "2.0.6",
+    "com.unity.test-framework": "1.0.13",
     "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.0.0",
+    "com.unity.timeline": "1.1.0",
+    "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.0.2",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.1.6f1
-m_EditorVersionWithRevision: 2019.1.6f1 (f2970305fe1c)
+m_EditorVersion: 2019.2.16f1
+m_EditorVersionWithRevision: 2019.2.16f1 (b9898e2d04a4)