Commit Graph

103 Commits

Author SHA1 Message Date
e5d9fbcb15 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-26 09:21:05 +02:00
1218b7870f L 2024-04-26 09:20:13 +02:00
magn9775
d491c6dee7 people 2024-04-26 09:19:27 +02:00
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
magn9775
3f8f7e0a37 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-25 15:12:43 +02:00
magn9775
0d49329752 timers ): 2024-04-25 15:12:05 +02:00
PokingPines
acc2378221 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-25 15:09:42 +02:00
PokingPines
e8161eae77 Win screen (needs name change) 2024-04-25 15:08:17 +02:00
magn9775
cb468569df idk 2024-04-25 15:03:56 +02:00
1c20cfe94f oops 2024-04-25 14:58:53 +02:00
magn9775
63abb7e638 Spectating 2024-04-25 14:57:48 +02:00
PokingPines
f0d6d419cd Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Scenes/mini_racetrack3.unity
2024-04-25 13:04:56 +02:00
PokingPines
06756d418a Map selector 2024-04-25 12:57:44 +02:00
1de63151a6 racecarTrack3 part1 2024-04-25 12:31:46 +02:00
73a9ab8220 racecarTrack3 part2 2024-04-25 12:24:01 +02:00
5e371979e7 city AI default 2024-04-25 12:19:46 +02:00
6bf9629c3e racecar track3 part 2 2024-04-25 11:00:07 +02:00
dc8ba6b77f racecar track3 part 2 2024-04-25 10:51:45 +02:00
0e8a47a82a CHECKPOINTS 2024-04-25 10:21:09 +02:00
31d431cd34 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2024-04-24 18:18:29 +02:00
571f82abae Hotrod cooking 2024-04-24 18:17:09 +02:00
PokingPines
c03c0beb8f Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-24 17:50:28 +02:00
PokingPines
3416c96f06 Map selector (still in progress) 2024-04-24 17:42:39 +02:00
228280ddb2 fixed crazy prefab bug 2024-04-24 12:36:44 +02:00
cf108bc5b3 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json

Signed-off-by: Ciakon <noahkarottki@gmail.com>
2024-04-24 11:39:04 +02:00
185205ceea hotrod probably broken 2024-04-24 11:37:48 +02:00
magn9775
2e78e93ad0 last car 2024-04-24 11:37:10 +02:00
magn9775
c1a33bbd8c Merge branch 'master' of git@ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack.unity
#	Assets/Scenes/mini_racetrack3.unity
2024-04-24 10:54:42 +02:00
magn9775
31d0d32aa9 Finished all cars, and took lap times on them all 2024-04-24 10:47:29 +02:00
73a6b071ce Benson on DragRace 2024-04-24 10:43:26 +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
20cbc182ac Changed car controller script 2024-04-24 07:27:55 +02:00
65c678e706 L 2024-04-24 07:11:18 +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
magn9775
1d032920da Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack mini.unity
2024-04-23 14:46:17 +02:00
magn9775
75d677442d Crazy camera 2024-04-23 14:43:20 +02:00
114a65b46f Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/Car Customization_timers.json.meta
#	Assets/Prefabs/City Pieces/building_12.prefab.meta
#	Assets/Prefabs/City Pieces/building_13.prefab.meta
2024-04-23 13:04:00 +02:00
83ae0f6e22 Car customization should fully work 2024-04-23 13:03:15 +02:00
5eb69aaa38 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack mini.unity

Signed-off-by: Ciakon <noahkarottki@gmail.com>
2024-04-23 10:46:53 +02:00