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/ML-Agents/Timers/Car Customization_timers.json.meta
#	Assets/Prefabs/City Pieces/building_12.prefab.meta
#	Assets/Prefabs/City Pieces/building_13.prefab.meta
This commit is contained in:
Ciakon
2024-04-23 13:04:00 +02:00
parent 83ae0f6e22 27c2dfb90e
commit 114a65b46f
36 changed files with 12290 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/ML-Agents/Timers/Car Customization_timers.json.meta
View File

@@ -1,6 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/ML-Agents/Timers/Car Customization_timers.json.meta
guid: 0f6dd878df25b634c9176312135bf2ac
TextScriptImporter:
========
guid: 6d9457d0931578f4983cff726425ccfe
PrefabImporter:
>>>>>>>> 27c2dfb90e069444ac87eeef410ee67038d22a79:Assets/Prefabs/City Pieces/building_12.prefab.meta
externalObjects: {}
userData:
assetBundleName: