|
|
c96036b304
|
Merge branch 'main' into feature/boost-level-integration
|
2021-04-16 12:26:47 +01:00 |
|
|
|
13ca75f3d3
|
applied cam changes to prefab
|
2021-04-16 12:17:15 +01:00 |
|
|
|
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 |
|
|
|
77ce74c45a
|
matrginally improve courtyard collision geometry
|
2021-04-15 19:36:53 +01:00 |
|
|
|
5cdd4e376f
|
improve camera controls
|
2021-04-15 19:32:09 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
abde0ea9af
|
Merge branch '97-rolling-boulders-freeze' into 'main'
rolling boulders now obey to freeze
Closes #97
See merge request kernel-panic/revival!62
|
2021-04-13 15:03:47 +00:00 |
|
|
|
3646aa5825
|
Merge branch '98-arrow-wall-freeze' into 'main'
Resolve "freeze: arrow wall"
Closes #98
See merge request kernel-panic/revival!63
|
2021-04-13 14:56:02 +00:00 |
|
|
|
db7c86e790
|
Merge branch 'main' into 97-rolling-boulders-freeze
|
2021-04-13 15:52:02 +01:00 |
|
|
|
8ef7a1d88b
|
Merge branch 'main' into 98-arrow-wall-freeze
|
2021-04-13 15:46:22 +01:00 |
|
|
|
07c89104f9
|
fixed time freeze not working
|
2021-04-13 15:33:59 +01:00 |
|
Novvator
|
586fa97d56
|
Added pressure plate and secret door prefab
|
2021-04-11 23:17:49 +01:00 |
|
Novvator
|
75cf0b6b5c
|
applied it to the prefab
|
2021-04-06 15:31:08 +01:00 |
|
Novvator
|
0e96d83445
|
rolling boulders now obey to freeze
|
2021-04-06 15:29:41 +01:00 |
|
Novvator
|
203b2e9c82
|
arrow wall obeys to the freeze ability
|
2021-04-06 14:25:53 +01:00 |
|
|
|
fffb50a6a2
|
Merge branch 'RollingBoulder' into 'main'
Rolling boulder
See merge request kernel-panic/revival!52
|
2021-03-25 19:19:26 +00:00 |
|
|
|
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 |
|
|
|
1e5022e3e8
|
Merge branch 'main' into RollingBoulder
|
2021-03-25 19:00:32 +00:00 |
|
|
|
6e74da102c
|
minor fixes
|
2021-03-25 19:00:13 +00:00 |
|
|
|
7041d71c6f
|
fix safe zone scale and appearance in builds
|
2021-03-25 17:24:17 +00:00 |
|
|
|
c489c8ef49
|
Merge branch 'feature/menus' into 'main'
ui sounds :)
See merge request kernel-panic/revival!59
|
2021-03-25 17:19:26 +00:00 |
|
|
|
b26abcc081
|
beta time babey
|
2021-03-25 12:20:32 +00:00 |
|
|
|
a841238f56
|
added ui clicks
|
2021-03-25 12:19:44 +00:00 |
|
|
|
368cb90464
|
respawn in middle of safe zone
|
2021-03-25 11:58:40 +00:00 |
|
|
|
07cebb6ea5
|
Merge branch 'feature/boost-puzzle-design' into 'main'
Feature/boost puzzle design
Closes #73
See merge request kernel-panic/revival!55
|
2021-03-25 11:53:06 +00:00 |
|
|
|
242ccb6fcb
|
Merge branch 'main' into feature/menus
|
2021-03-25 11:27:13 +00:00 |
|
|
|
01e8c30439
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-25 11:24:50 +00:00 |
|
|
|
50955a19d0
|
Merge branch 'main' into RollingBoulder
|
2021-03-25 11:15:17 +00:00 |
|
|
|
e2a4d6dd45
|
fix compile errors
|
2021-03-25 10:51:22 +00:00 |
|
|
|
4b5124e8ba
|
Merge branch 'feature/chain-platforms' into 'main'
implement falling platform chain
Closes #116
See merge request kernel-panic/revival!57
|
2021-03-25 10:47:00 +00:00 |
|
|
|
94959bcb71
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-25 10:43:47 +00:00 |
|
|
|
122d0e1ff3
|
implement falling platform chain
|
2021-03-24 16:54:34 +00:00 |
|
Novvator
|
fa579d5ce3
|
added the 3 freeze levels - need rolling boulder and door lever
|
2021-03-24 15:27:38 +00:00 |
|
|
|
cfa6ac4027
|
Merge branch '14-power_freeze' into 'main'
Resolve "glove: freeze"
See merge request kernel-panic/revival!47
|
2021-03-24 12:54:04 +00:00 |
|
|
|
1611962ae9
|
messy messy merge >n<
|
2021-03-24 12:45:19 +00:00 |
|
|
|
ff9735c016
|
Merge branch 'feature/music' into 'main'
i added music triggers
Closes #85
See merge request kernel-panic/revival!56
|
2021-03-24 12:06:45 +00:00 |
|
|
|
317a1ea53b
|
settings tweaked
|
2021-03-24 11:52:01 +00:00 |
|
|
|
9bcde1e028
|
added music triggers
|
2021-03-24 11:50:07 +00:00 |
|
|
|
7d786ecdf6
|
added parameter driven audio
|
2021-03-24 11:25:57 +00:00 |
|
|
|
4fe8d7d18c
|
added parameter driven audio
|
2021-03-24 11:24:23 +00:00 |
|
