Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
272 Commits 1 Branch 0 Tags
32585ae9319725909104d5ddfedd9b850cd2a07b
Commit Graph

119 Commits

Author SHA1 Message Date
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
magn9775
1336a2a08e Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 12:33:11 +02:00
magn9775
caa6e28bec winscreen 2024-04-26 12:26:47 +02:00
Ciakon
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
Ciakon
2296b85dc5 Merge branch 'master' of ooftooft.net:Racesm 
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta
#	Assets/ML-Agents/Timers/WinScreen_timers.json
 2024-04-26 10:25:49 +02:00
Ciakon
3b9ef2ad1b fixed background music 2024-04-26 10:25:23 +02:00
PokingPines
f4d4e76f8b TimeOfDay script fixed 2024-04-26 10:22:20 +02:00
PokingPines
bfb47e9b8d Merge branch 'master' of git@ooftooft.net:Racesm.git 2024-04-26 10:08:47 +02:00
Ciakon
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
Ciakon
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
Ciakon
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
Ciakon
1218b7870f L 2024-04-26 09:20:13 +02:00
magn9775
d491c6dee7 people 2024-04-26 09:19:27 +02:00
Ciakon
c54609aa39 LLL 2024-04-25 15:33:03 +02:00
Ciakon
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
Ciakon
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
Ciakon
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
Ciakon
1de63151a6 racecarTrack3 part1 2024-04-25 12:31:46 +02:00
Ciakon
73a9ab8220 racecarTrack3 part2 2024-04-25 12:24:01 +02:00
Ciakon
5e371979e7 city AI default 2024-04-25 12:19:46 +02:00
Ciakon
6bf9629c3e racecar track3 part 2 2024-04-25 11:00:07 +02:00
Ciakon
dc8ba6b77f racecar track3 part 2 2024-04-25 10:51:45 +02:00
Ciakon
0e8a47a82a CHECKPOINTS 2024-04-25 10:21:09 +02:00
Ciakon
31d431cd34 Merge branch 'master' of ooftooft.net:Racesm 
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
 2024-04-24 18:18:29 +02:00
Ciakon
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
Ciakon
228280ddb2 fixed crazy prefab bug 2024-04-24 12:36:44 +02:00
Ciakon
cf108bc5b3 Merge branch 'master' of ooftooft.net:Racesm 
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json

Signed-off-by: Ciakon <noahkarottki@gmail.com>
 2024-04-24 11:39:04 +02:00
Ciakon
185205ceea hotrod probably broken 2024-04-24 11:37:48 +02:00
magn9775
2e78e93ad0 last car 2024-04-24 11:37:10 +02:00
magn9775
c1a33bbd8c Merge branch 'master' of git@ooftooft.net:Racesm 
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack.unity
#	Assets/Scenes/mini_racetrack3.unity
 2024-04-24 10:54:42 +02:00
magn9775
31d0d32aa9 Finished all cars, and took lap times on them all 2024-04-24 10:47:29 +02:00
Ciakon
73a6b071ce Benson on DragRace 2024-04-24 10:43:26 +02:00
Ciakon
6db70114b0 Added respawn for AI, Game manager keeps track of laps 2024-04-24 10:11:56 +02:00
Ciakon
f06887db7e Merge branch 'master' of git@ooftooft.net:Racesm.git 
# Conflicts:
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
 2024-04-24 08:56:37 +02:00