PokingPines
|
ae9838c02e
|
Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
# Assets/ML-Agents/Timers/SampleScene_timers.json.meta
|
2024-04-23 08:27:07 +02:00 |
|
PokingPines
|
efbffea201
|
Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
# Assets/Images/Car Icons.meta
# Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
# 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/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
# Assets/ML-Agents/Timers/SampleScene_timers.json.meta
|
2024-04-23 08:26:25 +02:00 |
|
magn9775
|
5c2b5f85e2
|
merge error
|
2024-04-23 08:24:15 +02:00 |
|
PokingPines
|
6e9746bd84
|
L
|
2024-04-23 08:23:42 +02:00 |
|
|
|
f6993a8a92
|
Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
# Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
# Assets/Prefabs/Car customization.meta
# Assets/Prefabs/Towers.prefab.meta
|
2024-04-22 14:13:11 +02:00 |
|
