Merge branch 'main' of https://github.com/NetSquad/BottomGear into main

NetSquad · Jan 5, 2021 · fd81ada · fd81ada
2 parents b8aab51 + bd9edd9
commit fd81ada
Show file tree

Hide file tree

Showing 80 changed files with 62,547 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# Wwise
+/Wwise_Bottom_Gear_Project/.cache/
+/Wwise_Bottom_Gear_Project/Originals/SFX/*.akd
diff --git a/BottomGear/Assets/Game/Assets/Images.meta b/BottomGear/Assets/Game/Assets/Images.meta
diff --git a/BottomGear/Assets/Game/Assets/Images/BG_Logo.png b/BottomGear/Assets/Game/Assets/Images/BG_Logo.png
diff --git a/BottomGear/Assets/Game/Assets/Images/BG_Logo.png.meta b/BottomGear/Assets/Game/Assets/Images/BG_Logo.png.meta
diff --git a/BottomGear/Assets/Game/Assets/Images/BottomGear.png b/BottomGear/Assets/Game/Assets/Images/BottomGear.png
diff --git a/BottomGear/Assets/Game/Assets/Images/BottomGear.png.meta b/BottomGear/Assets/Game/Assets/Images/BottomGear.png.meta