Commit Graph

  • b0d1f36571 Merge branch 'feature/109-arrow-wall-redesign' into 'main' Cat Flynn 2021-03-22 11:51:14 +0000
  • dd1924143f fixed menus not working with keeb / controller cyndrdev 2021-03-22 02:20:38 +0000
  • 91be3b97b9 redesign arrow wall trap objects Cat Flynn 2021-03-18 17:25:34 +0000
  • 49d1fc481a Disabled mesh renderer and box collider on target for rolling boulder prefab. Also added the Mover script to the prefab. Programmer-DField 2021-03-18 12:54:32 +0000
  • 914f7e584b Further cleaning of code in both scripts. Programmer-DField 2021-03-18 12:48:09 +0000
  • 7893db3d19 Merge branch 'feature/72-juice-falling-platforms' into 'main' Cinder Foster-Smith 2021-03-18 12:39:44 +0000
  • 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. Programmer-DField 2021-03-18 12:34:08 +0000
  • 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. Programmer-DField 2021-03-17 22:07:33 +0000
  • 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. Programmer-DField 2021-03-17 20:50:08 +0000
  • af519d2ffe pop-in animation on platform respawn Cat Flynn 2021-03-17 18:37:56 +0000
  • 9037fd264c animation and audio event on falling platforms Cat Flynn 2021-03-17 18:31:33 +0000
  • 44e55b22fe import falling platform sound Cat Flynn 2021-03-17 18:28:13 +0000
  • 63ed52fe4a import dotween Cat Flynn 2021-03-17 18:12:17 +0000
  • 292ca65bb2 respawn fallaway floor after a few seconds in the safe zone Cat Flynn 2021-03-17 18:04:31 +0000
  • fbb510e70f Merge branch 'time-freezing-artefact' into 'main' Cat Flynn 2021-03-17 15:33:21 +0000
  • 4370729700 monochrome emission Cat Flynn 2021-03-17 15:24:03 +0000
  • f5ceac5d0d assign textures in orb mat, use specular workflow, assign mat to model Cat Flynn 2021-03-17 15:20:26 +0000
  • 13438cd751 re-import textures and create smoothness map Cat Flynn 2021-03-17 15:19:00 +0000
  • 9f25b5f426 Orb_MAT LojZa33 2021-03-17 01:00:53 +0100
  • 27f459f068 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into time-freezing-artefact LojZa33 2021-03-16 20:01:46 +0100
  • e92ae299d8 boost puzzles 1 2 complete 3 wip Cat Flynn 2021-03-16 16:37:39 +0000
  • b94d9d7f32 changes made as per code review Novvator 2021-03-16 15:49:54 +0000
  • eb82f4d95d cursor cyndrdev 2021-03-15 18:30:52 +0000
  • b5a3054b5f fixed weird subtitle issues cyndrdev 2021-03-15 17:15:18 +0000
  • ed9be08db3 Merge branch 'Camera2ndPass' into 'main' Cinder Foster-Smith 2021-03-15 16:51:40 +0000
  • f8d3529420 Merge branch 'feature/inject-prompt-artefact-ui' into 'main' Cinder Foster-Smith 2021-03-15 16:44:54 +0000
  • 0712af572f Merge branch 'main' into Camera2ndPass cyndrdev 2021-03-15 16:36:48 +0000
  • b57ee3dcb1 applied changes to prefabs cyndrdev 2021-03-15 16:35:38 +0000
  • 9f352f6ffe Merge branch 'main' into feature/inject-prompt-artefact-ui cyndrdev 2021-03-15 16:23:04 +0000
  • a6a8f0ee2d fixed dialogue font cyndrdev 2021-03-15 16:21:40 +0000
  • 9cedec4d74 Merge branch 'feature/path-spline' into 'main' Cinder Foster-Smith 2021-03-15 16:13:41 +0000
  • 04c462d9a8 timefreeze Orb LojZa33 2021-03-15 16:36:01 +0100
  • 42196fa144 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into Animation_IdletoWalkLocoMotion LojZa33 2021-03-15 16:04:53 +0100
  • a07f31fbf2 Final check over before merge request. Programmer-DField 2021-03-15 12:56:45 +0000
  • 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. Programmer-DField 2021-03-15 12:52:43 +0000
  • 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. Programmer-DField 2021-03-15 12:27:02 +0000
  • d299976da2 More fine tuning of the rigs. Enabled the Y-axis recentering. Programmer-DField 2021-03-15 12:15:55 +0000
  • 65d46f7f18 Adjusted height of rigs to give a better view ahead, above, and below. Programmer-DField 2021-03-15 12:06:53 +0000
  • 59d5f6b53c Made changes to the collision for the camera. In a tight area the camera will now move toward the player. Programmer-DField 2021-03-15 11:28:46 +0000
  • ab8999b105 Fine tuned look ahead smoothing. Programmer-DField 2021-03-15 11:19:42 +0000
  • 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. Programmer-DField 2021-03-15 10:03:20 +0000
  • 723ab5d894 Rotating orb artefact [freeze] LojZa33 2021-03-14 19:53:48 +0100
  • 873c0908ef power freeze now works + UI indicator Novvator 2021-03-13 02:01:20 +0000
  • 29ec4cf76c Testing radius of lower rig. Programmer-DField 2021-03-12 23:07:54 +0000
  • 89ec092d49 Merge branch 'ArrowWall' into 'main' Cat Flynn 2021-03-12 18:31:43 +0000
  • b8a2e67a33 platform-specific input prompt above nearby artefacts Cat Flynn 2021-03-12 18:29:36 +0000
  • 9baddf74a1 remove extraneous debug logs Cat Flynn 2021-03-12 17:46:01 +0000
  • a9dfbbc99d Merge branch 'main' into ArrowWall Cat Flynn 2021-03-12 17:41:34 +0000
  • 3c4f28844f basic world space artefact interaction prompt Cat Flynn 2021-03-12 17:15:27 +0000
  • 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). Programmer-DField 2021-03-12 16:39:27 +0000
  • 8a81d12da5 Moved the follow target to be inline with the player model's shoulders. Programmer-DField 2021-03-12 16:25:36 +0000
  • 7c56c0defa Changes made as suggested in code review (part2) Programmer-DField 2021-03-12 15:58:18 +0000
  • 6baf92ea9a add spline walkway prefab Cat Flynn 2021-03-12 15:38:23 +0000
  • 513b0a1eb3 import pathcreator Cat Flynn 2021-03-12 14:33:05 +0000
  • 4ccf346241 Merge branch 'feature/menus' into 'main' Cat Flynn 2021-03-12 12:12:05 +0000
  • baad3163e6 Made changes as per code review. Programmer-DField 2021-03-12 11:52:56 +0000
  • ba3d232088 made button bois pretty cyndrdev 2021-03-12 00:39:08 +0000
  • 8e62127c71 added new whooshes cyndrdev 2021-03-12 00:18:10 +0000
  • f7a4f943e8 Merge branch 'feature/dialogue-inject-prompts' into 'main' Cinder Foster-Smith 2021-03-11 20:56:26 +0000
  • e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts Cat Flynn 2021-03-11 20:44:31 +0000
  • e3c468a1c0 remove early timeout from build script Cat Flynn 2021-03-11 20:35:31 +0000
  • aad2389939 Merge branch 'feature/menus' into 'main' Cat Flynn 2021-03-11 20:33:08 +0000
  • 7d5c493bcd inject input prompt sprites into dialogue Cat Flynn 2021-03-11 20:25:09 +0000
  • bdd9fc2e39 buttons cyndrdev 2021-03-11 20:23:20 +0000
  • ecd6bab441 juiced artefact unlock screen cyndrdev 2021-03-11 19:34:32 +0000
  • 6538706e4a bad rider >:l cyndrdev 2021-03-11 16:01:21 +0000
  • 599ff42a13 fixed main menu cyndrdev 2021-03-11 15:51:09 +0000
  • 720d3cc325 artefact preview cyndrdev 2021-03-11 15:50:19 +0000
  • 4883623740 made artefact preview work cyndrdev 2021-03-11 13:31:35 +0000
  • 43f5a68d45 artefact ui overhaul cyndrdev 2021-03-11 13:12:19 +0000
  • 86458ab622 Merge branch 'feature/menus' into 'main' Cat Flynn 2021-03-11 12:30:53 +0000
  • a76d00efa9 fixed scaling issues cyndrdev 2021-03-11 12:15:05 +0000
  • ca03ab9150 Merge branch 'feature/menus' into 'main' Cat Flynn 2021-03-11 12:11:07 +0000
  • a28207bbcd added fade boi cyndrdev 2021-03-11 12:02:34 +0000
  • 9c4a16ec55 dialogue juice cyndrdev 2021-03-11 11:48:17 +0000
  • d5a0430252 Merge branch 'bug/unity-pid' into 'main' Cinder Foster-Smith 2021-03-11 11:03:06 +0000
  • c04bdee120 Merge branch 'bug/trap-floor-no-resest' into 'main' Cinder Foster-Smith 2021-03-10 18:51:50 +0000
  • d5de30107f reset falling floor trap position on player respawn Cat Flynn 2021-03-10 18:26:33 +0000
  • 762bbf6486 wip Cat Flynn 2021-03-10 17:41:09 +0000
  • 8a92302834 copy readme to build dir Cat Flynn 2021-03-10 13:00:33 +0000
  • af9708ebe9 bump time limit, improve wait message Cat Flynn 2021-03-09 17:37:43 +0000
  • d3a1905f1e fix typo Cat Flynn 2021-03-09 17:35:28 +0000
  • 131e8f8792 detect failed unity launch and retry Cat Flynn 2021-03-09 17:30:48 +0000
  • 4c689e0561 minor bugfixes cyndrdev 2021-03-09 14:24:31 +0000
  • 091b078713 Merge branch 'feature/menus' into 'main' Cat Flynn 2021-03-09 13:51:50 +0000
  • 30df2a4b71 branding™️ cyndrdev 2021-03-08 17:34:51 +0000
  • da08bdd574 oopsie cyndrdev 2021-03-08 17:19:14 +0000
  • faa05ad1a8 final pretties cyndrdev 2021-03-08 17:18:43 +0000
  • 24be02e384 made stuff look good cyndrdev 2021-03-08 17:05:33 +0000
  • aa9526268c added graphics adjustment cyndrdev 2021-03-08 16:26:33 +0000
  • 1d06cf5fb4 backend for playerpref audio cyndrdev 2021-03-08 15:13:19 +0000
  • 660569601d first implementation of freeze Novvator 2021-03-08 14:16:20 +0000
  • 2b3a950208 add readme Cat Flynn 2021-03-05 21:58:12 +0000
  • 08c1efb0ae Merge branch 'feature/audio-integration' into 'main' Cinder Foster-Smith 2021-03-05 19:47:45 +0000
  • 50685f7d43 merged main properly cyndrdev 2021-03-05 19:33:23 +0000
  • c86d67031d Merge branch 'main' into feature/audio-integration cyndrdev 2021-03-05 19:23:42 +0000
  • 563f1f0cbf boot flow stuff cyndrdev 2021-03-05 18:40:20 +0000
  • 9cfa17fb1e Merge branch 'Animation_IdletoWalkLocoMotion' into 'main' Cat Flynn 2021-03-05 18:23:40 +0000
  • 34352d95ab added audio stuffs cyndrdev 2021-03-05 18:22:18 +0000
  • dd98fd5c40 speed up walk anim Cat Flynn 2021-03-05 18:08:55 +0000