Commit Graph

252 Commits

Author SHA1 Message Date
1e53774e99 fixed 9/11 2024-04-26 20:32:50 +02:00
5a39f2bf0a lowered game volume 2024-04-26 19:29:23 +02:00
766b63c00a det meste er fixed 2024-04-26 19:04:15 +02:00
43e83aeee5 har fixet skraldet 2024-04-26 18:52:23 +02:00
ce0150bc7c removed dummys 2024-04-26 18:49:50 +02:00
be8d77f808 det ikke virke 2024-04-26 18:46:13 +02:00
6b9be2f840 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/CityRacetrack_timers.json
2024-04-26 18:41:56 +02:00
499f1aef18 satisfaction 2024-04-26 18:40:43 +02:00
magn9775
61d1958308 fix errors 2024-04-26 18:31:17 +02:00
magn9775
2edf1925ca Merge branch 'master' of git@ooftooft.net:Racesm 2024-04-26 18:21:11 +02:00
magn9775
ef5c8e25a6 DNF-timer + next car button when finished 2024-04-26 18:21:02 +02:00
6e6e1e1bff background music in loading screen 2024-04-26 17:13:17 +02:00
magn9775
69c51ec879 done? 2024-04-26 15:58:44 +02:00
magn9775
4dbfc5542c Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/WinScreen_timers.json
2024-04-26 14:35:30 +02:00
eff1287fab fix map selector 2024-04-26 14:33:04 +02:00
magn9775
46aa4a627a Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/WinScreen_timers.json
2024-04-26 14:20:58 +02:00
magn9775
f2cf92f5bb win screen done 2024-04-26 14:20:12 +02:00
a17999b57f win music 2024-04-26 14:16:04 +02:00
fdf4c1033d lap fix 2024-04-26 14:07:53 +02:00
5c9ee16e8b Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/WinScreen_timers.json
2024-04-26 13:55:55 +02:00
69f6830b7f l 2024-04-26 13:55:38 +02:00
magn9775
449544f903 winwin 2024-04-26 13:52:01 +02:00
magn9775
2a3284ac7c Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json
2024-04-26 13:31:00 +02:00
magn9775
8fd601650c Signed-off-by: magn9775 <magnusd2005@gmail.com> 2024-04-26 13:30:35 +02:00
8744c617fc timer thing probably works 2024-04-26 13:25:39 +02:00
2fe54fe26e Driving UI 2 2024-04-26 13:07:04 +02:00
138d5f853d Merge branch 'master' of ooftooft.net:Racesm 2024-04-26 12:59:43 +02:00
4eee1a278b Driving UI 2024-04-26 12:59:34 +02:00
magn9775
32585ae931 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 12:33:49 +02:00
magn9775
1336a2a08e Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 12:33:11 +02:00
bfa42a83c3 lowered time for cars 2024-04-26 12:32:39 +02:00
magn9775
caa6e28bec winscreen 2024-04-26 12:26:47 +02:00
49b4414155 fixed checkpoints and AI 2024-04-26 12:25:28 +02:00
magn9775
d49e58e008 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json
2024-04-26 10:59:01 +02:00
magn9775
7152a5f4e5 Leaderboard 2024-04-26 10:58:34 +02:00
3b9ef2ad1b fixed background music 2024-04-26 10:25:23 +02:00
magn9775
f87cabe18d Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 10:21:07 +02:00
magn9775
dcdd1e0965 win screeen 2024-04-26 10:20:40 +02:00
083d44e339 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-26 10:08:44 +02:00
1aa9c743cd game manager stuff 2024-04-26 10:08:24 +02:00
PokingPines
50c949f0cb Map selector done 2024-04-26 10:07:16 +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
e5d9fbcb15 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-26 09:21:05 +02:00
1218b7870f L 2024-04-26 09:20:13 +02:00
magn9775
d491c6dee7 people 2024-04-26 09:19:27 +02:00
PokingPines
6dd5933873 updated map selector 2024-04-25 21:43:53 +02:00
c54609aa39 LLL 2024-04-25 15:33:03 +02:00
1aa075773f Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	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/Car Customization_timers.json
#	Assets/ML-Agents/Timers/City racesm_timers.json.meta
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json.meta
#	Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
#	Assets/Scenes/WinScreen.unity.meta
2024-04-25 15:16:46 +02:00