Commit Graph

44 Commits

Author SHA1 Message Date
PokingPines
169d60b524 racetrack 3 updates 2024-04-23 10:49:27 +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
PokingPines
6979490b55 L 2024-04-23 08:28:58 +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
PokingPines
6e9746bd84 L 2024-04-23 08:23:42 +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
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
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
e79bc755d9 Merge branch 'master' of ooftooft.net:Racesm 2024-04-22 10:51:47 +02:00
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
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
1ab00c2b39 started car customization screen 2024-04-21 18:08:39 +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
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
magn9775
65b226d920 NPC!! 2024-04-19 16:04:04 +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
magn9775
9a204aa571 idk 2024-04-19 12:32:55 +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
PokingPines
7bc7189aa1 City asset pack 2024-04-19 11:29:17 +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
9e52f5f74b more decoration 2024-04-12 14:37:58 +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
magn9775
95289d04d5 oofroad 2024-04-12 13:54:40 +02:00
0b7a4dd139 merge fix 2024-04-12 13:08:12 +02:00
PokingPines
4733c91233 extra assets + decoration 2024-04-12 12:44:53 +02:00
b2599fe28f checkpoint fix 2024-04-12 12:05:02 +02:00
magn9775
de350377b2 background 2024-04-12 10:27:10 +02:00
magn9775
9c64b14b0b cars 2024-04-11 13:22:39 +02:00
magn9775
8f172daaf3 HOT ROD!! 2024-04-05 11:23:18 +02:00
87ea47d4f8 Car asset 2024-04-05 10:18:02 +02:00
magn9775
0957f89c5c car go wroom 2024-03-22 10:49:50 +01:00