 Cat Flynn
|
8757c7f371
|
Merge branch 'feature/level-design' into 'main'
collision cleanup, fixed softlock
See merge request kernel-panic/revival!96
|
2021-05-15 18:49:55 +00:00 |
 cyndrdev
|
7669e7cee9
|
collision cleanup, fixed softlock
|
2021-05-15 19:29:41 +01:00 |
|
Cinder Foster-Smith
|
ad648a9868
|
Merge branch 'feature/final-level-design' into 'main'
Feature/final level design
Closes #136
See merge request kernel-panic/revival!88
|
2021-05-15 17:37:54 +00:00 |
|
cyndrdev
|
645f57d7a6
|
re-added baz dialogue
|
2021-05-15 18:00:56 +01:00 |
|
cyndrdev
|
e6cae11081
|
fixed oob
|
2021-05-15 14:40:03 +01:00 |
|
Cat Flynn
|
a84bcd089a
|
baz first encounter audio
|
2021-05-15 14:38:25 +01:00 |
|
cyndrdev
|
dadb817898
|
conflict boyes fixes
|
2021-05-15 14:24:32 +01:00 |
|
Cat Flynn
|
e08c56adb9
|
Merge branch 'main' into feature/final-level-design
|
2021-05-15 14:19:34 +01:00 |
|
cyndrdev
|
a5869fc16c
|
added unseen event triggers
|
2021-05-14 20:38:03 +01:00 |
|
Cat Flynn
|
51c0dc008d
|
Merge branch 'main' into feature/final-level-design
|
2021-05-14 19:39:33 +01:00 |
|
cyndrdev
|
25fbf3ec1a
|
minor fixes
|
2021-05-14 19:22:37 +01:00 |
|
cyndrdev
|
db11e437b4
|
Merge branch 'main' into feature/blink-rework
|
2021-05-14 19:10:27 +01:00 |
|
cyndrdev
|
8cc9313238
|
reworked entrance
|
2021-05-13 17:18:56 +01:00 |
|
cyndrdev
|
c281d7e371
|
collision fixes, lighting improvements
|
2021-05-13 13:35:55 +01:00 |
|
cyndrdev
|
7f369fcf2d
|
removed death renderers
|
2021-05-12 20:56:00 +01:00 |
|
cyndrdev
|
220ae7b8d2
|
fixed all triggers
|
2021-05-12 20:10:58 +01:00 |
|
cyndrdev
|
23b7c07c03
|
mergey boi
|
2021-05-12 19:08:41 +01:00 |
|
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
|
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 |
|
cyndrdev
|
31e96f7261
|
basic rework
|
2021-05-11 17:55:23 +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
|
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 |
|
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
|
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
|
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
|
77d43c1c00
|
Merge branch 'main' into feature/level-design
|
2021-04-27 21:10:23 +01:00 |
|
Cat Flynn
|
0464502d56
|
environment prefabs in preparation for merge
|
2021-04-27 20:36:29 +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
|
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 |