Melbyj1125
fc525861d4
added slide check functionality for certain functions
2022-02-14 12:55:36 -06:00
Melbyj1125
e1cf0bb094
Have a lot of the basic movement in the stateMachine
...
Will need to finish up and implement some of the ragdoll interactions
2022-02-14 00:32:37 -06:00
Melbyj1125
6f0b3a0d0b
Debug Scripts have been cleaned up.
...
I won't apply this cleanup to the networked version yet because they
will be updated to a state machine anyways.
2022-02-10 21:37:19 -06:00
Evan Nydahl
6cd3024767
General changes
...
1. Added tetzlaff ui changes (code may need to be shortened)
2022-02-09 13:51:06 -06:00
Melbyj1125
8fbedf486d
made dash use R button
2022-02-07 18:10:32 -06:00
Melbyj1125
fff8f4f17e
Merge branch 'sprintV7Melby'
2022-02-07 15:44:29 -06:00
9c15b44b6f
Potential Fix for Kick
2022-02-07 12:16:58 -06:00
Melbyj1125
df02d905b3
Updated player prefabs and non debug scripts
...
I did remember to uncomment if(!isLocalPlayer) thing
2022-02-07 08:24:07 -06:00
Melbyj1125
574b1d9431
player can grab the grapple farther than the max
...
it will pull player in after they grab on
2022-02-06 21:38:13 -06:00
Melbyj1125
0188b9aa17
grapple is more consistent and has a better momentum fall off on release
2022-02-04 19:54:14 -06:00
Evan Nydahl
b61cf12128
Adjustments
...
1. Adjusted player indicators and added a line
2. Reapplied game objects to dash and nitro
3. Readjust keybindings for nitro and dash
2022-02-04 15:20:50 -06:00
Evan Nydahl
83efaf4a34
Merge branch 'stuff' into main
2022-02-04 14:50:42 -06:00
Evan Nydahl
ed8b9ffa91
Added Lots of features
...
1. Added rough fx for erruption
2. Created a sign prefab for level use
3. fixed UI cooldown
2022-02-04 14:38:33 -06:00
04d92b39ee
Started fixing KingUI
2022-02-04 13:37:54 -06:00
e846ebc8c8
Modified the Gates and KickController to sync kicks and apply force
...
- Now the kicking of gates will sync over the network
- Needs review from Justin to verify this won't break other kickable
items
2022-02-03 23:14:58 -06:00
Melbyj1125
ba1b2706a6
fixed kick sort of, fixed bumper and boulder
...
Fix for kick works but is kind of strange and I want to adjust it later
in the future
2022-02-02 18:38:16 -06:00
7ebea33830
Still trying to fix the item bug
2022-02-02 13:16:12 -06:00
651bc24abf
Fixed an issue when you take no items into a game
2022-02-02 13:10:42 -06:00
cc3bd3d706
Possible Fixes To Net Bugs
2022-02-02 12:46:48 -06:00
Melbyj1125
dd27705eee
updated non debug files
2022-02-02 08:56:29 -06:00
Melbyj1125
df1b7f5448
Fixed an issue with wallrun moving the player up
...
Still needs adjustments to be more flexible and maybe allow the player
to wall run from standing still to allow for vertical wallrun sections.
2022-02-02 08:48:30 -06:00
Melbyj1125
f683a48b84
Rebalanced Items & Bug Fixed
...
I updated the player prefabs to be more in line with one another and
increased the max speed they can have
2022-02-02 00:08:06 -06:00
Melbyj1125
bf874ddc84
Updated nitro restoring functionality and buffing
2022-02-01 21:07:45 -06:00
Melbyj1125
c5ae603e8f
swing feels a lot more complete
...
Takes into accoutn player height and speed
need to adjust slightly for better ingame feel when it is implemented
into the levels.
2022-02-01 20:32:55 -06:00
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
Melbyj1125
57385b47b4
Player Items now carry over to the next scene
2021-12-01 14:23:14 -06:00
Vincent Wheat
10a9f8d1ca
Updates to terrain sculpting
...
-Updated Terrains for plains, valley
-Added respawn mechanic
-Added PlayerMovement respawn support
2021-12-01 13:51:46 -06:00
Katherine
27d3d5f4ab
King Movement
...
>King Movement, both Horizontal and and Circular implemented
>King Abilites changed to work with Player's getHit function
2021-12-01 12:43:45 -06:00
Evan Nydahl
edb74552c4
Merge branch 'grayboxPlains' into main
2021-11-29 13:48:18 -06:00
Evan Nydahl
4912786883
-started controller thing
2021-11-29 13:29:10 -06:00
Vincent Wheat
ba68320a8f
Merge branch 'TerrainScuplting'
2021-11-29 13:27:31 -06:00
7185e3b870
Correct Visibility and Naming Issue
2021-11-29 12:17:28 -06:00
58050dbc85
Merge branch 'PlayerEnable'
2021-11-29 12:12:24 -06:00
wheatv3015
49dea1fcde
updates
2021-11-29 12:05:38 -06:00
Melbyj1125
33cf07a9ae
Semi-Fixed Wallrunning
2021-11-29 11:53:49 -06:00
Evan Nydahl
1366273e54
Mountain/Controller progress
...
-more obstacles added to the mountain
-finish line was added at the top of the mountain
-installed new input package
2021-11-29 11:51:09 -06:00
Melbyj1125
665b1c793f
Inventory UI implemented
...
Networking should work
2021-11-22 13:52:06 -06:00
b7dd96905b
Player Camera Enabled and Movement Restored
...
- Players Gain Local Camera after cutscene
- Players Movement is disabled until after cutscene
2021-11-19 14:06:59 -06:00
Melbyj1125
3ca497b913
Inventory is a dictionary
...
Inventory Networking
2021-11-19 13:44:36 -06:00
df46bee0f3
Merge pull request #2 from Lautha1/Thunderstorm-&-Fixes
...
Thunderstorm Programmed
2021-11-17 13:36:57 -06:00
Melbyj1125
17a7cdb1ae
Player Inventory Networking
2021-11-17 13:20:00 -06:00
Melbyj1125
69a946c3ee
Merge branch 'invUpdate'
2021-11-17 12:36:26 -06:00
Evan Nydahl
e233d41b40
Merge branch 'grayboxPlains' into main
2021-11-17 12:30:48 -06:00
Evan Nydahl
377c36de9e
-Made changes to both gray boxes
...
-Added rough mountain gray box
-Made small edit to cooldown script
2021-11-17 12:26:25 -06:00
Melbyj1125
e2a1a9150c
small changes to player and items for cleanup
2021-11-17 12:21:15 -06:00
wheatv3015
e7cc370cc0
Thunderstorm Programmed
2021-11-11 10:22:07 -06:00
d23c4ce412
Unlock Cursor after transitioning from the game scene
2021-11-05 14:05:33 -05:00
Vincent Wheat
2fe2fa5764
Fixed dPlayerMovement & dWallrun references
2021-11-05 13:35:26 -05:00
Vincent Wheat
81abd7bfe8
Merge branch 'Particles'
2021-11-05 13:25:57 -05:00
Melbyj1125
758f06f775
Updated Debug prefab to be the testing version
...
Update Inventory Selection to work with debug prefab
2021-11-05 13:07:04 -05:00
6892d2f41f
Merge branch 'GameLoading'
2021-11-05 12:46:18 -05:00
