Merge branch 'master' of ooftooft.net:Racesm

This commit is contained in:
2024-04-20 18:48:50 +02:00
89 changed files with 680638 additions and 42 deletions

View File

@@ -1,6 +1,17 @@
fileFormatVersion: 2
<<<<<<< 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
externalObjects: {}
userData:
assetBundleName: