Commit Graph

35 Commits

Author SHA1 Message Date
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
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
7b313fe2d4 Game Manager WIP 2024-04-24 08:53:46 +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
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
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
f2ae69b28f mEgre 2024-04-23 10:45:45 +02:00
magn9775
9dfc1fd9c6 Tower collapse + car fixes 2024-04-23 10:37:20 +02:00
magn9775
403fb8c2ae 9/11 2024-04-22 14:01:07 +02:00
magn9775
d9b73bd148 NPC 2024-04-22 10:06:47 +02:00
magn9775
9848674722 camera mobning 2024-04-20 21:34:09 +02:00
77dbe0b787 Benson er blevet based 2024-04-20 19:27:03 +02:00
351575ea5e Benson kan køre på racetrack mini 2024-04-20 19:13:25 +02:00
fe163ed7a1 Benson kan køre på racetrack mini 2024-04-20 19:01:02 +02:00
magn9775
601de22cfa Road kill + sound effects 2024-04-20 15:02:09 +02:00
magn9775
c598a700e2 RoadKill 2024-04-20 11:31:59 +02:00
magn9775
65b226d920 NPC!! 2024-04-19 16:04:04 +02:00
PokingPines
7be2a4d1c9 more deco on track 2 2024-04-12 14:25:17 +02:00
PokingPines
ac5fad3141 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Scenes/Racetrack mini.unity
2024-04-12 13:05:02 +02:00
PokingPines
4733c91233 extra assets + decoration 2024-04-12 12:44:53 +02:00
magn9775
6d95696418 ui 2024-04-12 12:41:59 +02:00
magn9775
de350377b2 background 2024-04-12 10:27:10 +02:00
magn9775
bd3494d3a7 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Scenes/Racetrack mini.unity
2024-04-11 13:25:08 +02:00
magn9775
9c64b14b0b cars 2024-04-11 13:22:39 +02:00
PokingPines
60f3195761 racetrack position 2024-04-11 13:22:09 +02:00
20e33b69ca racing now looks good 2024-04-05 14:13:06 +02:00
b277104435 crazy car physics 2024-04-05 14:06:07 +02:00