Commit Graph

291 Commits

Author SHA1 Message Date
cyndrdev 50955a19d0 Merge branch 'main' into RollingBoulder 2021-03-25 11:15:17 +00:00
Cinder Foster-Smith 4b5124e8ba Merge branch 'feature/chain-platforms' into 'main'
implement falling platform chain

Closes #116

See merge request kernel-panic/revival!57
2021-03-25 10:47:00 +00:00
Cat Flynn 122d0e1ff3 implement falling platform chain 2021-03-24 16:54:34 +00:00
Cinder Foster-Smith cfa6ac4027 Merge branch '14-power_freeze' into 'main'
Resolve "glove: freeze"

See merge request kernel-panic/revival!47
2021-03-24 12:54:04 +00:00
cyndrdev 1611962ae9 messy messy merge >n< 2021-03-24 12:45:19 +00:00
Cat Flynn ff9735c016 Merge branch 'feature/music' into 'main'
i added music triggers

Closes #85

See merge request kernel-panic/revival!56
2021-03-24 12:06:45 +00:00
cyndrdev 317a1ea53b settings tweaked 2021-03-24 11:52:01 +00:00
cyndrdev 9bcde1e028 added music triggers 2021-03-24 11:50:07 +00:00
cyndrdev 7d786ecdf6 added parameter driven audio 2021-03-24 11:25:57 +00:00
cyndrdev 4fe8d7d18c added parameter driven audio 2021-03-24 11:24:23 +00:00
Cat Flynn b93eaa0296 Merge branch 'Animations_Run,Jump(Takeoff,InAir,Landing)+Boost' into 'main'
Animations

See merge request kernel-panic/revival!54
2021-03-23 15:05:16 +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 b0d1f36571 Merge branch 'feature/109-arrow-wall-redesign' into 'main'
redesign arrow wall trap objects

Closes #109

See merge request kernel-panic/revival!53
2021-03-22 11:51:14 +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
Cinder Foster-Smith 7893db3d19 Merge branch 'feature/72-juice-falling-platforms' into 'main'
Feature/72 juice falling platforms

Closes #72

See merge request kernel-panic/revival!51
2021-03-18 12:39:44 +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 fbb510e70f Merge branch 'time-freezing-artefact' into 'main'
Time freezing artefact

Closes #96

See merge request kernel-panic/revival!50
2021-03-17 15:33:21 +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
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
Cinder Foster-Smith f8d3529420 Merge branch 'feature/inject-prompt-artefact-ui' into 'main'
basic world space artefact interaction prompt

Closes #93

See merge request kernel-panic/revival!46
2021-03-15 16:44:54 +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