Merge branch 'Develop' into 2d-game/feature/dungeon-generator

LeonardoTPereira · Mar 2, 2023 · 2966f66 · 2966f66
2 parents c41095b + 7358acc
commit 2966f66
Show file tree

Hide file tree

Showing 553 changed files with 26,052 additions and 14,854 deletions.
diff --git a/Assets/Animations/fitness/FitnessAnimation.anim b/Assets/Animations/fitness/FitnessAnimation.anim
diff --git a/Assets/Material/Player.physicsMaterial2D b/Assets/Material/Player.physicsMaterial2D
@@ -0,0 +1,11 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!62 &6200000
+PhysicsMaterial2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Player
+  friction: 0
+  bounciness: 0
diff --git a/Assets/Material/Player.physicsMaterial2D.meta b/Assets/Material/Player.physicsMaterial2D.meta
diff --git a/Assets/Prefabs/Rooms/BlueRoom.meta → .../PlatformGameAssets/Prefabs/PowerUps.meta b/Assets/Prefabs/Rooms/BlueRoom.meta → .../PlatformGameAssets/Prefabs/PowerUps.meta
diff --git a/Assets/Prefabs/Rooms/GreenRoom.meta → ...formGameAssets/Prefabs/PowerUps/Heal.meta b/Assets/Prefabs/Rooms/GreenRoom.meta → ...formGameAssets/Prefabs/PowerUps/Heal.meta
diff --git a/Assets/Prefabs/Rooms/PurpleRoom/Tile.prefab → ...ts/Prefabs/PowerUps/Heal/FullHeart.prefab b/Assets/Prefabs/Rooms/PurpleRoom/Tile.prefab → ...ts/Prefabs/PowerUps/Heal/FullHeart.prefab
diff --git a/...bs/Rooms/BlueRoom/NEColPrefab.prefab.meta → ...efabs/PowerUps/Heal/FullHeart.prefab.meta b/...bs/Rooms/BlueRoom/NEColPrefab.prefab.meta → ...efabs/PowerUps/Heal/FullHeart.prefab.meta
diff --git a/Assets/Prefabs/Rooms/BlueRoom/Tile.prefab → ...ts/Prefabs/PowerUps/Heal/HalfHeart.prefab b/Assets/Prefabs/Rooms/BlueRoom/Tile.prefab → ...ts/Prefabs/PowerUps/Heal/HalfHeart.prefab
diff --git a/.../Prefabs/Rooms/BlueRoom/Block.prefab.meta → ...efabs/PowerUps/Heal/HalfHeart.prefab.meta b/.../Prefabs/Rooms/BlueRoom/Block.prefab.meta → ...efabs/PowerUps/Heal/HalfHeart.prefab.meta