Commit Graph

125 Commits

Author SHA1 Message Date
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
magn9775
79fc59ef37 walls for citymap 2024-04-25 12:00:43 +02:00
f6ed53989a city AI 2024-04-25 10:43:57 +02:00
0e8a47a82a CHECKPOINTS 2024-04-25 10:21:09 +02:00
571f82abae Hotrod cooking 2024-04-24 18:17:09 +02:00
228280ddb2 fixed crazy prefab bug 2024-04-24 12:36:44 +02:00
9c7a5809d1 updatet car prefabs for AI 2024-04-24 12:26:15 +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
a3e7fee19a Merge branch 'master' of ooftooft.net:Racesm 2024-04-24 11:00:48 +02:00
129a22f236 L 2024-04-24 11:00:45 +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
5d9eab1801 Merge branch 'master' of ooftooft.net:Racesm 2024-04-24 10:43:30 +02:00
73a6b071ce Benson on DragRace 2024-04-24 10:43:26 +02:00
PokingPines
857f090e1b checkpoints rotation 2024-04-24 10:19:00 +02:00
PokingPines
f694fd6945 drag race 2024-04-24 09:29:59 +02:00
PokingPines
a34074bade Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-24 09:19:30 +02:00
PokingPines
22a0baaca9 checkpoints on city racesm 2024-04-24 09:18:47 +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
e5ca63e64b Merge branch 'master' of git@ooftooft.net:Racesm 2024-04-24 08:51:25 +02:00
magn9775
e56b7f3163 bulldozer 2024-04-24 08:51:16 +02:00
PokingPines
01246b4655 plane for racetrack 3 2024-04-24 08:46:47 +02:00
ccd2ea506b Game manager WIP 2024-04-24 07:56:29 +02:00
f18bad9413 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Prefabs/City Pieces/circular_tall_building.prefab.meta
#	Assets/Prefabs/City Pieces/circular_tall_building_2.prefab.meta
2024-04-24 07:13:29 +02:00
65c678e706 L 2024-04-24 07:11:18 +02:00
PokingPines
e7ae74b9c4 racetrack 3 pseudo done 2024-04-23 22:32:26 +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
PokingPines
71558ad564 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-23 15:48:12 +02:00
PokingPines
3bb701000b racetrack 3 updates 2024-04-23 15:47:50 +02:00
85a909e4fd Benson V7 be training 2024-04-23 15:47:36 +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
PokingPines
27c2dfb90e racetrack 3 updates 2024-04-23 11:30:45 +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
PokingPines
57dea41488 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-23 10:46:53 +02:00
PokingPines
7b24b32475 map 3 updates 2024-04-23 10:46:43 +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
af1cf75b8d self learning test 2024-04-22 20:09:47 +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
PokingPines
7cdc6e8c07 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-22 14:10:26 +02:00
PokingPines
c7a757acbc racesm city updates 2024-04-22 14:09:19 +02:00
bcc9d14450 basicly finished car customization screen 2024-04-22 14:04:50 +02:00
magn9775
403fb8c2ae 9/11 2024-04-22 14:01:07 +02:00