 Cat Flynn
|
9397c75c40
|
Merge branch 'feature/trim2' into 'main'
Trim 2 assets, with materials and lighting changes
See merge request kernel-panic/revival!75
|
2021-04-27 19:55:48 +00: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
|
5a899f6877
|
Merge branch 'move_char_in_main' into 'main'
moved character to starting position
See merge request kernel-panic/revival!72
|
2021-04-25 19:20:00 +00:00 |
Novvator
|
f91b7918b3
|
moved char to starting position
|
2021-04-25 20:08:52 +01:00 |
|
Cat Flynn
|
88b2b9aa10
|
Merge branch '129-secret-door-close' into 'main'
doors now close when the player dies, changes in main to make it work
Closes #129
See merge request kernel-panic/revival!71
|
2021-04-22 13:42:15 +00: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
|
ebff7d05eb
|
update readme
|
2021-04-16 20:42:48 +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 |
|
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 |
|
Cat Flynn
|
9b150815d5
|
Merge branch 'feature/menus' into 'main'
made descriptions populate from loc file
See merge request kernel-panic/revival!70
|
2021-04-16 16:34:10 +00:00 |
 cyndrdev
|
338868d041
|
Merge branch 'main' into feature/menus
|
2021-04-16 16:39:06 +01:00 |
|
cyndrdev
|
28ac0b38cf
|
added written artefact description
|
2021-04-16 16:36:49 +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 |
|
Cinder Foster-Smith
|
e541746656
|
Merge branch '95-freeze-sequence' into 'main'
Resolve "level design: freeze sequence"
Closes #95
See merge request kernel-panic/revival!67
|
2021-04-16 14:24:46 +00:00 |
|
Cat Flynn
|
1d00bffd70
|
update freeze input actions
|
2021-04-16 15:12:30 +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
|
3bc0b48c74
|
Merge branch 'main' into 95-freeze-sequence
|
2021-04-16 14:23:37 +01:00 |
|
Cat Flynn
|
1ef827968c
|
Merge branch 'feature/audio-integration' into 'main'
added new dialogue for freeze
See merge request kernel-panic/revival!68
|
2021-04-16 13:21:29 +00:00 |
|
Cat Flynn
|
e75681c0b3
|
Merge branch 'main' into 95-freeze-sequence
|
2021-04-16 14:18:35 +01:00 |
|
Cat Flynn
|
6cb0d90ee8
|
remove random walkway intersecting level
|
2021-04-16 14:18:19 +01:00 |
|
Cat Flynn
|
024653a354
|
freeze artefact
|
2021-04-16 14:17:41 +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
|
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
|
e9bcb45b41
|
fixed bug #127
|
2021-04-16 13:15:54 +01:00 |
|
Cinder Foster-Smith
|
b40db21891
|
Merge branch 'feature/boost-level-integration' into 'main'
integrate boost level design
Closes #122
See merge request kernel-panic/revival!65
|
2021-04-16 11:37:25 +00: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 |
|
Cinder Foster-Smith
|
f228c1a8ea
|
Merge branch 'fix/camera' into 'main'
Fix/camera
Closes #128
See merge request kernel-panic/revival!66
|
2021-04-16 10:36:03 +00: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 |
|
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 |