Commit Graph

5 Commits

Author SHA1 Message Date
PokingPines
59edd69bb0 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Imported Assets/Simple Garage/Scenes/Garage Scene.unity.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/ML-Agents/Timers/mini_racetrack3_timers.json.meta
#	Assets/Scenes/Car Customization.unity.meta
2024-04-22 08:22:55 +02:00
PokingPines
d13878b158 L 2024-04-22 08:13:37 +02:00
magn9775
2ceb18470b Merge branch 'master' of git@ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/Kevin Iglesias.meta
#	Assets/Imported Assets/Kevin Iglesias/Basic Motions/Animations/Idles.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
2024-04-20 11:33:09 +02:00
magn9775
c598a700e2 RoadKill 2024-04-20 11:31:59 +02:00
2d017b7a59 virtual environment 2024-04-20 11:15:04 +02:00