Commit Graph

136 Commits

Author SHA1 Message Date
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
PokingPines
a5279c2b52 updates in city racesm 2024-04-22 12:10:18 +02:00
e79bc755d9 Merge branch 'master' of ooftooft.net:Racesm 2024-04-22 10:51:47 +02:00
bf0421d6ca L 2024-04-22 10:51:44 +02:00
PokingPines
d7a5454cb3 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-22 10:48:24 +02:00
PokingPines
d0fea281d0 buildings in city racesm 2024-04-22 10:18:26 +02:00
magn9775
d9b73bd148 NPC 2024-04-22 10:06:47 +02:00
612b4d6e0f LLL 2024-04-22 08:21:49 +02:00
magn9775
9848674722 camera mobning 2024-04-20 21:34:09 +02:00
1fd97664c3 Merge branch 'master' of ooftooft.net:Racesm 2024-04-20 18:48:50 +02:00
ae447faf5e Benson V6.1 er trænet færdig 2024-04-20 18:48:43 +02:00
d5b24b17ea benson V6 har smadret racetrack 1 2024-04-20 17:04:19 +02:00
magn9775
601de22cfa Road kill + sound effects 2024-04-20 15:02:09 +02:00
65607aebc4 benson V5 har cooket 2024-04-20 14:45:47 +02:00
magn9775
c598a700e2 RoadKill 2024-04-20 11:31:59 +02:00
PokingPines
4841d8d5bc Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-19 16:08:55 +02:00
PokingPines
a43d921b2a Racesm city
updates
2024-04-19 16:08:44 +02:00
ed661772cd Merge branch 'master' of ooftooft.net:Racesm 2024-04-19 16:07:29 +02:00
magn9775
65b226d920 NPC!! 2024-04-19 16:04:04 +02:00
8f16297e05 benson skal til at cooke 2024-04-19 14:10:31 +02:00
PokingPines
de7bbbb22a city racesm update 2024-04-19 14:10:02 +02:00
PokingPines
9f5f9f3027 city racesm update 2024-04-19 13:59:04 +02:00
magn9775
79bac150e6 episk 2024-04-19 13:41:54 +02:00
851558c6db Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-19 11:33:42 +02:00
801e27cd7a Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Scenes/AI Training.unity
2024-04-19 11:33:32 +02:00
magn9775
3e8c820fda Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-19 11:31:24 +02:00
magn9775
8f6e3ffa21 ui? 2024-04-19 11:31:12 +02:00
769315be1e made environment for BensonV4 2024-04-19 11:30:12 +02:00
PokingPines
c0644a5e11 city racesm start 2024-04-19 10:42:03 +02:00
magn9775
ffcdd2df66 offroad 2024-04-18 13:59:09 +02:00
PokingPines
ab1d29084a Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Scenes/Racetrack mini.unity
2024-04-12 14:34:30 +02:00
PokingPines
7be2a4d1c9 more deco on track 2 2024-04-12 14:25:17 +02:00
magn9775
95289d04d5 oofroad 2024-04-12 13:54:40 +02:00
magn9775
755a423add oofroad 2024-04-12 13:29:37 +02:00
magn9775
3df641a024 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-12 13:14:42 +02:00
magn9775
130abe017a drag track 2024-04-12 13:09:26 +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
3afa8baf53 Checkpoint 2024-04-12 12:09:11 +02:00