Commit Graph

725 Commits

Author SHA1 Message Date
Melbyj1125
2bba6bbaa6 Merge branch 'ActuallyMoveGrapple' 2022-05-01 00:04:47 -05:00
Melbyj1125
8e3dfdb9c2 glider rotates and new cursor 2022-05-01 00:02:51 -05:00
b021db4338 Fixed Weather to Utilize Multiple Partice Systems 2022-04-30 22:38:38 -05:00
Vladdie
e672bbd20d changes to arrow 2022-04-30 14:03:59 -05:00
Vladdie
af0932dbd2 Merge branch 'aaaaaaa' 2022-04-29 21:21:19 -05:00
Vladdie
e960e7fce9 updates to archer/ui buttons 2022-04-29 20:04:09 -05:00
Evan Nydahl
9fc03ab00f Put fall animation on network 2022-04-29 17:05:22 -05:00
Evan Nydahl
18d090e562 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace into main 2022-04-29 16:59:00 -05:00
Evan Nydahl
2c9f5ad6ce Revert King Back To non controller 2022-04-29 16:58:35 -05:00
Vladdie
a1f833f7a9 Merge branch 'suffering' 2022-04-29 16:54:03 -05:00
Vladdie
0896918100 hate sound. fuck 2022-04-29 16:42:05 -05:00
Evan Nydahl
b9045356d4 Falling animations 2022-04-29 16:29:01 -05:00
Evan Nydahl
566d13f284 Fixed Glider 2022-04-29 15:53:01 -05:00
Evan Nydahl
8750c49ad3 Merge branch 'kingGamepad' into main 2022-04-29 15:40:34 -05:00
Melbyj1125
31491d2635 moved spectating stuff 2022-04-29 15:39:20 -05:00
Evan Nydahl
79fc00a142 Fix with animator 2022-04-29 15:39:15 -05:00
Melby
1ca5579caf Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-04-29 15:09:36 -05:00
Melby
c0a7a40471 small title adjustment 2022-04-29 15:09:05 -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