mindfulminun/FebGameJam
1
0 Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-10-11 18:19:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from frizbee19/fish

Browse Source 
done
This commit is contained in:
Benji authored and GitHub committed 2022-02-27 04:35:00 -06:00
2 parents 0cd790fc78 8012acb319
commit 2cf09659f7
2 files changed
+515 -166
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/Game Scenes/Bird Level.unity
+508 -166
View File
File diff suppressed because it is too large. Load diff
UserSettings/EditorUserSettings.asset
+7
View File
@@ -8,6 +8,12 @@ EditorUserSettings:
<<<<<<< HEAD <<<<<<< HEAD
======= =======
RecentlyUsedScenePath-0: RecentlyUsedScenePath-0:
<<<<<<< HEAD
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
=======
<<<<<<< HEAD <<<<<<< HEAD
======= =======
<<<<<<< Updated upstream <<<<<<< Updated upstream
@@ -55,6 +61,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6 value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
>>>>>>> Stashed changes >>>>>>> Stashed changes
>>>>>>> Stashed changes >>>>>>> Stashed changes
>>>>>>> origin/main
>>>>>>> origin/main >>>>>>> origin/main
flags: 0 flags: 0
>>>>>>> origin/main >>>>>>> origin/main