Commit Graph

497 Commits

Author SHA1 Message Date
Melbyj1125
890ab6479a Modified Items & Camera 2022-03-27 22:51:22 -05:00
Melbyj1125
7e96690d3d hopefully fixed issue with respawning 2022-03-27 22:24:24 -05:00
Melbyj1125
fc1f1cb68f maybe fixed issue with movestate reference 2022-03-25 14:07:48 -05:00
Melbyj1125
516645aa3d Merge branch 'InsertHead' 2022-03-25 12:23:07 -05:00
Melbyj1125
8d417d2d86 replaced king head in lobby: 2022-03-25 12:12:54 -05:00
Katherine
d18f10a406 Merge branch 'KingPolish' 2022-03-25 12:10:32 -05:00
Katherine
e050fb0819 King Grid Fixed
>Removed the extra chunks
>Slow areas might need to have their chunks removed, but that's
non-critical
2022-03-25 12:06:16 -05:00
Evan Nydahl
1b4de427fb Merge branch 'yayAnimations' into main 2022-03-25 11:52:51 -05:00
Evan Nydahl
bf12b60fd5 Added Slide Animation to Animator
-Rough exit, not sure how to fix without more states
2022-03-25 11:50:09 -05:00
Melbyj1125
3e74b74d9b retagged invisible walls 2022-03-25 11:48:54 -05:00
a91a5b6d82 Added Slime/Goo Calls to Debuffs (UNTESTED)
- Unable to test since the Slime button wasn't working
2022-03-25 03:24:24 -05:00
cfc1a12196 Fixed PauseMenu Cursor Locking
- Doesn't lock the king's cursor on unpause
- Does relock the runner's cursor on unpause
2022-03-25 03:03:51 -05:00
2bdfd9c86e Fixed King Movement Caused By Other Players 2022-03-25 02:38:24 -05:00
Melbyj1125
c15ab2cc15 fixed movement bug 2022-03-24 20:39:10 -05:00
Evan Nydahl
40da7ae3a9 Merge branch 'animatorHELL' into main 2022-03-24 19:17:37 -05:00
Evan Nydahl
d5d946e990 Addtional Animator changes
-fixed some transitions that didn't have variables.
-edited base movement exit/enter times to avoid missed transitions
2022-03-24 19:16:16 -05:00
Melbyj1125
9c27eeb6d3 Merge branch 'CustomControl' 2022-03-23 15:37:30 -05:00
Melbyj1125
b1af892672 slime functions added 2022-03-23 15:36:32 -05:00
Evan Nydahl
d29c149175 Adjusted animator with justin
-We believe every state has the transitions it's suppose to
2022-03-23 14:20:08 -05:00
5cf6bad287 Merge branch 'KingNetwork1' 2022-03-23 14:04:36 -05:00
e0f5db1f8a Made the Slime Spawn on Network
- Debuffs don't apply properly yet
2022-03-23 14:02:40 -05:00
Melbyj1125
652ffefb6a adjusted player cam 2022-03-23 13:43:41 -05:00
Melbyj1125
ab1bcb18fb fixed king ui issue and player collision 2022-03-23 13:32:42 -05:00
Evan Nydahl
a12d11aa47 Animator V2
-Added remaining animator transitions and states. This
may need to be trimmed/added missed transitions
2022-03-22 20:39:13 -05:00
Evan Nydahl
d556da5b2e Recovered Controller 2022-03-22 18:29:08 -05:00
Melbyj1125
80f76a30ff forgot to save 2022-03-21 14:23:21 -05:00
Melbyj1125
fdc91c110f relinked king prefabs 2022-03-21 14:22:31 -05:00
Melbyj1125
0a9b171498 Merge branch 'MomentumLoss' 2022-03-21 14:09:21 -05:00
Melbyj1125
861600d557 ignores floor layer 2022-03-21 14:06:53 -05:00
Katherine
febcbbd57f Merge branch 'MountGrid' 2022-03-21 13:23:56 -05:00
Katherine
85ca27ae98 King Prefab
>Updated King Prefab
2022-03-21 12:31:06 -05:00
Katherine
9ce623bda0 Mountain Grid
>Mountain has a grid
>King can place on the mountain
>Objects are proberly rotated
>KingGrid has begun to be cleaned up
>Grid Reveal no longer cuts off rows
2022-03-21 12:26:27 -05:00
Melbyj1125
ebf15ceb66 adjusted momentum loss 2022-03-20 07:12:46 -05:00
Melbyj1125
4d806060a7 losing momentum when hitting a block should work
player also rotates to face the direction they are moving
2022-03-20 06:53:42 -05:00
Evan Nydahl
3481c5087a Added dCoolDown for debugPlayer
-This change was required due to change in base cooldown script
2022-03-14 21:54:21 -05:00
Evan Nydahl
3ef7f7d0fb Fixed bug with ui on networked
-chagne cool down script to call a function to populate player canvas
-Added populate call to three network scripts
2022-03-14 21:44:45 -05:00
60e3213d41 Fixed Weather Wheel Bugs
- Weather now applies to respawned players
- Weather now doesn't disable movement on respawned players
- Weather Wheel can't be spammed
2022-03-14 19:21:04 -05:00
9c7f6e2f8b Fixed the Respawn From Checkpoint Button
- Players now properly spawn at the zones they should
2022-03-14 18:49:50 -05:00
Melbyj1125
87c6095623 Merge branch 'MomGrappleOther' 2022-03-13 19:01:48 -05:00
Melbyj1125
4c620233b3 just pushing for no reason 2022-03-13 18:59:47 -05:00
Evan Nydahl
bc9a6715da Fixed playerCanvas issues with ui 2022-03-11 15:27:54 -06:00
Melbyj1125
2921c8a344 King Lobby is mostly finished 2022-03-11 15:19:24 -06:00
Evan Nydahl
38e01ac1e5 Edited UI functions for functionallity in network
-Added popups to map
2022-03-11 15:10:48 -06:00
Melbyj1125
122f144cf5 adding things to king lobby 2022-03-11 03:53:20 -06:00
Melbyj1125
f8fc2da95d king lobby stubbed & fixed clipping issue 2022-03-09 15:00:01 -06:00
Vincent Wheat
ae66378ca1 Merge branch 'JustWednesdayThings' 2022-03-09 14:12:13 -06:00
Vincent Wheat
ea632960a8 Playtest1Feedback
-Adjusted Left1 boulders to be smaller and faster
-Added serializable scale to boulder spawn
-Adjusted some sliding obstacle heights
-relinked respawn zone in last pit of foothills
-Plains left 1 adjusted bumper strength and added catch platform
-Imported assets for archer towers and cannons, materials need to be gleeked with
2022-03-09 14:11:02 -06:00
Evan Nydahl
51056bc3d5 Refactored ui code to work with new state base player 2022-03-09 13:52:34 -06:00
Melbyj1125
7ae4b643a1 Fixed a lot of the issues we addressed on Monday 2022-03-09 02:16:56 -06:00
Evan Nydahl
03a96b8c67 Merge branch 'fixAnimator' into main 2022-03-07 14:13:20 -06:00