Commit Graph

71 Commits

Author SHA1 Message Date
6e6e1e1bff background music in loading screen 2024-04-26 17:13:17 +02:00
magn9775
b8fb13876e idkdidkdid 2024-04-26 14:34:38 +02:00
2fe54fe26e Driving UI 2 2024-04-26 13:07:04 +02:00
magn9775
2632b3b2d1 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json
#	Assets/Scenes/WinScreen.unity
2024-04-26 12:33:32 +02:00
49b4414155 fixed checkpoints and AI 2024-04-26 12:25:28 +02:00
magn9775
dbfbe1b926 win 2024-04-26 10:24:18 +02:00
PokingPines
8d3bee48dd Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json
2024-04-26 09:27:30 +02:00
PokingPines
334dee6bf0 Map selector done 2024-04-26 09:26:50 +02:00
55d93fe847 moved audio listener 2024-04-26 09:22:42 +02:00
magn9775
d491c6dee7 people 2024-04-26 09:19:27 +02:00
magn9775
4740a04736 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 08:14:33 +02:00
magn9775
a3de85ea9e idk 2024-04-26 08:14:17 +02:00
PokingPines
6dd5933873 updated map selector 2024-04-25 21:43:53 +02:00
magn9775
c38e02ef80 idk 2024-04-25 15:33:30 +02:00
PokingPines
acc2378221 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-25 15:09:42 +02:00
magn9775
cb468569df idk 2024-04-25 15:03:56 +02:00
magn9775
63abb7e638 Spectating 2024-04-25 14:57:48 +02:00
PokingPines
06756d418a Map selector 2024-04-25 12:57:44 +02:00
magn9775
2e78e93ad0 last car 2024-04-24 11:37:10 +02:00
magn9775
31d0d32aa9 Finished all cars, and took lap times on them all 2024-04-24 10:47:29 +02:00
magn9775
e56b7f3163 bulldozer 2024-04-24 08:51:16 +02:00
ccd2ea506b Game manager WIP 2024-04-24 07:56:29 +02:00
PokingPines
e7ae74b9c4 racetrack 3 pseudo done 2024-04-23 22:32:26 +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
magn9775
784bfaff4d Signed-off-by: magn9775 <magnusd2005@gmail.com> 2024-04-23 15:40:28 +02:00
83ae0f6e22 Car customization should fully work 2024-04-23 13:03:15 +02:00
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