Commit Graph

569 Commits

Author SHA1 Message Date
Cat Flynn db7c86e790 Merge branch 'main' into 97-rolling-boulders-freeze 2021-04-13 15:52:02 +01:00
Cat Flynn 8ef7a1d88b Merge branch 'main' into 98-arrow-wall-freeze 2021-04-13 15:46:22 +01:00
cyndrdev 07c89104f9 fixed time freeze not working 2021-04-13 15:33:59 +01:00
Novvator 586fa97d56 Added pressure plate and secret door prefab 2021-04-11 23:17:49 +01: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
Novvator 203b2e9c82 arrow wall obeys to the freeze ability 2021-04-06 14:25:53 +01:00
Cinder Foster-Smith fffb50a6a2 Merge branch 'RollingBoulder' into 'main'
Rolling boulder

See merge request kernel-panic/revival!52
2021-03-25 19:19:26 +00:00
Cinder Foster-Smith 35fd443bd0 Merge branch 'fix/safe-zone-spawn-pos' into 'main'
respawn in middle of safe zone

Closes #117

See merge request kernel-panic/revival!58
2021-03-25 19:04:48 +00: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 7041d71c6f fix safe zone scale and appearance in builds 2021-03-25 17:24:17 +00:00
Cat Flynn c489c8ef49 Merge branch 'feature/menus' into 'main'
ui sounds :)

See merge request kernel-panic/revival!59
2021-03-25 17:19:26 +00:00
cyndrdev b26abcc081 beta time babey 2021-03-25 12:20:32 +00:00
cyndrdev a841238f56 added ui clicks 2021-03-25 12:19:44 +00:00
Cat Flynn 368cb90464 respawn in middle of safe zone 2021-03-25 11:58:40 +00:00
Cat Flynn 07cebb6ea5 Merge branch 'feature/boost-puzzle-design' into 'main'
Feature/boost puzzle design

Closes #73

See merge request kernel-panic/revival!55
2021-03-25 11:53:06 +00:00
cyndrdev 242ccb6fcb Merge branch 'main' into feature/menus 2021-03-25 11:27: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 e2a4d6dd45 fix compile errors 2021-03-25 10:51:22 +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 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
Novvator fa579d5ce3 added the 3 freeze levels - need rolling boulder and door lever 2021-03-24 15:27:38 +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 832449c01d remove editor namespace lol 2021-03-23 15:09:19 +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
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
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
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
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