|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
317a1ea53b
|
settings tweaked
|
2021-03-24 11:52:01 +00:00 |
|
|
|
9bcde1e028
|
added music triggers
|
2021-03-24 11:50:07 +00:00 |
|
|
|
832449c01d
|
remove editor namespace lol
|
2021-03-23 15:09:19 +00:00 |
|
|
|
a83cad4a2a
|
create 3rd boost puzzle
|
2021-03-23 15:03:18 +00:00 |
|
|
|
733e3f0b59
|
commited player w/ cheats enabled oopsie
|
2021-03-23 11:52:33 +00:00 |
|
|
|
da33cc4a4a
|
updated animation controller, got new anims in-game
|
2021-03-23 11:48:43 +00:00 |
|
LojZa33
|
9ae930df56
|
Animations
|
2021-03-22 23:34:02 +01:00 |
|
|
|
927a1b9dd7
|
create killbox prefab
|
2021-03-22 16:45:42 +00:00 |
|
|
|
0fdc569380
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-22 15:59:28 +00:00 |
|
|
|
dd1924143f
|
fixed menus not working with keeb / controller
|
2021-03-22 02:20:38 +00:00 |
|
|
|
91be3b97b9
|
redesign arrow wall trap objects
|
2021-03-18 17:25:34 +00:00 |
|
Programmer-DField
|
49d1fc481a
|
Disabled mesh renderer and box collider on target for rolling boulder prefab. Also added the Mover script to the prefab.
|
2021-03-18 12:54:32 +00:00 |
|
Programmer-DField
|
914f7e584b
|
Further cleaning of code in both scripts.
|
2021-03-18 12:48:09 +00:00 |
|
Programmer-DField
|
b0b5c09c54
|
Cleaned up the script so it now works independant of gravity. Added a second Mover script that controls the speed and direction the boulder moves once triggered. Added a target to the prefab as this is the point at which the boulder moves towards.
|
2021-03-18 12:34:08 +00:00 |
|
Programmer-DField
|
1b02a15353
|
Made changes to the RollingBoulder script. The trap now works much more simply. The player enters a trigger and this sets the rigidbody to use gravity setting the boulder on its journey down the ramp. Player death works as with other traps. I need to speak with Cat as he mentioned using physics may not be the best, by this I assume he means gravity, so I need some advice on a different solution.
|
2021-03-17 22:07:33 +00:00 |
|
Programmer-DField
|
f049b97297
|
Added the a RollingBoulder script as well as a boulder (sphere) and ramp (plane). Visual studio decided it wanted to update so saving work at this point.
|
2021-03-17 20:50:08 +00:00 |
|
|
|
af519d2ffe
|
pop-in animation on platform respawn
|
2021-03-17 18:37:56 +00:00 |
|
|
|
9037fd264c
|
animation and audio event on falling platforms
|
2021-03-17 18:31:33 +00:00 |
|
|
|
63ed52fe4a
|
import dotween
|
2021-03-17 18:12:17 +00:00 |
|
|
|
292ca65bb2
|
respawn fallaway floor after a few seconds in the safe zone
|
2021-03-17 18:04:31 +00:00 |
|
|
|
4370729700
|
monochrome emission
|
2021-03-17 15:24:03 +00:00 |
|
|
|
f5ceac5d0d
|
assign textures in orb mat, use specular workflow, assign mat to model
|
2021-03-17 15:20:26 +00:00 |
|
|
|
13438cd751
|
re-import textures and create smoothness map
|
2021-03-17 15:19:00 +00:00 |
|
LojZa33
|
9f25b5f426
|
Orb_MAT
|
2021-03-17 01:00:53 +01:00 |
|
LojZa33
|
27f459f068
|
Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into time-freezing-artefact
|
2021-03-16 20:01:46 +01:00 |
|
|
|
e92ae299d8
|
boost puzzles 1 2 complete 3 wip
|
2021-03-16 16:38:46 +00:00 |
|
Novvator
|
b94d9d7f32
|
changes made as per code review
|
2021-03-16 15:49:54 +00:00 |
|
|
|
eb82f4d95d
|
cursor
|
2021-03-15 18:30:52 +00:00 |
|
|
|
b5a3054b5f
|
fixed weird subtitle issues
|
2021-03-15 17:15:18 +00:00 |
|
|
|
ed9be08db3
|
Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass
See merge request kernel-panic/revival!49
|
2021-03-15 16:51:40 +00:00 |
|
|
|
0712af572f
|
Merge branch 'main' into Camera2ndPass
|
2021-03-15 16:36:48 +00:00 |
|
|
|
b57ee3dcb1
|
applied changes to prefabs
|
2021-03-15 16:35:38 +00:00 |
|
|
|
9f352f6ffe
|
Merge branch 'main' into feature/inject-prompt-artefact-ui
|
2021-03-15 16:23:04 +00:00 |
|
|
|
a6a8f0ee2d
|
fixed dialogue font
|
2021-03-15 16:21:40 +00:00 |
|
|
|
9cedec4d74
|
Merge branch 'feature/path-spline' into 'main'
Feature/path spline
Closes #44
See merge request kernel-panic/revival!45
|
2021-03-15 16:13:41 +00:00 |
|
LojZa33
|
04c462d9a8
|
timefreeze Orb
|
2021-03-15 16:36:01 +01:00 |
|
