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 
# Conflicts:
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Imported Assets/Simple Garage/Scenes/Garage Scene.unity.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
#	Assets/Scenes/Car Customization.unity.meta
This commit is contained in:
PokingPines
2024-04-22 08:22:55 +02:00
parent d13878b158 f0ad8b7436
commit 59edd69bb0
945 changed files with 1000588 additions and 2949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,27 @@
fileFormatVersion: 2
<<<<<<< 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
TextScriptImporter:
=======
<<<<<<< HEAD:Assets/Imported Assets/Kevin Iglesias.meta
guid: 3fbd4e731b87fd4469babb69c4af0ba9
folderAsset: yes
DefaultImporter:
=======
guid: 148686e89d63c1543b7c4ebf056f7fd0
TextScriptImporter:
>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd
>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb
externalObjects: {}
userData:
assetBundleName: