Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Syntriax' into Over

Browse Source 
# Conflicts:
#	Assets/Scripts/Player/PlayerController.cs
This commit is contained in:
OverflowNarhoym
2022-02-21 22:49:52 +01:00
parent 961c8cf865 860847e11a
commit 296ec11d7a
12 changed files with 525 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UserSettings/EditorUserSettings.asset
View File

@@ -9,10 +9,10 @@ EditorUserSettings:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0
RecentlyUsedSceneGuid-1:
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
flags: 0
RecentlyUsedSceneGuid-2:
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650