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
This commit is contained in:
magn9775
2024-04-23 10:37:50 +02:00
parent 9dfc1fd9c6 6979490b55
commit 2990a061ae
4 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/ML-Agents/Timers/SampleScene_timers.json.meta
View File

@@ -1,6 +1,21 @@
fileFormatVersion: 2
guid: 4d57ab7f0c619e9439665e6de75b5d44
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
guid: 4af2646cae3014146bf467e2830fdb41
TextScriptImporter:
=======
guid: 27000db5eaa3d9f42bceff430c265d3a
folderAsset: yes
DefaultImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
=======
guid: 346e9f2550a219244aeff3bf857e8b41
=======
guid: 4d57ab7f0c619e9439665e6de75b5d44
>>>>>>> 9f8c2c1d8177a6b47862a1b23538206e355848a2
TextScriptImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
externalObjects: {}
userData:
assetBundleName: