|
|
1aa075773f
|
Merge branch 'master' of ooftooft.net:Racesm
# 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
|
2024-04-25 15:16:46 +02:00 |
|