 Cat Flynn
|
247723cbda
|
reposition player and add collider to entrance
|
2021-05-12 18:45:56 +01:00 |
 cyndrdev
|
53d74ff0bc
|
Merge branch 'main' into feature/blink-rework
|
2021-05-12 18:36:11 +01:00 |
|
cyndrdev
|
882b83cb70
|
main integration
|
2021-05-12 18:32:31 +01:00 |
|
cyndrdev
|
68b8f0be19
|
blink rework
|
2021-05-12 18:26:46 +01:00 |
|
cyndrdev
|
d7f4686316
|
blink gauntlet design
|
2021-05-12 16:56:54 +01:00 |
|
Cat Flynn
|
88135bac17
|
Merge branch 'main' into fix/arrow-trap-scale
|
2021-05-12 13:46:27 +01:00 |
|
Cat Flynn
|
2d45f1fc6e
|
link courtyard to final level with glitch tunnel teleport
|
2021-05-12 03:30:41 +01:00 |
|
Cat Flynn
|
76084c5740
|
Merge branch 'main' into feature/courtyard-glitch
|
2021-05-12 02:14:16 +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
|
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
|
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 |
|
cyndrdev
|
4ac0da2c08
|
sorted environment node into prefabs
|
2021-05-10 17:16:56 +01:00 |
|
Cat Flynn
|
c18e1937d2
|
adjust some prefabs
|
2021-05-10 12:55:00 +01:00 |
|
Cat Flynn
|
e2c410410a
|
test build lighting
|
2021-05-10 11:23:54 +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
|
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 |
|
Novvator
|
4285e6b518
|
wip
|
2021-04-27 21:31:20 +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 |
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
|
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 |
|
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 |
|
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
|
6cb0d90ee8
|
remove random walkway intersecting level
|
2021-04-16 14:18:19 +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
|
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 |
|
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 |
|
cyndrdev
|
07c89104f9
|
fixed time freeze not working
|
2021-04-13 15:33:59 +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 |
|
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 |
|
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
|
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 |
|
cyndrdev
|
dd1924143f
|
fixed menus not working with keeb / controller
|
2021-03-22 02:20:38 +00:00 |
|
Cat Flynn
|
e92ae299d8
|
boost puzzles 1 2 complete 3 wip
|
2021-03-16 16:38:46 +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 |
|
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 |
|
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
|
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 |