Commit Graph

38 Commits

Author SHA1 Message Date
Cat Flynn 595105467f Merge branch 'main' into feature/final-level-design 2021-05-17 23:45:39 +01:00
Cat Flynn 2e2eb5938b bunch of final level design 2021-05-17 23:37:20 +01:00
Cat Flynn eda57b9234 fix myriad bugs, finish freeze env and also baz 2021-05-17 03:29:00 +01:00
Cat Flynn 67eab1c2ba fix safe zones and boulder 2021-05-16 23:18:06 +01:00
Cat Flynn 4395681868 make freeze levels fully playable 2021-05-16 20:00:39 +01:00
Cat Flynn b4a331a63b fix boulder trap 2021-05-16 17:08:35 +01:00
Cat Flynn 290d6db641 Merge branch 'main' into feature/freeze-level-design 2021-05-16 01:31:19 +01:00
Cat Flynn abd72f4121 more level design 2021-05-16 01:22:50 +01:00
Cat Flynn 4884aa4f09 Merge branch '143-platforms-float' into 'main'
made changes to the fallawayfloor prefab

Closes #143

See merge request kernel-panic/revival!93
2021-05-15 13:56:45 +00:00
Novvator 20a7a64b1d made changes to the fallawayfloor prefab 2021-05-15 13:34:17 +01:00
Cat Flynn 3caf16655f add more sensible arrow mesh 2021-05-11 17:55:01 +01:00
Cat Flynn 5b2886db5e add arrow tips to wall 2021-05-10 15:07:54 +01:00
Cat Flynn a46d19a620 import arrow model and fix particle emission 2021-04-28 14:45:37 +01:00
Cat Flynn abde0ea9af Merge branch '97-rolling-boulders-freeze' into 'main'
rolling boulders now obey to freeze

Closes #97

See merge request kernel-panic/revival!62
2021-04-13 15:03:47 +00:00
Novvator 75cf0b6b5c applied it to the prefab 2021-04-06 15:31:08 +01:00
Novvator 0e96d83445 rolling boulders now obey to freeze 2021-04-06 15:29:41 +01:00
cyndrdev 1e5022e3e8 Merge branch 'main' into RollingBoulder 2021-03-25 19:00:32 +00:00
cyndrdev 6e74da102c minor fixes 2021-03-25 19:00:13 +00:00
Cat Flynn 01e8c30439 Merge branch 'main' into feature/boost-puzzle-design 2021-03-25 11:24:50 +00:00
cyndrdev 50955a19d0 Merge branch 'main' into RollingBoulder 2021-03-25 11:15:17 +00:00
Cat Flynn 94959bcb71 Merge branch 'main' into feature/boost-puzzle-design 2021-03-25 10:43:47 +00:00
Cat Flynn 122d0e1ff3 implement falling platform chain 2021-03-24 16:54:34 +00:00
cyndrdev 1611962ae9 messy messy merge >n< 2021-03-24 12:45:19 +00:00
Cat Flynn a83cad4a2a create 3rd boost puzzle 2021-03-23 15:03:18 +00:00
Cat Flynn 927a1b9dd7 create killbox prefab 2021-03-22 16:45:42 +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 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
Cat Flynn 9037fd264c animation and audio event on falling platforms 2021-03-17 18:31:33 +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 a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
Programmer-DField baad3163e6 Made changes as per code review. 2021-03-12 11:52:56 +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
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
Programmer-DField 3ef56e2bc1 Added a shader with dissolve effect. Ckleaned up use of tags now using compare.tag which is more efficient. The spike trap is now functionally working however, ppolish does need to be applied to the final outcome. 2021-02-26 14:50:30 +00:00