Commit Graph

18 Commits

Author SHA1 Message Date
c54609aa39 LLL 2024-04-25 15:33:03 +02:00
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
6d4ee04d60 musclecar customization 2024-04-25 15:16:16 +02:00
PokingPines
e8161eae77 Win screen (needs name change) 2024-04-25 15:08:17 +02:00
PokingPines
06756d418a Map selector 2024-04-25 12:57:44 +02:00
PokingPines
3416c96f06 Map selector (still in progress) 2024-04-24 17:42:39 +02:00
6db70114b0 Added respawn for AI, Game manager keeps track of laps 2024-04-24 10:11:56 +02:00
f06887db7e Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-24 08:56:37 +02:00
3acfcbf5bc Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-24 08:56:12 +02:00
PokingPines
6da99da8c2 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json
2024-04-24 08:54:18 +02:00
7b313fe2d4 Game Manager WIP 2024-04-24 08:53:46 +02:00
PokingPines
279144254f L 2024-04-24 08:52:55 +02:00
magn9775
e56b7f3163 bulldozer 2024-04-24 08:51:16 +02:00
ccd2ea506b Game manager WIP 2024-04-24 07:56:29 +02:00
de0a1c842a Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.jsonT
2024-04-23 15:48:27 +02:00
85a909e4fd Benson V7 be training 2024-04-23 15:47:36 +02:00
magn9775
784bfaff4d Signed-off-by: magn9775 <magnusd2005@gmail.com> 2024-04-23 15:40:28 +02:00
83ae0f6e22 Car customization should fully work 2024-04-23 13:03:15 +02:00