Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283 Commits 1 Branch 0 Tags
23741185380f7778b00d611454fce53c4797cce1
Commit Graph

276 Commits

Author SHA1 Message Date
Ciakon
20cbc182ac Changed car controller script 2024-04-24 07:27:55 +02:00
Ciakon
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
Ciakon
65c678e706 L 2024-04-24 07:11:18 +02:00
PokingPines
e7ae74b9c4 racetrack 3 pseudo done 2024-04-23 22:32:26 +02:00
Ciakon
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
Ciakon
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
Ciakon
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
Ciakon
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
PokingPines
169d60b524 racetrack 3 updates 2024-04-23 10:49:27 +02:00
Ciakon
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
Ciakon
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
Ciakon
8049affcce Merge branch 'master' of ooftooft.net:Racesm 2024-04-23 08:35:00 +02:00
Ciakon
bec6c88a63 L 2024-04-23 08:34:56 +02:00
PokingPines
6979490b55 L 2024-04-23 08:28:58 +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
9f8c2c1d81 Merge branch 'master' of git@ooftooft.net:Racesm.git 
# Conflicts:
#	Assets/ML-Agents/Timers/SampleScene_timers.json.meta
 2024-04-23 08:25:36 +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
Ciakon
af1cf75b8d self learning test 2024-04-22 20:09:47 +02:00
magn9775
e3c6bd1fd6 Tower fall 2024-04-22 16:36:07 +02:00
Ciakon
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
Ciakon
073ada93dc small fix 2024-04-22 14:10:18 +02:00
PokingPines
c7a757acbc racesm city updates 2024-04-22 14:09:19 +02:00
Ciakon
bcc9d14450 basicly finished car customization screen 2024-04-22 14:04:50 +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
e9a9147658 cars 2024-04-22 12:12:52 +02:00
PokingPines
a5279c2b52 updates in city racesm 2024-04-22 12:10:18 +02:00
Ciakon
e79bc755d9 Merge branch 'master' of ooftooft.net:Racesm 2024-04-22 10:51:47 +02:00
Ciakon
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
Ciakon
c2ea515066 added colors 2024-04-22 10:17:00 +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
13cab27498 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-22 08:23:08 +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
Ciakon
612b4d6e0f LLL 2024-04-22 08:21:49 +02:00