 Cat Flynn
|
8a04d1d3a9
|
Merge branch 'feature/arrow-wall-graphics' into 'main'
add arrow tips to wall
See merge request kernel-panic/revival!80
|
2021-05-12 00:57:50 +00:00 |
|
Cat Flynn
|
fbcc7f6a92
|
Merge branch 'main' into feature/arrow-wall-graphics
|
2021-05-11 18:16:55 +01:00 |
|
Cat Flynn
|
f93548787b
|
Merge branch 'main' into feature/teleport
|
2021-05-11 18:15:31 +01:00 |
 cyndrdev
|
31e96f7261
|
basic rework
|
2021-05-11 17:55:23 +01:00 |
|
Cat Flynn
|
3caf16655f
|
add more sensible arrow mesh
|
2021-05-11 17:55:01 +01:00 |
|
Cat Flynn
|
e811f48d42
|
Merge branch 'feature/arrow-wall-graphics' into fix/arrow-trap-scale
|
2021-05-11 16:35:41 +01:00 |
|
Cat Flynn
|
957310bf0f
|
block unused door in courtyard
|
2021-05-11 13:53:22 +01:00 |
|
Cat Flynn
|
cbe71cdcea
|
add jetpack
|
2021-05-11 01:48:24 +01:00 |
|
Cat Flynn
|
44ca53b755
|
add teleporter
|
2021-05-10 23:29:49 +01:00 |
|
Cat Flynn
|
aaff82b0d1
|
Merge branch 'main' into feature/teleport
|
2021-05-10 22:50:57 +01:00 |
|
Cat Flynn
|
9dc3b26516
|
Merge branch 'main' into feature/courtyard-glitch
|
2021-05-10 21:28:32 +01:00 |
|
Cat Flynn
|
6fb2e6ae8c
|
glitchy courtyard
|
2021-05-10 21:27:55 +01:00 |
|
Cat Flynn
|
763bd202c4
|
Merge branch 'feature/blink-rework' into 'main'
sorted environment node into prefabs
See merge request kernel-panic/revival!82
|
2021-05-10 19:25:52 +00:00 |
|
Cat Flynn
|
41ed852d04
|
build lighting and some env design
|
2021-05-10 18:14:00 +01:00 |
|
Cat Flynn
|
1637f9b038
|
Merge branch '119-final-level' into 'main'
Resolve "level design: all together now"
Closes #119
See merge request kernel-panic/revival!79
|
2021-05-10 16:29:03 +00:00 |
|
Cat Flynn
|
be1c8ff740
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-10 17:22:38 +01:00 |
|
cyndrdev
|
4ac0da2c08
|
sorted environment node into prefabs
|
2021-05-10 17:16:56 +01:00 |
|
Cat Flynn
|
f5630b4140
|
fix falling floor
|
2021-05-10 16:58:47 +01:00 |
|
Cat Flynn
|
3302a9adb0
|
Merge branch 'main' into feature/level-design
|
2021-05-10 15:12:45 +01:00 |
|
Cat Flynn
|
5b2886db5e
|
add arrow tips to wall
|
2021-05-10 15:07:54 +01:00 |
|
Cat Flynn
|
c18e1937d2
|
adjust some prefabs
|
2021-05-10 12:55:00 +01:00 |
Novvator
|
609e25b158
|
added prefab of the final level
|
2021-05-09 13:56:25 +01:00 |
|
Cat Flynn
|
ca454bb258
|
complete boost level sequence
|
2021-05-01 02:01:57 +01:00 |
|
Cat Flynn
|
93861ef0a4
|
apply trim to boost gauntlet
|
2021-04-29 02:24:00 +01:00 |
|
Cat Flynn
|
94d6c95998
|
wip
|
2021-04-28 21:37:39 +01:00 |
|
Cat Flynn
|
1eab207201
|
wip
|
2021-04-28 19:26:24 +01:00 |
|
Cat Flynn
|
5590a93171
|
start work on tunnel teleport
|
2021-04-28 15:58:11 +01:00 |
|
Cat Flynn
|
a46d19a620
|
import arrow model and fix particle emission
|
2021-04-28 14:45:37 +01:00 |
|
Cat Flynn
|
ac6bf175d1
|
Merge branch 'main' into feature/arrow-flurry-audio
|
2021-04-28 14:43:47 +01:00 |
|
Cat Flynn
|
780df95b8a
|
lighting experiments
|
2021-04-28 00:50:24 +01:00 |
|
Cat Flynn
|
3cd4fdb0fe
|
design second boost level
|
2021-04-28 00:27:47 +01:00 |
|
Cat Flynn
|
a7ada25aa1
|
give baz a drink and improve cameras
|
2021-04-27 22:41:30 +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
|
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 |
|
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
|
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
|
9c8ff85cf1
|
bunch of glitchy stuff, temple prefab
|
2021-04-25 23:44:43 +01:00 |
|
Cat Flynn
|
3344196f49
|
camera pass and start temple prefab
|
2021-04-25 05:16:35 +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
|
bff72788e6
|
make puzzle more forgiving
|
2021-04-16 20:28:21 +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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
a841238f56
|
added ui clicks
|
2021-03-25 12:19:44 +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 |
|
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 |
|
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 |
|
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
|
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
|
e92ae299d8
|
boost puzzles 1 2 complete 3 wip
|
2021-03-16 16:38:46 +00:00 |
|
Novvator
|
b94d9d7f32
|
changes made as per code review
|
2021-03-16 15:49:54 +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 |
|
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 |
|
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 |
|
Cat Flynn
|
b8a2e67a33
|
platform-specific input prompt above nearby artefacts
|
2021-03-12 18:29:36 +00:00 |
|
Cat Flynn
|
a9dfbbc99d
|
Merge branch 'main' into ArrowWall
|
2021-03-12 17:41:34 +00:00 |
|
Cat Flynn
|
3c4f28844f
|
basic world space artefact interaction prompt
|
2021-03-12 17:15:27 +00:00 |
|
Cat Flynn
|
6baf92ea9a
|
add spline walkway prefab
|
2021-03-12 15:38:23 +00:00 |
|
Programmer-DField
|
baad3163e6
|
Made changes as per code review.
|
2021-03-12 11:52:56 +00:00 |
|
cyndrdev
|
ba3d232088
|
made button bois pretty
|
2021-03-12 00:39:08 +00:00 |
|
Cat Flynn
|
e1b5fc214a
|
Merge branch 'main' into feature/dialogue-inject-prompts
|
2021-03-11 20:44:31 +00:00 |
|
Cat Flynn
|
7d5c493bcd
|
inject input prompt sprites into dialogue
|
2021-03-11 20:25:16 +00:00 |
|
cyndrdev
|
ecd6bab441
|
juiced artefact unlock screen
|
2021-03-11 19:34:32 +00:00 |
|
cyndrdev
|
720d3cc325
|
artefact preview
|
2021-03-11 15:50:19 +00:00 |
|
cyndrdev
|
4883623740
|
made artefact preview work
|
2021-03-11 13:31:35 +00:00 |
|
cyndrdev
|
43f5a68d45
|
artefact ui overhaul
|
2021-03-11 13:12:19 +00:00 |
|
cyndrdev
|
a76d00efa9
|
fixed scaling issues
|
2021-03-11 12:15:05 +00:00 |
|
cyndrdev
|
a28207bbcd
|
added fade boi
|
2021-03-11 12:02:34 +00:00 |
|
cyndrdev
|
9c4a16ec55
|
dialogue juice
|
2021-03-11 11:48:17 +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 |
|
cyndrdev
|
4c689e0561
|
minor bugfixes
|
2021-03-09 14:24:31 +00:00 |
|
cyndrdev
|
faa05ad1a8
|
final pretties
|
2021-03-08 17:18:43 +00:00 |
|
cyndrdev
|
24be02e384
|
made stuff look good
|
2021-03-08 17:05:33 +00:00 |
|
cyndrdev
|
1d06cf5fb4
|
backend for playerpref audio
|
2021-03-08 15:13:19 +00:00 |
|
Cat Flynn
|
4d971c8170
|
Merge branch 'main' into Animation_IdletoWalkLocoMotion
|
2021-03-05 18:01:07 +00:00 |
|
Cat Flynn
|
143b3c2a7e
|
update player prefab
|
2021-03-05 18:00:50 +00:00 |
|
Cat Flynn
|
ec8648b67c
|
Merge branch 'main' into feature/falling-floor-trap-integration
|
2021-03-05 16:36:03 +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 |
|
Cat Flynn
|
687762b59e
|
Merge branch 'feature/menus' into 'main'
Feature/menus
See merge request kernel-panic/revival!31
|
2021-03-05 15:45:02 +00:00 |
|
cyndrdev
|
a5b2f863fe
|
finalised main menu
|
2021-03-05 15:29:20 +00:00 |
|
cyndrdev
|
69e68e4879
|
Merge branch 'main' into feature/menus
|
2021-03-05 14:16:58 +00:00 |
|
cyndrdev
|
98a9003556
|
Merge branch 'main' into Traps
|
2021-03-05 12:06:35 +00:00 |
|
Cat Flynn
|
427ca62821
|
place artefacts and add dialogue triggers
|
2021-03-04 18:53:12 +00:00 |
|
Cat Flynn
|
fe1e69fa94
|
add safe and kill planes
|
2021-03-04 16:55:29 +00:00 |
|
Cat Flynn
|
0290806bbc
|
use SO-based references for respawn position and events
|
2021-03-03 12:53:52 +00:00 |
|
cyndrdev
|
1e8710a926
|
Merge branch 'main' into CineCamera
|
2021-03-02 19:05:19 +00:00 |
|
cyndrdev
|
7551e3434e
|
added player glue prefab
|
2021-03-02 19:04:38 +00:00 |