 Cat Flynn
|
290d6db641
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-16 01:31:19 +01:00 |
|
Cat Flynn
|
abd72f4121
|
more level design
|
2021-05-16 01:22:50 +01:00 |
|
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 |
|
Cat Flynn
|
759eef93bb
|
swap temples
|
2021-05-15 19:49:34 +01: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 |
|
Cat Flynn
|
605d53918d
|
Merge branch 'feature/baz' into 'main'
Feature/baz
See merge request kernel-panic/revival!94
|
2021-05-15 17:03:01 +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 |
|
Cat Flynn
|
c45992562d
|
retrieve freeze intro prefab
|
2021-05-15 15:09:57 +01: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 |
|
Cat Flynn
|
ec24afb667
|
build fmod banks
|
2021-05-15 14:48:10 +01:00 |
|
Cat Flynn
|
8a8c24ce1f
|
Merge branch 'temp' into feature/freeze-level-design
|
2021-05-15 14:42:37 +01:00 |
|
Cat Flynn
|
e589e73da3
|
remove duplicate freeze intro
|
2021-05-15 14:40:19 +01:00 |
|
cyndrdev
|
e6cae11081
|
fixed oob
|
2021-05-15 14:40:03 +01:00 |
|
Cat Flynn
|
d4cda1655a
|
more freeze level env design
|
2021-05-15 14:39:55 +01:00 |
|
Cat Flynn
|
fd9dafde2a
|
acropolis time
|
2021-05-15 14:39:54 +01:00 |
|
Cat Flynn
|
7648f949a3
|
wip freeze level design
|
2021-05-15 14:39:53 +01:00 |
|
Cat Flynn
|
03ae8b781b
|
mostly freeze puzzle design
|
2021-05-15 14:39:53 +01:00 |
|
Cat Flynn
|
0d2291ed8b
|
a touch more env
|
2021-05-15 14:39:52 +01:00 |
|
Cat Flynn
|
0fcf9b4427
|
wip freeze levels environment design
|
2021-05-15 14:39:52 +01:00 |
|
Cat Flynn
|
25e5b9da27
|
wip
|
2021-05-15 14:39:49 +01:00 |
|
Cat Flynn
|
6fec5d1b92
|
build lighting and some env design
|
2021-05-15 14:39:23 +01:00 |
|
Cat Flynn
|
132103140e
|
fix falling floor
|
2021-05-15 14:39:22 +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 |
|
Cat Flynn
|
dece0b1a34
|
Merge branch 'feature/blink-rework' into 'main'
collision fixes & lighting improvements for blink levels
See merge request kernel-panic/revival!90
|
2021-05-14 20:17:03 +00: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 |
|
Cat Flynn
|
2bd79265e4
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-14 19:13:40 +01:00 |
|
cyndrdev
|
db11e437b4
|
Merge branch 'main' into feature/blink-rework
|
2021-05-14 19:10:27 +01:00 |
|
Cat Flynn
|
50cb54ff02
|
Merge branch 'feature/entrance-rework' into 'main'
Reworked entrance
See merge request kernel-panic/revival!91
|
2021-05-14 15:50:25 +00: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 |
|
Cat Flynn
|
65c74ff0b7
|
a touch more env
|
2021-05-13 13:07:54 +01:00 |
|
Cat Flynn
|
f299abb0db
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-13 12:40:04 +01:00 |
|
Cat Flynn
|
f84863de39
|
wip freeze levels environment design
|
2021-05-13 10:43:32 +01:00 |
|
Cinder Foster-Smith
|
98b35aad34
|
Merge branch 'feature/blink-rework' into 'main'
Blink Rework
See merge request kernel-panic/revival!89
|
2021-05-12 22:22:23 +00: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 |