Commit Graph

57 Commits

Author SHA1 Message Date
85a909e4fd Benson V7 be training 2024-04-23 15:47:36 +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
f2ae69b28f mEgre 2024-04-23 10:45:45 +02:00
magn9775
2990a061ae Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-23 10:37:50 +02:00
magn9775
9dfc1fd9c6 Tower collapse + car fixes 2024-04-23 10:37:20 +02:00
8049affcce Merge branch 'master' of ooftooft.net:Racesm 2024-04-23 08:35:00 +02:00
bec6c88a63 L 2024-04-23 08:34:56 +02:00
PokingPines
ae9838c02e Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/SampleScene_timers.json.meta
2024-04-23 08:27:07 +02:00
PokingPines
efbffea201 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Images/Car Icons.meta
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	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/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
#	Assets/ML-Agents/Timers/SampleScene_timers.json.meta
2024-04-23 08:26:25 +02:00
magn9775
5c2b5f85e2 merge error 2024-04-23 08:24:15 +02:00
PokingPines
6e9746bd84 L 2024-04-23 08:23:42 +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
magn9775
610a038d41 9/11 2024-04-22 14:01:45 +02:00
magn9775
403fb8c2ae 9/11 2024-04-22 14:01:07 +02:00
magn9775
7ccd4bc8ff Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-22 10:07:05 +02:00
magn9775
d9b73bd148 NPC 2024-04-22 10:06:47 +02:00
PokingPines
59edd69bb0 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Imported Assets/Simple Garage/Scenes/Garage Scene.unity.meta
#	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/mini_racetrack3_timers.json.meta
#	Assets/Scenes/Car Customization.unity.meta
2024-04-22 08:22:55 +02:00
PokingPines
d13878b158 L 2024-04-22 08:13:37 +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
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
65607aebc4 benson V5 har cooket 2024-04-20 14:45:47 +02:00
magn9775
2ceb18470b Merge branch 'master' of git@ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/Kevin Iglesias.meta
#	Assets/Imported Assets/Kevin Iglesias/Basic Motions/Animations/Idles.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
2024-04-20 11:33:09 +02:00
magn9775
c598a700e2 RoadKill 2024-04-20 11:31:59 +02:00
2d017b7a59 virtual environment 2024-04-20 11:15:04 +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
91012e69dc BensonV4.1 has been trained 2024-04-19 16:07:16 +02:00
8f16297e05 benson skal til at cooke 2024-04-19 14:10:31 +02:00
801e27cd7a Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Scenes/AI Training.unity
2024-04-19 11:33:32 +02:00
769315be1e made environment for BensonV4 2024-04-19 11:30:12 +02:00
92a98b98d7 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/AI training_timers.json
2024-04-12 14:43:10 +02:00
c637b139fb L 2024-04-12 14:42:34 +02:00
magn9775
95289d04d5 oofroad 2024-04-12 13:54:40 +02:00
c38ce59409 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta
2024-04-12 13:28:50 +02:00
045ba23fd7 bensonV3 mid training 2024-04-12 13:26:07 +02:00
magn9775
1379afa15c Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Scenes/Racetrack mini.unity
2024-04-12 13:14:56 +02:00
0b7a4dd139 merge fix 2024-04-12 13:08:12 +02:00
691a1d32e6 bensonV3 preperation 2024-04-12 13:06:03 +02:00
aad2340c37 L 2024-04-12 12:45:34 +02:00
magn9775
6d95696418 ui 2024-04-12 12:41:59 +02:00
magn9775
3afa8baf53 Checkpoint 2024-04-12 12:09:11 +02:00
b2599fe28f checkpoint fix 2024-04-12 12:05:02 +02:00