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

Merge branch 'master' of ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	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/Car Customization_timers.json
#	Assets/ML-Agents/Timers/City racesm_timers.json.meta
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json.meta
#	Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
#	Assets/Scenes/WinScreen.unity.meta
This commit is contained in:
Ciakon
2024-04-25 15:16:46 +02:00
parent 6d4ee04d60 3f8f7e0a37
commit 1aa075773f
40 changed files with 3908 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/ML-Agents/Timers/WinScreen_timers.json.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/ML-Agents/Timers/City racesm_timers.json.meta
guid: ca66b14272dc63548acbee53df329532
========
guid: b02eb4a9869b93e4d9092991c9f89a8f
>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/ML-Agents/Timers/WinScreen_timers.json.meta
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: