Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@ooftooft.net:Racesm.git

Browse Source
This commit is contained in:
magn9775
2024-04-22 10:07:05 +02:00
parent d9b73bd148 13cab27498
commit 7ccd4bc8ff
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d884527f3e242c144af52b11faf49d2f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Imported Assets/Simple Garage/Scenes/Garage Scene.unity.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 81a6c41e71d3598448cff03b0ebfc11f guid: f54dec7199617ba4f91ffb978b25966a
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

10
Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
View File

@@ -1,5 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
guid: 3950f1a182dfa4e4198dd80c8cc7adfb
TextScriptImporter:
=======
guid: c51225fde5101214fa7a6f13dc68546c
DefaultImporter:
>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb:Assets/Scenes/Car Customization.unity.meta
=======
<<<<<<< HEAD
guid: cae2c1f325bcbe845b14e25e64899006 guid: cae2c1f325bcbe845b14e25e64899006
TextScriptImporter: TextScriptImporter:
======= =======
@@ -12,6 +21,7 @@ guid: 148686e89d63c1543b7c4ebf056f7fd0
TextScriptImporter: TextScriptImporter:
>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta >>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd >>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd
>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:

4
Assets/Scenes/Car Customization.unity.meta
View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c51225fde5101214fa7a6f13dc68546c guid: 46fb4d69ffddef24abd332313bb5f4d8
DefaultImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName: