Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-09-28 03:46:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
708 Commits 20 Branches 1 Tag
79fc00a142a6862161de12d68f60a106eb8dde56
Commit Graph

708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Nydahl
79fc00a142 Fix with animator 2022-04-29 15:39:15 -05:00
Evan Nydahl
471ae3ef87 Merge branch 'finalController' into main 2022-04-29 14:59:33 -05:00
Evan Nydahl
56c64dfac4 Animation edits 2022-04-29 14:56:49 -05:00
Melbyj1125
3c48f2d123 no more fuzzy text 2022-04-29 14:53:40 -05:00
Melbyj1125
a98081f26b Merge branch 'AddThighs' 2022-04-29 14:49:48 -05:00
Melbyj1125
d8436ae00a Added thick thighs 2022-04-29 14:48:54 -05:00
Vladdie
6038fc26b0 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-29 14:35:49 -05:00
Melbyj1125
ffe51831d8 fixed issue I caused 2022-04-29 14:23:58 -05:00
Vincent Wheat
b85aab1781 Updates 
Rebaked lighting
Disabled wind particle systems again
 2022-04-29 12:37:41 -05:00
Vincent Wheat
cd4624a600 Update BoulderSpawn.cs 
Refactored BoulderSpawn
 2022-04-29 12:13:03 -05:00
Melbyj1125
d22b0f38e0 Merge branch 'modifyDash' 2022-04-29 03:24:32 -05:00
Melbyj1125
678dacf0e5 modified hook and adding testing 2022-04-29 03:23:24 -05:00
Vladdie
c9a4757e3c Merge branch 'help' 2022-04-28 23:56:33 -05:00
Vladdie
058729edb8 button noises 2022-04-28 23:53:47 -05:00
Vincent Wheat
b6de1e07cb Update Game-Mountain.unity 
Fixed Wind Playing on Awake
 2022-04-28 18:34:15 -05:00
Melbyj1125
f44774f92f the hover text modifies with replaced buttons 2022-04-28 00:47:39 -05:00
Melbyj1125
2e524dc410 added glider to player 2022-04-28 00:06:49 -05:00
Melbyj1125
be3177ef8e lobby scene buttons update 2022-04-27 23:35:14 -05:00
Melbyj1125
f1278f55bb fixed bodyswapping issue 2022-04-27 22:28:42 -05:00
Vladdie
c1e4dd2f00 Merge branch 'audio3' 2022-04-27 20:11:17 -05:00
Vladdie
d7747c64fb Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 
Merging in Audio?
 2022-04-27 20:04:26 -05:00
Vladdie
a6ded77edb audio merge. 2022-04-27 20:03:39 -05:00
Evan Nydahl
64ca96553f Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2022-04-27 19:58:59 -05:00
Evan Nydahl
c500bf2649 Merge branch 'controllerKing' into main 2022-04-27 19:57:13 -05:00
Vincent Wheat
ee4e72f2d6 Update Game-Mountain.unity 
Updated Particle Systems
 2022-04-27 19:54:21 -05:00
Vladdie
94104e2d6d Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-27 19:54:18 -05:00
Evan Nydahl
b0fb0f9e09 ReAssigned Controller and added colliders for controller in pasue menu 2022-04-27 19:52:01 -05:00
Katherine
f5e071c125 Merge branch 'KingAllensZoom' 2022-04-27 19:28:37 -05:00
Katherine
dc5feb6eff King Zoom Functionality 
>The King can now zoom
>UI follows them in
>Then can rotate their Veiw up and down
 2022-04-27 19:24:31 -05:00
Melbyj1125
574288ff8c slight lobby adjustment 2022-04-27 19:15:08 -05:00
Melbyj1125
911707f761 Merge branch 'RebindingControls' 2022-04-27 19:00:53 -05:00
Melbyj1125
ae7116c1aa in bed with the goblin 2022-04-27 18:59:46 -05:00
Evan Nydahl
030cd225bf Merge dAerialScript 2022-04-27 18:54:24 -05:00
Evan Nydahl
2907c3f3eb Merge branch 'animations4' into main 2022-04-27 18:52:05 -05:00
Evan Nydahl
6856a88702 Fine tuned animations 2022-04-27 18:49:42 -05:00
Vladdie
362e35c86f Merge branch 'audioPAIN' 2022-04-27 18:33:31 -05:00
Vladdie
17c3867eb7 editior. 2022-04-27 18:21:46 -05:00
Vladdie
1377912b9c Addition of audio Assets 2022-04-27 17:51:41 -05:00
Vladdie
13d334962d added audio to button hover/press in Lobby 2022-04-27 17:50:30 -05:00
Vincent Wheat
33a20e03bb Fixed Spawning In Scene 
Fixed spawn locations on the new platform
Increased rotate spin speed
Moved spawn platform
Made spin bumpers triggers
 2022-04-27 17:14:30 -05:00
Melbyj1125
e6c72e305f Merge branch 'OptionsControlsUI' 2022-04-27 16:21:49 -05:00
Vincent Wheat
72ed4e2cd9 Postgame updates 
Added models to post game scene
 2022-04-27 16:20:39 -05:00
Melbyj1125
ecc0ea7e00 Idk what Ive done 2022-04-27 16:14:09 -05:00
Vincent Wheat
469953bf16 Game Mountain updates 
Added Rotating block prefab
Adjusted the intro sequence
 2022-04-27 15:22:20 -05:00
Vincent Wheat
6fe5a1b1e9 Some minor adjustments 
Added texture to crumbling platforms
Finished placing fences in scene
Replaced starting platform
 2022-04-27 14:01:21 -05:00
Katherine
534661973a Merge branch 'IfitsbrokeYellatKateFlowchat' 2022-04-27 13:01:56 -05:00
Katherine
029f4a1e52 King Zoom 
>File added
>Nothing in it, just a placeholder to push onto main
 2022-04-27 12:59:26 -05:00
Melbyj1125
28cabc7fd6 Merge branch 'GrappleWasAMistake' 2022-04-27 12:58:51 -05:00
Evan Nydahl
3ebde4266d Merge branch 'runnerUI3' into main 2022-04-27 12:44:19 -05:00
Evan Nydahl
ffbd9a3a7a Made some changes to GameManager and controls scene (and added some 
animations)
 2022-04-27 12:41:52 -05:00