Commit Graph

118 Commits

Author SHA1 Message Date
Melbyj1125
b2bd9783d4 Merge branch 'sprint3MelbySpring' 2022-01-31 14:23:48 -06:00
Melbyj1125
b63b814fe4 Small changes 2022-01-31 14:21:38 -06:00
Evan Nydahl
09ea1fe031 Fixed indicator and CooldownUI 2022-01-31 14:07:23 -06:00
Melbyj1125
37b9fab90a updated item sprites 2022-01-31 12:19:55 -06:00
Melbyj1125
5f8d487c95 added swing movement easing and adjusted the ropeOffset
Still need to add player movement and height affecting momentum
2022-01-31 10:18:27 -06:00
Melbyj1125
e249e5d4d5 idle grapple calculations have been solidified
I can now move into adding how player speed and height effect these
things
2022-01-31 09:39:30 -06:00
Melbyj1125
7526d16f75 Implemented tooltips when hovering over an item
Added some placeholder images for the items in the game
made small adjustments to grapple
2022-01-31 08:05:17 -06:00
Melbyj1125
9c3462521e small adjustment to nitro and player prefabs 2022-01-28 13:45:38 -06:00
Melbyj1125
6bab1292f6 fixed bumper and boulder
fixed wallrun on regular player prefab
2022-01-28 13:11:13 -06:00
Melbyj1125
4042eb1c67 Rebalanced the swing diagram so that if the player is able to lengthen
the rope while swinging it will be able to readjust the length ensuring
that it wont become much longert than the intended length.
2022-01-27 20:53:26 -06:00
Melbyj1125
eb5e3e22a7 Updated some of the player prefabs and repositioned the camera slightly
on them
2022-01-26 13:56:45 -06:00
Melbyj1125
076bf0e158 fixed a couple of the bugs that was found in playtest 3 2022-01-26 13:30:01 -06:00
Melbyj1125
d27f8126cb made some small name changes to prevent issues 2022-01-24 13:52:18 -06:00
Melbyj1125
fca69d01d0 Updated the non debug files 2022-01-24 13:42:08 -06:00
2da2237835 Merge branch 'JuliasWintermBugFixes' 2022-01-24 13:18:38 -06:00
Melbyj1125
f1e693e935 swing is mostly functional
Still needs some easing on movement and other minor changes
2022-01-23 18:42:25 -06:00
Melbyj1125
3306da25ba momentum grappling issue solved
Need to adjust smaller things but swing feels more complete
2022-01-21 03:08:58 -06:00
c1d51f4148 Fixed Items Not Apply to Clients Bug
- Fixed a bug in which clients were not spawned in with their items
  despite selecting them in the lobby.  Also applied this fix to the
  respawn method for the pitfalls
2022-01-19 17:28:12 -06:00
Melbyj1125
c881e37b9c Made some small improvements to wallrun and the player prefabs
Grapple movement is a lot better just need to implement momentum
2022-01-09 08:12:14 -06:00
Melbyj1125
79626242c0 A lot of cleanup and adjustments
traction resets after a glide
Keep Momentum after sliding
Wallrun adjusted on player prefab
Wallrun added to Player prefab2
A lot of stats adjusted on all prefabs
2021-12-17 02:04:15 -06:00
Melbyj1125
bb5ee9d2b2 smaller stat changes 2021-12-13 14:20:52 -06:00
Melbyj1125
6c09c3e976 Merge branch 'MelbyFinalSprint' 2021-12-13 13:12:46 -06:00
Melbyj1125
3c3708f869 Changed Player Stats and altered kick hit box 2021-12-13 13:06:47 -06:00
ae287e391a Fixed PlayerMovevment Bug 2021-12-13 12:24:29 -06:00
Melbyj1125
c3889509c5 Merge branch 'MelbyFinalSprint' 2021-12-10 23:17:37 -06:00
Melbyj1125
946e2146a3 grapple still doesn't work fixed some other values with prefabs 2021-12-10 22:36:40 -06:00
1fe41e62c3 Merge branch 'NetworkedRespawning' 2021-12-10 20:56:31 -06:00
Melbyj1125
82e7cdd729 Merge branch 'MelbyFinalSprint' 2021-12-10 18:31:08 -06:00
Melbyj1125
610d8b832e Player Teleport Implemented 2021-12-10 18:29:51 -06:00
dd9a7b625c Beginning of KillZone work 2021-12-10 18:29:16 -06:00
Evan Nydahl
65efe2c69e Merge branch 'crunchySprint' into main 2021-12-10 18:08:17 -06:00
Melbyj1125
4c8cbcf82e grapple still has issues 2021-12-10 18:05:54 -06:00
Evan Nydahl
66b72a797e -edited animation a little--consistently stops animation when player
stops moving
2021-12-10 16:41:48 -06:00
Melbyj1125
45ce1576b5 updated debug and network player prefab 2021-12-10 13:42:32 -06:00
Melbyj1125
9bc571dded added debug updates to regular scripts 2021-12-10 13:30:43 -06:00
Melbyj1125
614e0aa685 Fixed Kick 2021-12-10 13:27:00 -06:00
Melbyj1125
6b893f8a77 Merge branch 'MelbySprint5-2' 2021-12-10 13:19:11 -06:00
Evan Nydahl
549af282cc -added rough animation controller 2021-12-10 12:37:32 -06:00
Melbyj1125
e91afb02f4 Bumper has been fixed sort of
You need to use 2 colliders one thats a trigger and one thats not and it
will work properly
2021-12-10 12:34:13 -06:00
Melbyj1125
c44afd50a8 Jump has been reworked again but it works now
Glide has been fixed again
Wallrun has been fixed again
player can now short hop
2021-12-10 06:52:59 -06:00
Evan Nydahl
64b920c3d5 -created a script for breakable objects
-updated block prefabs (updated size/added breakable script)
-added demo scene for blocks/breakable script
2021-12-07 18:35:05 -06:00
Melbyj1125
bd36986887 Reworked Jumping slightly
Added Coyote Jump
Fixed Wallrun Again
Fixed Glider
2021-12-06 14:16:41 -06:00
Evan Nydahl
36da5ec848 Resolved many merge conflicts 2021-12-03 13:55:32 -06:00
Evan Nydahl
e0cfb655f8 Merge branch 'controller' into main 2021-12-03 13:42:41 -06:00
Katherine
555ca22573 Merge branch 'KingsAbs' 2021-12-03 13:37:23 -06:00
Evan Nydahl
97b727b3db -changed cooldown thing (only needed for dodge and boost). May want to
deprecate these
-slight edits to mountain path
2021-12-03 13:32:37 -06:00
Melbyj1125
7e450955b2 Merge branch 'Sprint5Melby' 2021-12-03 13:27:33 -06:00
Melbyj1125
17d804080d Gate created and player tagged correctly 2021-12-03 13:17:12 -06:00
Melbyj1125
55885e2ef1 Wallrun allows players to hop off wall again 2021-12-03 10:51:37 -06:00
Evan Nydahl
20db245902 -Modified mountain (may need more changes later)
-Added full controller support for all abillities that will be in the game
(grapple is currently set to x)
2021-12-01 15:38:24 -06:00