 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 |
 Cat Flynn
|
e95005f4b9
|
Merge branch 'feature/look-away' into 'main'
added unseen event triggers
See merge request kernel-panic/revival!92
|
2021-05-15 15:35:41 +00:00 |
|
cyndrdev
|
c82db097c6
|
fixed weird delay glitches
|
2021-05-15 15:08:58 +01:00 |
|
Cat Flynn
|
4884aa4f09
|
Merge branch '143-platforms-float' into 'main'
made changes to the fallawayfloor prefab
Closes #143
See merge request kernel-panic/revival!93
|
2021-05-15 13:56:45 +00: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 |
|
Cat Flynn
|
d1475cf853
|
import baz vo
|
2021-05-15 14:38:01 +01:00 |
|
Cat Flynn
|
5ecd269843
|
move prefab
|
2021-05-15 14:34:15 +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 |
Novvator
|
20a7a64b1d
|
made changes to the fallawayfloor prefab
|
2021-05-15 13:34:17 +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
|
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
|
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
|
a5941e52e0
|
fuck namespaces hee hoo
|
2021-05-11 22:38:28 +01: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
|
184d2ef899
|
Merge branch 'fix/noise-textures' into 'main'
delete unused noise textures lole
See merge request kernel-panic/revival!81
|
2021-05-10 19:25:17 +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
|
a8c004aec3
|
delete unused noise textures lole
|
2021-05-10 17:05:51 +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 |
|
Cinder Foster-Smith
|
e3fb789cc3
|
Merge branch 'feature/arrow-flurry-audio' into 'main'
arrow juice
Closes #111, #133, and #113
See merge request kernel-panic/revival!74
|
2021-05-10 13:59:12 +00:00 |