Commit Graph

453 Commits

Author SHA1 Message Date
Evan Nydahl
38e01ac1e5 Edited UI functions for functionallity in network
-Added popups to map
2022-03-11 15:10:48 -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
Evan Nydahl
ee02e1eb59 Added animator to no debug 2022-03-07 14:10:49 -06:00
Vincent Wheat
28b7c72287 Update Game-Mountain.unity 2022-03-07 13:51:05 -06:00
Vincent Wheat
0375378f38 wtf
idk man we r screwed
2022-03-07 12:27:58 -06:00
Melbyj1125
ad6df78c0e Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-03-07 12:05:43 -06:00
Melbyj1125
b9ff40688b Changes to debug and state machine 2022-03-07 12:02:37 -06:00
Vincent Wheat
f0a4bff323 Merge branch 'Foothills' 2022-03-07 11:52:57 -06:00
Evan Nydahl
ab552e5467 Merge branch 'animationController' into main 2022-03-07 11:26:13 -06:00
Evan Nydahl
d2f75987e8 Animation Controller
-Added rough animator diagram--needs more work
-Added a animator manager script to handle animation priority
2022-03-07 11:23:17 -06:00
Vincent Wheat
3a8810fbf3 End of Night Commit
-Finished basic layout of foothills.
-Adjusted color on grapple point for visual contrast with crumbling platforms
-Added more archers/ archer platforms to rest of level, post archer tweak/fix re enable all archers.
2022-03-06 00:11:42 -06:00
7e40b39f04 Weather now cancel's after a set duration 2022-03-04 18:52:21 -06:00
3fdd63f886 Removed Option for title scene 2022-03-04 14:13:14 -06:00
8d2e1b0bf1 Weather Spawns for the players (doesn't yet despawn) 2022-03-04 14:10:30 -06:00
Vincent Wheat
ffdc7092bf Everything is crumbling
hahahahaha
2022-03-04 14:09:33 -06:00
Vincent Wheat
f62bb778a0 Update Level
-Added pitfall obstacles for left 1
-Adjusted foothills respawn points to prevent clipping
-Added new boulder prefab that isn't affected by gravity
-Added new boulder prefab to preloader
2022-03-04 12:08:37 -06:00
Vincent Wheat
530f399559 Small boulder fix
-Fixed small boulder movement issues.
-Added final pitfall obstacles
2022-03-04 10:36:12 -06:00
Melbyj1125
71d7a84725 can kick other players but there is a problem
Recovering from ragdoll has problems & host can't kick others for some
reason
2022-03-02 15:08:49 -06:00
Melbyj1125
141c2f3d32 Merge branch 'GrappleBroad' 2022-03-02 14:17:49 -06:00
Melbyj1125
48bdf66fc6 player shouldn't kick themselves 2022-03-02 14:17:14 -06:00
Melbyj1125
9b9e847ba9 modified debug kick 2022-03-02 14:12:35 -06:00
4724c80146 Finished and Fixed the Reset Button 2022-03-02 14:11:15 -06:00
Melbyj1125
d0f27de496 should be able to kick player? 2022-03-02 13:56:24 -06:00
Melbyj1125
685053ec78 modified player max speed 2022-03-02 12:59:56 -06:00
Melbyj1125
a6be528388 Merge branch 'WeatherPause' 2022-03-02 12:58:58 -06:00
Melbyj1125
741dae95cd weather and pause functionality implemented 2022-03-02 12:56:22 -06:00
Melbyj1125
00c3495461 pause disables inputs instead of scripts 2022-03-01 19:53:23 -06:00
Melbyj1125
0ef78f3eb5 wind should work rn 2022-03-01 17:46:50 -06:00
Melbyj1125
a47ee0c406 started modifying wind 2022-02-28 15:19:19 -06:00
Vincent Wheat
2812d0b0e2 Update Game-Mountain.unity
Turned off mesh renderer of pitfalls
2022-02-28 14:13:39 -06:00
Vincent Wheat
e693175f5e Update Game-Mountain.unity
Turned off invisible walls to be hidden in scene
2022-02-28 14:12:44 -06:00
Vincent Wheat
9725ec1706 Merge branch 'main' of https://github.com/Lautha1/TheKingsRace 2022-02-28 14:11:26 -06:00
Vincent Wheat
54758d5513 Added Respawn Points
-RespawnPoints added across map
-Killzone respawn points linked
2022-02-28 14:11:24 -06:00
ad30ba0140 Merge branch 'ResetButton' 2022-02-28 14:07:46 -06:00
3f51b34aec Added a Button to Reset to Last Checkpoint
- Unable to test to verify if it works until the Respawn Positions are
  in the game scene
2022-02-28 14:03:46 -06:00
Melbyj1125
627638f33b added weather wheel to king canvas 2022-02-28 14:02:21 -06:00
Melbyj1125
dcf9ce2a7a Merge branch 'ColGate' 2022-02-28 13:50:52 -06:00
Katherine
b8dbb271c6 Merge branch 'PolishTheImp' 2022-02-28 13:49:26 -06:00
Katherine
95ba7a6673 King Grid/Quick push
>Pushing King changes to main
>Have made some changes to the King's Grid
>Started on the Mountain Grid
2022-02-28 13:46:24 -06:00
Melbyj1125
b80aea96fd updated weather values 2022-02-28 13:44:20 -06:00
Melbyj1125
5b6b4a2cb9 weather wheel and weather adjustments 2022-02-28 13:42:51 -06:00
Vincent Wheat
5308a29ae2 Updates to Game-Mountain
-Added Crumbling platforms correctly
-Added reset zones
-Added basic particle systems for mapwide debugging
-Added tags for particle systems
2022-02-28 12:56:40 -06:00
Katherine
949c225ccc Slime Arrows and KingGrid edits
>Added arrows to the slime's movement
>Readjusted the grid to fir with new design
>Added the King model to the scene
2022-02-28 12:19:49 -06:00
Vincent Wheat
3d98a06afd Merge branch 'LevelLayout' 2022-02-28 11:35:43 -06:00
Vincent Wheat
f394241741 Boulder
-Boulder debugged, still needs to apply force
-Updated Game-Mountain
2022-02-28 11:30:55 -06:00
028ad52dc9 Modified Pitfall to Now Use a Transform For Respawning
- Will need to update all instances in scene with a new respawn point
  game object
2022-02-27 14:20:05 -06:00