BRNSystems/GeoJam2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Cutsceeens

Browse Source
This commit is contained in:
Bruno Rybársky
2021-07-24 12:38:43 +02:00
parent 1c5be0cda2
commit d739b54515
82 changed files with 36952 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
UserSettings/EditorUserSettings.asset
View File

@@ -6,58 +6,31 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-1:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c731500121478623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c731500121479623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c73150012147f623d28393930
=======
value: 22424703114646680e0b0227036c73150012147b623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c731500121478623d28393930
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-5:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
=======
value: 22424703114646680e0b0227036c731500121479623d28393930
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0
RecentlyUsedScenePath-7:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c73150012147b623d28393930
=======
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c73150012147e623d28393930
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c731500121479623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c731500121478623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c73150012147b623d28393930
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c72151802563f22213229
flags: 0
UnityRemoteCompression:
value: 337f73
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c761e0205176439262f2434
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c70050205176439262f2434
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650

21
UserSettings/EditorUserSettings.asset.old Normal file
View File

@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 1