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

This commit is contained in:
PokingPines
2024-04-23 15:48:12 +02:00
59 changed files with 6483 additions and 2500 deletions

View File

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