Commit Graph

251 Commits

Author SHA1 Message Date
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
PokingPines
bfb47e9b8d Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 10:08:47 +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
PokingPines
1bdc34b05e Idk 2024-04-26 10:08:26 +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
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
12df19d486 Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-25 15:33:42 +02:00
magn9775
c38e02ef80 idk 2024-04-25 15:33:30 +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
6d4ee04d60 musclecar customization 2024-04-25 15:16:16 +02:00
magn9775
3f8f7e0a37 Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-25 15:12:43 +02:00
magn9775
0d49329752 timers ): 2024-04-25 15:12:05 +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
PokingPines
e8161eae77 Win screen (needs name change) 2024-04-25 15:08:17 +02:00
magn9775
cb468569df idk 2024-04-25 15:03:56 +02:00
1c20cfe94f oops 2024-04-25 14:58:53 +02:00
magn9775
63abb7e638 Spectating 2024-04-25 14:57:48 +02:00
PokingPines
f0d6d419cd Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/Scenes/mini_racetrack3.unity
2024-04-25 13:04:56 +02:00
PokingPines
06756d418a Map selector 2024-04-25 12:57:44 +02:00
1de63151a6 racecarTrack3 part1 2024-04-25 12:31:46 +02:00
73a9ab8220 racecarTrack3 part2 2024-04-25 12:24:01 +02:00
5e371979e7 city AI default 2024-04-25 12:19:46 +02:00
magn9775
79fc59ef37 walls for citymap 2024-04-25 12:00:43 +02:00
6bf9629c3e racecar track3 part 2 2024-04-25 11:00:07 +02:00
dc8ba6b77f racecar track3 part 2 2024-04-25 10:51:45 +02:00
7ffcc165f6 racecar track3 part 2 2024-04-25 10:48:07 +02:00
e72293a5c0 city AI 2024-04-25 10:45:13 +02:00
f6ed53989a city AI 2024-04-25 10:43:57 +02:00
14665fad18 HotrodTrack2 part1 2024-04-25 10:30:27 +02:00
6f385dac8b CHECKPOINTS 2024-04-25 10:22:30 +02:00
0e8a47a82a CHECKPOINTS 2024-04-25 10:21:09 +02:00
31d431cd34 Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2024-04-24 18:18:29 +02:00
571f82abae Hotrod cooking 2024-04-24 18:17:09 +02:00
PokingPines
c03c0beb8f Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
2024-04-24 17:50:28 +02:00
PokingPines
3416c96f06 Map selector (still in progress) 2024-04-24 17:42:39 +02:00
228280ddb2 fixed crazy prefab bug 2024-04-24 12:36:44 +02:00
5c2c7aa21e Merge branch 'master' of ooftooft.net:Racesm 2024-04-24 12:26:17 +02:00
9c7a5809d1 updatet car prefabs for AI 2024-04-24 12:26:15 +02:00
magn9775
346570c357 idk 2024-04-24 11:46:17 +02:00