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

349 Commits

Author SHA1 Message Date
Cat Flynn a7ada25aa1 give baz a drink and improve cameras 2021-04-27 22:41:30 +01:00
Novvator 4285e6b518 wip 2021-04-27 21:31:20 +01:00
Cat Flynn 7b581796af Merge branch 'main' into feature/level-design 2021-04-27 21:16:49 +01:00
Cat Flynn ae4a3d5535 fix broken materials 2021-04-27 21:15:38 +01:00
Cat Flynn 77d43c1c00 Merge branch 'main' into feature/level-design 2021-04-27 21:10:23 +01:00
Cat Flynn 8eb20a6fe8 more material fixing 2021-04-27 21:08:01 +01:00
Cat Flynn 72bfc8eb8f fix material imports 2021-04-27 21:02:38 +01:00
Cat Flynn e6100db30f Merge branch 'main' into feature/trim2 2021-04-27 20:44:34 +01:00
Cat Flynn 0464502d56 environment prefabs in preparation for merge 2021-04-27 20:36:29 +01:00
Cat Flynn d9c4710984 camera improvements 2021-04-27 20:11:54 +01:00
CharlieTinley aac16946d1 Trim 2 assets, with materials and lighting changes 2021-04-27 13:02:36 +01:00
Cat Flynn 913c4d2231 import baz and disable dir lights in freeze rooms 2021-04-27 03:39:14 +01:00
Cat Flynn 4fdeabc7f0 buncha level design, prefabs and stuff 2021-04-27 00:57:07 +01:00
Cat Flynn a941c7105f forgot to save scene lol 2021-04-26 20:39:38 +01:00
Cat Flynn 3fc21c21a0 import arrow flurry 2021-04-26 20:33:57 +01:00
Cat Flynn 51437264fc wip 2021-04-26 19:12:54 +01:00
Cat Flynn 0d6854cf0c create more environment prefabs 2021-04-26 17:32:35 +01:00
Cat Flynn 5201402bce Merge branch 'main' into feature/glitch 2021-04-25 23:52:51 +01:00
Cat Flynn 9c8ff85cf1 bunch of glitchy stuff, temple prefab 2021-04-25 23:44:43 +01:00
Novvator f91b7918b3 moved char to starting position 2021-04-25 20:08:52 +01:00
Cat Flynn 3344196f49 camera pass and start temple prefab 2021-04-25 05:16:35 +01:00
Cat Flynn b192263344 add vertex floatiness uwu 2021-04-25 00:59:37 +01:00
Cat Flynn b91e97984f bunch of glitchy graphics stuff idk 2021-04-24 02:06:03 +01:00
Novvator 71a3b48a78 doors now close when the player dies, changes in main to make it work 2021-04-21 16:42:11 +01:00
Cat Flynn 3a2296e1bf remove trap from opening courtyard and add floor 2021-04-16 20:42:10 +01:00
Cat Flynn bff72788e6 make puzzle more forgiving 2021-04-16 20:28:21 +01:00
Cat Flynn 9d9de550e1 tune bloom and match controls to prompt 2021-04-16 20:19:19 +01:00
Cat Flynn 7c7ca3c48c artefact control prefabs 2021-04-16 19:55:34 +01:00
Cat Flynn 120e7574d0 add gloves lol 2021-04-16 19:31:49 +01:00
Cat Flynn 9912ed67db Merge branch 'feature/freeze-vfx' into 'main' 
made freeze have some neat sfx & vfx

See merge request kernel-panic/revival!69
 2021-04-16 16:47:57 +00:00
cyndrdev 338868d041 Merge branch 'main' into feature/menus 2021-04-16 16:39:06 +01:00
cyndrdev 28ac0b38cf added written artefact description 2021-04-16 16:36:49 +01:00
cyndrdev 9bb1b4e9df added artefact description writing 2021-04-16 16:26:42 +01:00
cyndrdev a669c02858 triggers for freeze sfx & vfx 2021-04-16 15:43:19 +01:00
cyndrdev 6ec3f5f99b added freeze postfx 2021-04-16 15:31:10 +01:00
Cat Flynn 1d00bffd70 update freeze input actions 2021-04-16 15:12:30 +01:00
Cat Flynn c3312b7d93 disable cheats on player 2021-04-16 15:03:50 +01:00
Cat Flynn 6ef4923b3d make freeze 3 playable without boost 2021-04-16 15:00:37 +01:00
Cat Flynn 3bc0b48c74 Merge branch 'main' into 95-freeze-sequence 2021-04-16 14:23:37 +01:00
Cat Flynn e75681c0b3 Merge branch 'main' into 95-freeze-sequence 2021-04-16 14:18:35 +01:00
Cat Flynn 6cb0d90ee8 remove random walkway intersecting level 2021-04-16 14:18:19 +01:00
Cat Flynn 024653a354 freeze artefact 2021-04-16 14:17:41 +01:00
Cat Flynn 12fccff6cd make it possible to complete freeze level 2 without boost 2021-04-16 14:17:12 +01:00
cyndrdev 116b1140df added implementation for freeze first use dialogue 2021-04-16 14:06:52 +01:00
cyndrdev cf8d58690d added new freeze voice lines 2021-04-16 14:00:46 +01:00
Cat Flynn 0708d9fd40 create freeze artefact and move dialogue trigger 2021-04-16 13:16:11 +01:00
cyndrdev e9bcb45b41 fixed bug #127 2021-04-16 13:15:54 +01:00
cyndrdev c96036b304 Merge branch 'main' into feature/boost-level-integration 2021-04-16 12:26:47 +01:00
cyndrdev 13ca75f3d3 applied cam changes to prefab 2021-04-16 12:17:15 +01:00
Novvator f2644a1a39 changed player to his original starting position 2021-04-16 01:00:06 +01:00
Novvator 45e5d4cbe3 small change 2021-04-16 00:58:16 +01:00
Novvator 7fec70745b added freeze levels in main 2021-04-16 00:57:25 +01:00
Novvator 8af98dc169 Merge branch 'feature/boost-level-integration' of https://gitlab.badbrain.dev/kernel-panic/game into 95-freeze-sequence 2021-04-15 21:47:45 +01:00
Novvator 44935911a5 finalized the freeze levels and made a small change to the RollingBoulder 2021-04-15 20:31:09 +01:00
Cat Flynn 77ce74c45a matrginally improve courtyard collision geometry 2021-04-15 19:36:53 +01:00
Cat Flynn 5cdd4e376f improve camera controls 2021-04-15 19:32:09 +01:00
Cat Flynn 2bdfa81a7a vastly improve lighting 2021-04-15 17:19:54 +01:00
Novvator 15e69799b9 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into 95-freeze-sequence 
# Conflicts:
#	game/Assets/Prefabs/Puzzles.meta
 2021-04-15 16:34:05 +01:00
Cat Flynn e7e4bbde07 Merge branch '115-secret-door-pressure-plate' into 'main' 
Added pressure plate and secret door prefab

See merge request kernel-panic/revival!64
 2021-04-15 14:21:17 +00:00
Cat Flynn 85fe992fa1 use events to link plate and door 
also removed unnecessary prefabs and moved animations to animation
folder
 2021-04-15 15:11:02 +01:00
Cat Flynn 717fd1c428 integrate boost level design 2021-04-15 14:44:06 +01:00
Novvator 577070a551 added PressurePlate test scene 2021-04-15 00:43:20 +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
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
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
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
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 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