Katherine
12055b97b2
Merge branch 'KingPolishandPlaytestFeedbackbyKateWithTwoWeeksLefttoSGX'
2022-04-15 14:15:33 -05:00
Katherine
f51042f7c8
Slime Model/1 Object per square
...
>Slime model has been added
>It does not turn properly...yet
>King can't place things in a chunk where there is a thing
>This also works on the player, meaning the King cant crush the player
2022-04-15 14:05:06 -05:00
0c9a5f11ef
Implemented Checkpoint for Both Vertical and Upper Mountain
...
- Now two seperate reset points in case players get stuck
2022-04-13 21:23:29 -05:00
9172b3592c
Fixed Locking of Sprite Rotation for Weather Wheel
...
- Now the sprite properly locks to the correct weather using the final
weather wheel asset
2022-04-13 20:46:18 -05:00
021f6e3b23
Modify Weather Wheel to Use Red Arrow to Spin
...
- Start using the new art assets
- NEED TO FIX ROTATION SETTING (KNOWN ISSUE)
2022-04-13 13:33:34 -05:00
3b7a356877
Weather Wheel Pointer Now Clickable to Trigger Wheel
2022-04-13 13:18:56 -05:00
37f15d10cc
Merge branch 'DespawnBumpers'
2022-04-13 13:08:33 -05:00
b2cbae39a2
Placed King Bumpers Now Despawn After 20 Seconds
2022-04-13 13:07:53 -05:00
Vincent Wheat
a5e82170d7
Merge branch 'main' of https://github.com/Lautha1/TheKingsRace
2022-04-13 12:55:16 -05:00
Vincent Wheat
1aa5a03dff
Merge branch 'ArtAdditions'
2022-04-13 12:54:59 -05:00
Melbyj1125
bc53896fb2
Merge branch 'UISlowPause'
2022-04-13 12:50:05 -05:00
Evan Nydahl
db412ae003
Merge branch 'controllerStuff' into main
2022-04-13 11:50:49 -05:00
Evan Nydahl
3379b8b0a8
Created cursor for menu
...
-created a cursor scrfipt and prefab and I have interegrated them with
the buttons on all pregame buttons (may need some refinement)
2022-04-13 11:45:06 -05:00
Vincent Wheat
2c30f99e3d
Rebaked lighting
...
Rebaked lighting
Smoothed terrain
added new finish line
added checkpoint zone
2022-04-13 10:36:53 -05:00
Melbyj1125
7f4e2173ad
fixed the issue with pausing while respawning:
2022-04-12 22:40:25 -05:00
Katherine
b16b8a505f
King UI fixes
...
>Q now toggles the UI
>The UI can no longer go offscreen
>The Panel that holds the King's buttons was resized, and its scaling
was changed
2022-04-12 14:12:27 -05:00
Melbyj1125
7d9e78891f
Merge branch 'QuickFixes'
2022-04-11 13:54:07 -05:00
Melbyj1125
274b441d24
smaller adjustments to grapple
2022-04-11 13:53:31 -05:00
2c1d8e33cd
Reduced Weather Wheel Spin Timer
2022-04-11 13:51:09 -05:00
Melbyj1125
427909b463
networked skyrim no more
2022-04-11 13:28:43 -05:00
Melbyj1125
2e594d859a
debug skyrim no more
2022-04-11 13:21:41 -05:00
Melbyj1125
a3a54af3c7
Small adjustment to skyrim
2022-04-11 12:07:27 -05:00
Melbyj1125
0a65febafe
fixed skyrim issue and other smaller bugs
2022-04-10 23:59:30 -05:00
dd537fdaf5
Set MLAPI Relay Use to be off by default
2022-04-10 00:32:34 -05:00
896b57252b
Fixed GameHandler null ref
2022-04-08 19:30:36 -05:00
Vincent Wheat
4e0fb884ad
Merge branch 'ReplaceBlocks'
2022-04-08 18:55:21 -05:00
Vincent Wheat
131c08967a
Lightmap
...
-Rebaked Lightmap
-Added skybox
-Adjusted blocks in level
2022-04-08 18:54:06 -05:00
Melbyj1125
75813c3b4b
Added delay to skyrim
2022-04-08 18:48:37 -05:00
Katherine
84368a0eb2
Hail Area
...
>Tested, refined, and removed Debugging for the Hail area's scaling
2022-04-08 18:26:23 -05:00
Melbyj1125
4b06e6d71d
Merge branch 'FinallyAwakeAreYou'
2022-04-08 18:16:48 -05:00
Melbyj1125
6c8691a44d
Fixexd UI Camera reference
2022-04-08 17:12:15 -05:00
ed7f1d7ab9
Archer and Other Fixes
...
- Fixed the null reference from the Archer shooting
- Fixed the null reference from the EndCollider
2022-04-08 16:15:33 -05:00
Melbyj1125
1757560964
Fixed Bumper issue that occured
2022-04-08 16:04:25 -05:00
Melbyj1125
036732bda0
fixed crouch walk references within state machine
2022-04-08 15:50:55 -05:00
765dd5cbff
Merge branch 'Icarus'
2022-04-08 15:38:21 -05:00
b46dc6101f
Hail Fully Networked
2022-04-08 15:37:34 -05:00
Melbyj1125
fdc77ada48
Implemented Crouch walking
2022-04-08 15:21:24 -05:00
Vincent Wheat
45264ec973
Merge branch 'LavaExperiments'
2022-04-08 15:08:31 -05:00
Vincent Wheat
48dcf0d2cb
Added New blocks
...
-New blocks imported
-Started adding them into the level and replacing old ones
2022-04-08 15:07:12 -05:00
Melbyj1125
562b64b160
removed debug logs
2022-04-08 13:25:59 -05:00
Melbyj1125
b097ca6907
skyrim is finished mostly
2022-04-08 13:21:50 -05:00
26a1265bc9
Merge branch 'KatesCoolBranchOfFixingtheKing'
2022-04-08 12:52:45 -05:00
Katherine
5857c374c5
Skybox
...
>Added the skyboxes, mutiple
2022-04-08 12:35:04 -05:00
Vincent Wheat
da2a943aa8
Many Adjustments
...
Adjusted race timer
Added spawn delay to boulder spawns
Adjusted slide wall and cannons on left and center paths of foothills
Implemented replaced cannons
Made spikeball prefab
Filled pits with spike balls
Added new archer tower model to scene
Tweaked invisible walls
Tweaked height of middle foothills path
Lowered cannons and archers on middle path
2022-04-07 13:13:59 -05:00
Melbyj1125
04a8caf8bb
Updated Player Prefabs
2022-04-06 13:53:26 -05:00
Melbyj1125
9ad203f9ad
Merge branch 'GrappleSlime'
2022-04-06 13:50:15 -05:00
Evan Nydahl
764415630e
Merge branch 'countDownFix' into main
2022-04-06 13:47:47 -05:00
Melbyj1125
534cc3c90c
added camera reference in networked player
2022-04-06 13:44:50 -05:00
Evan Nydahl
a291edd62e
General Changes
...
-Edited animatpr so it doesn't have deprecated states
-Edited 321 countdown script so players can't pause during the countdown
-Added stub objects for the part switching mechanic (will need to be resized
when we get assets for them.
2022-04-06 13:43:37 -05:00
Melbyj1125
26fbdba535
look priority when grappling
2022-04-06 13:42:28 -05:00