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

Merge remote-tracking branch 'origin/main' into rizzy

Browse Source
This commit is contained in:
MindfulMinun committed 2022-02-26 22:24:11 -06:00
2 parents 6f5e3d4276 b760b5d65c
commit 8fa907025c
318 files changed
+8115 -323
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserSettings/EditorUserSettings.asset
+19
View File
@@ -9,6 +9,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-1:
<<<<<<< HEAD
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-2:
@@ -22,6 +23,24 @@ EditorUserSettings:
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
=======
value: 22424703114646680e0b0227036c71091503173a242724392c67083debf42d
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662e23e7e53078cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
>>>>>>> origin/main
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650