ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
344 Commits 1 Branch 0 Tags 876 MiB
Commit Graph

258 Commits

Author SHA1 Message Date
cyndrdev 4fe8d7d18c added parameter driven audio 2021-03-24 11:24:23 +00:00
Cat Flynn 832449c01d remove editor namespace lol 2021-03-23 15:09:19 +00:00
Cat Flynn a83cad4a2a create 3rd boost puzzle 2021-03-23 15:03:18 +00:00
cyndrdev 733e3f0b59 commited player w/ cheats enabled oopsie 2021-03-23 11:52:33 +00:00
cyndrdev da33cc4a4a updated animation controller, got new anims in-game 2021-03-23 11:48:43 +00:00
LojZa33 9ae930df56 Animations 2021-03-22 23:34:02 +01:00
Cat Flynn 927a1b9dd7 create killbox prefab 2021-03-22 16:45:42 +00:00
Cat Flynn 0fdc569380 Merge branch 'main' into feature/boost-puzzle-design 2021-03-22 15:59:28 +00:00
cyndrdev dd1924143f fixed menus not working with keeb / controller 2021-03-22 02:20:38 +00:00
Cat Flynn 91be3b97b9 redesign arrow wall trap objects 2021-03-18 17:25:34 +00:00
Programmer-DField 49d1fc481a Disabled mesh renderer and box collider on target for rolling boulder prefab. Also added the Mover script to the prefab. 2021-03-18 12:54:32 +00:00
Programmer-DField 914f7e584b Further cleaning of code in both scripts. 2021-03-18 12:48:09 +00:00
Programmer-DField b0b5c09c54 Cleaned up the script so it now works independant of gravity. Added a second Mover script that controls the speed and direction the boulder moves once triggered. Added a target to the prefab as this is the point at which the boulder moves towards. 2021-03-18 12:34:08 +00:00
Programmer-DField 1b02a15353 Made changes to the RollingBoulder script. The trap now works much more simply. The player enters a trigger and this sets the rigidbody to use gravity setting the boulder on its journey down the ramp. Player death works as with other traps. I need to speak with Cat as he mentioned using physics may not be the best, by this I assume he means gravity, so I need some advice on a different solution. 2021-03-17 22:07:33 +00:00
Programmer-DField f049b97297 Added the a RollingBoulder script as well as a boulder (sphere) and ramp (plane). Visual studio decided it wanted to update so saving work at this point. 2021-03-17 20:50:08 +00:00
Cat Flynn af519d2ffe pop-in animation on platform respawn 2021-03-17 18:37:56 +00:00
Cat Flynn 9037fd264c animation and audio event on falling platforms 2021-03-17 18:31:33 +00:00
Cat Flynn 44e55b22fe import falling platform sound 2021-03-17 18:28:13 +00:00
Cat Flynn 63ed52fe4a import dotween 2021-03-17 18:12:17 +00:00
Cat Flynn 292ca65bb2 respawn fallaway floor after a few seconds in the safe zone 2021-03-17 18:04:31 +00:00
Cat Flynn 4370729700 monochrome emission 2021-03-17 15:24:03 +00:00
Cat Flynn f5ceac5d0d assign textures in orb mat, use specular workflow, assign mat to model 2021-03-17 15:20:26 +00:00
Cat Flynn 13438cd751 re-import textures and create smoothness map 2021-03-17 15:19:00 +00:00
LojZa33 9f25b5f426 Orb_MAT 2021-03-17 01:00:53 +01:00
LojZa33 27f459f068 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into time-freezing-artefact 2021-03-16 20:01:46 +01:00
Cat Flynn e92ae299d8 boost puzzles 1 2 complete 3 wip 2021-03-16 16:38:46 +00:00
Novvator b94d9d7f32 changes made as per code review 2021-03-16 15:49:54 +00:00
cyndrdev eb82f4d95d cursor 2021-03-15 18:30:52 +00:00
cyndrdev b5a3054b5f fixed weird subtitle issues 2021-03-15 17:15:18 +00:00
Cinder Foster-Smith ed9be08db3 Merge branch 'Camera2ndPass' into 'main' 
Camera2nd pass

See merge request kernel-panic/revival!49
 2021-03-15 16:51:40 +00:00
cyndrdev 0712af572f Merge branch 'main' into Camera2ndPass 2021-03-15 16:36:48 +00:00
cyndrdev b57ee3dcb1 applied changes to prefabs 2021-03-15 16:35:38 +00:00
cyndrdev 9f352f6ffe Merge branch 'main' into feature/inject-prompt-artefact-ui 2021-03-15 16:23:04 +00:00
cyndrdev a6a8f0ee2d fixed dialogue font 2021-03-15 16:21:40 +00:00
Cinder Foster-Smith 9cedec4d74 Merge branch 'feature/path-spline' into 'main' 
Feature/path spline

Closes #44

See merge request kernel-panic/revival!45
 2021-03-15 16:13:41 +00:00
LojZa33 04c462d9a8 timefreeze Orb 2021-03-15 16:36:01 +01:00
LojZa33 42196fa144 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into Animation_IdletoWalkLocoMotion 2021-03-15 16:04:53 +01:00
Programmer-DField a07f31fbf2 Final check over before merge request. 2021-03-15 12:56:45 +00:00
Programmer-DField b724107be4 Added the cursor script to the camera prefab. One problem is that the cursor needs to be visible and contained to the window in the artifiact screen. Will catch up with Cinder about this. 2021-03-15 12:52:43 +00:00
Programmer-DField 148f153ea5 Added a script to the scene that both hides and locks the cursor. You can now operatee the camera without this being seen on screen. 2021-03-15 12:27:02 +00:00
Programmer-DField d299976da2 More fine tuning of the rigs. Enabled the Y-axis recentering. 2021-03-15 12:15:55 +00:00
Programmer-DField 65d46f7f18 Adjusted height of rigs to give a better view ahead, above, and below. 2021-03-15 12:06:53 +00:00
Programmer-DField 59d5f6b53c Made changes to the collision for the camera. In a tight area the camera will now move toward the player. 2021-03-15 11:28:46 +00:00
Programmer-DField ab8999b105 Fine tuned look ahead smoothing. 2021-03-15 11:19:42 +00:00
Programmer-DField 5473a5fc10 Added look ahead to each rig. Top, middle and bottom. The camera now pans towards direction of travel without having any input in the look direction. 2021-03-15 10:03:20 +00:00
LojZa33 723ab5d894 Rotating orb artefact [freeze] 2021-03-14 19:53:48 +01:00
Novvator 873c0908ef power freeze now works + UI indicator 2021-03-13 02:01:20 +00:00
Programmer-DField 29ec4cf76c Testing radius of lower rig. 2021-03-12 23:07:54 +00:00
Cat Flynn b8a2e67a33 platform-specific input prompt above nearby artefacts 2021-03-12 18:29:36 +00:00
Cat Flynn 9baddf74a1 remove extraneous debug logs 2021-03-12 17:46:01 +00:00
Cat Flynn a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
Cat Flynn 3c4f28844f basic world space artefact interaction prompt 2021-03-12 17:15:27 +00:00
Programmer-DField 9f3ec84ad8 Changed the height of the middle rig on the follow cam. This is now closer to player shoulder height. Also lowered the radius of the middle rig so it is now closer to the player. Added a small amount of look ahead time and smoothness (This will need to be configured more once the actual player model is in place). THis setting turn the camera toward the direction the player is moving (Cinder mentioned this in an earlier meeting). 2021-03-12 16:39:27 +00:00
Programmer-DField 8a81d12da5 Moved the follow target to be inline with the player model's shoulders. 2021-03-12 16:25:36 +00:00
Programmer-DField 7c56c0defa Changes made as suggested in code review (part2) 2021-03-12 15:58:18 +00:00
Cat Flynn 6baf92ea9a add spline walkway prefab 2021-03-12 15:38:23 +00:00
Cat Flynn 513b0a1eb3 import pathcreator 2021-03-12 14:33:05 +00:00
Programmer-DField baad3163e6 Made changes as per code review. 2021-03-12 11:52:56 +00:00
cyndrdev ba3d232088 made button bois pretty 2021-03-12 00:39:08 +00:00
cyndrdev 8e62127c71 added new whooshes 2021-03-12 00:18:10 +00:00
Cat Flynn e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts 2021-03-11 20:44:31 +00:00
Cat Flynn 7d5c493bcd inject input prompt sprites into dialogue 2021-03-11 20:25:16 +00:00
cyndrdev bdd9fc2e39 buttons 2021-03-11 20:23:20 +00:00
cyndrdev ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +00:00
cyndrdev 6538706e4a bad rider >:l 2021-03-11 16:01:21 +00:00
cyndrdev 599ff42a13 fixed main menu 2021-03-11 15:51:09 +00:00
cyndrdev 720d3cc325 artefact preview 2021-03-11 15:50:19 +00:00
cyndrdev 4883623740 made artefact preview work 2021-03-11 13:31:35 +00:00
cyndrdev 43f5a68d45 artefact ui overhaul 2021-03-11 13:12:19 +00:00
cyndrdev a76d00efa9 fixed scaling issues 2021-03-11 12:15:05 +00:00
cyndrdev a28207bbcd added fade boi 2021-03-11 12:02:34 +00:00
cyndrdev 9c4a16ec55 dialogue juice 2021-03-11 11:48:17 +00:00
Cat Flynn d5de30107f reset falling floor trap position on player respawn 2021-03-10 18:26:33 +00:00
Cat Flynn 762bbf6486 wip 2021-03-10 17:41:09 +00:00
cyndrdev 4c689e0561 minor bugfixes 2021-03-09 14:24:31 +00:00
cyndrdev 30df2a4b71 branding™️ 2021-03-08 17:34:51 +00:00
cyndrdev da08bdd574 oopsie 2021-03-08 17:19:14 +00:00
cyndrdev faa05ad1a8 final pretties 2021-03-08 17:18:43 +00:00
cyndrdev 24be02e384 made stuff look good 2021-03-08 17:05:33 +00:00
cyndrdev aa9526268c added graphics adjustment 2021-03-08 16:26:33 +00:00
cyndrdev 1d06cf5fb4 backend for playerpref audio 2021-03-08 15:13:19 +00:00
Novvator 660569601d first implementation of freeze 2021-03-08 14:16:20 +00:00
cyndrdev 50685f7d43 merged main properly 2021-03-05 19:33:23 +00:00
cyndrdev c86d67031d Merge branch 'main' into feature/audio-integration 2021-03-05 19:23:42 +00:00
cyndrdev 563f1f0cbf boot flow stuff 2021-03-05 18:40:20 +00:00
cyndrdev 34352d95ab added audio stuffs 2021-03-05 18:22:18 +00:00
Cat Flynn dd98fd5c40 speed up walk anim 2021-03-05 18:08:55 +00:00
Cat Flynn 6e8f8c313f update player in main scene 2021-03-05 18:06:37 +00:00
Cat Flynn 4d971c8170 Merge branch 'main' into Animation_IdletoWalkLocoMotion 2021-03-05 18:01:07 +00:00
Cat Flynn 143b3c2a7e update player prefab 2021-03-05 18:00:50 +00:00
Cat Flynn dba218cc7e delete script 2021-03-05 17:50:10 +00:00
LojZa33 e81cab42e0 no message 2021-03-05 18:44:27 +01:00
cyndrdev 4ca7a5b91b Merge branch 'main' into feature/audio-integration 2021-03-05 17:19:17 +00:00
cyndrdev de3cfe7449 tweaked VO settings 2021-03-05 17:17:58 +00:00
Cat Flynn ec8648b67c Merge branch 'main' into feature/falling-floor-trap-integration 2021-03-05 16:36:03 +00:00
Cat Flynn 43a01934bc update trap prefab 2021-03-05 16:32:21 +00:00
Cat Flynn e016e2b122 clean up trap floor prefab 2021-03-05 16:24:50 +00:00
Cinder Foster-Smith 154d809540 Merge branch 'feature/audio-integration' into 'main' 
Feature/audio integration

Closes #56

See merge request kernel-panic/revival!32
 2021-03-05 15:48:36 +00:00
Cat Flynn 687762b59e Merge branch 'feature/menus' into 'main' 
Feature/menus

See merge request kernel-panic/revival!31
 2021-03-05 15:45:02 +00:00
Cat Flynn afdf5ce87b Merge branch 'main' into feature/audio-integration 2021-03-05 15:39:03 +00:00