Commit Graph

169 Commits

Author SHA1 Message Date
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
Melbyj1125
bd36986887 Reworked Jumping slightly
Added Coyote Jump
Fixed Wallrun Again
Fixed Glider
2021-12-06 14:16:41 -06:00
Vincent Wheat
5a8b657e16 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2021-12-03 13:59:32 -06:00
Vincent Wheat
3f3199d1dc Merge With Main 2021-12-03 13:58:58 -06:00
Vincent Wheat
1701b07b26 Merge branch 'RespawningInScene' 2021-12-03 13:56:33 -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
Vladdie
01e7fdb297 Merge branch 'ArcherTesting' 2021-12-03 13:31:49 -06:00
Melbyj1125
7e450955b2 Merge branch 'Sprint5Melby' 2021-12-03 13:27:33 -06:00
Vladdie
4b17a2e339 Updates to archer, changes needed on targeting. 2021-12-03 13:22:59 -06:00
Katherine
7d69730cc8 King UI Started
>King has a UI with buttons
>Clicking the buttons is parsed into the correct function
>Grid and Placement still needs to be implemented
2021-12-03 13:22:48 -06:00
Vincent Wheat
a31ac1b79f Slowdown Zones
-Added script for slowing player movement
-Updated Terrain Layouts
2021-12-03 13:22:09 -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
8e945a4d81 Merge branch 'WinLossTrans' 2021-12-01 13:55:39 -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
ca48a8516b PostGame Transitions To and From Successfully
- End of timer goes to PostGame
- Timer on PostGame returns to Lobby
- Resets PlayerData on return to Lobby
2021-12-01 13:34:53 -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
155882e8e6 Added initial objects into PostGame scene 2021-11-29 14:13:38 -06:00
Evan Nydahl
02410a642f Resolved naming conflicts and reorganized 2021-11-29 13:54:29 -06:00
Evan Nydahl
edb74552c4 Merge branch 'grayboxPlains' into main 2021-11-29 13:48:18 -06:00
Evan Nydahl
8ea0e0be1f -Renamed necessary terrain files
-deleted  deprecated terrains
2021-11-29 13:42:00 -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
8d04062e98 Created scene for the post game scene
- Created post game scene
- Added it to the NetworkManager
- Added to build settings as build index 4
2021-11-29 13:24:15 -06:00
Vincent Wheat
d972d959c1 Platforming Section
Platforming section added. Needs playtesting.
2021-11-29 13:21:35 -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
fdc44a27f0 Merge branch 'InventoryNetworking' 2021-11-29 12:03:19 -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
6f948c0c48 Added Overall Race Timer and PlayerHUD template 2021-11-28 11:31:17 -06:00
Vincent Wheat
e913df282f Scene Work
More Updates to Valley Terrain
2021-11-26 11:20:04 -06:00
Vincent Wheat
2f75b9b7d6 Performance and Organizational Improvments
-Reorganized imported unity packages
-Replaced walls in scene for performance reasons
-Created Glider points and ramp
-Centered valley on origin
2021-11-23 15:44:55 -06:00
df5107a1bc Implemented a 321 coundown 2021-11-22 14:22:01 -06:00
Melbyj1125
665b1c793f Inventory UI implemented
Networking should work
2021-11-22 13:52:06 -06:00
e6592cc305 Fixed Runner Collision
- Re-enabled the Character Controller
2021-11-22 13:28:41 -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
Evan Nydahl
ed03331b6e -Made third moutain iteration 2021-11-19 14:02:52 -06:00
Melbyj1125
3ca497b913 Inventory is a dictionary
Inventory Networking
2021-11-19 13:44:36 -06:00
wheatv3015
c779bafcff Start of Valley Greybox
-Added Debugger script for testing max player height on a jump
-Added Malcolm's Toy block package for testing and level building
-Updated Toy block prefabs to be proper scale
-Started tutorial (valley) area greyboxing
2021-11-18 22:45:20 -06:00
Vincent Wheat
ce16aa2fcd New Terrain
-Initial setup of the valley
-Valley Terrain Data
2021-11-17 16:44:16 -06:00
df46bee0f3
Merge pull request #2 from Lautha1/Thunderstorm-&-Fixes
Thunderstorm Programmed
2021-11-17 13:36:57 -06:00
Katherine
64aafcb80e Merge branch 'KingAbilities' 2021-11-17 13:28:06 -06:00
Melbyj1125
17a7cdb1ae Player Inventory Networking 2021-11-17 13:20:00 -06:00