Cat Flynn
|
5cdd4e376f
|
improve camera controls
|
2021-04-15 19:32:09 +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 |
Cat Flynn
|
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 |
Cat Flynn
|
db7c86e790
|
Merge branch 'main' into 97-rolling-boulders-freeze
|
2021-04-13 15:52:02 +01:00 |
Cat Flynn
|
8ef7a1d88b
|
Merge branch 'main' into 98-arrow-wall-freeze
|
2021-04-13 15:46:22 +01:00 |
cyndrdev
|
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 |
Cinder Foster-Smith
|
fffb50a6a2
|
Merge branch 'RollingBoulder' into 'main'
Rolling boulder
See merge request kernel-panic/revival!52
|
2021-03-25 19:19:26 +00:00 |
Cinder Foster-Smith
|
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 |
cyndrdev
|
1e5022e3e8
|
Merge branch 'main' into RollingBoulder
|
2021-03-25 19:00:32 +00:00 |
cyndrdev
|
6e74da102c
|
minor fixes
|
2021-03-25 19:00:13 +00:00 |
Cat Flynn
|
7041d71c6f
|
fix safe zone scale and appearance in builds
|
2021-03-25 17:24:17 +00:00 |
Cat Flynn
|
c489c8ef49
|
Merge branch 'feature/menus' into 'main'
ui sounds :)
See merge request kernel-panic/revival!59
|
2021-03-25 17:19:26 +00:00 |
cyndrdev
|
a841238f56
|
added ui clicks
|
2021-03-25 12:19:44 +00:00 |
Cat Flynn
|
01e8c30439
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-25 11:24:50 +00:00 |
cyndrdev
|
50955a19d0
|
Merge branch 'main' into RollingBoulder
|
2021-03-25 11:15:17 +00:00 |
Cat Flynn
|
94959bcb71
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-25 10:43:47 +00:00 |
Cat Flynn
|
122d0e1ff3
|
implement falling platform chain
|
2021-03-24 16:54:34 +00:00 |
Cinder Foster-Smith
|
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 |
cyndrdev
|
1611962ae9
|
messy messy merge >n<
|
2021-03-24 12:45:19 +00:00 |
cyndrdev
|
317a1ea53b
|
settings tweaked
|
2021-03-24 11:52:01 +00:00 |
cyndrdev
|
9bcde1e028
|
added music triggers
|
2021-03-24 11:50:07 +00:00 |
Cat Flynn
|
a83cad4a2a
|
create 3rd boost puzzle
|
2021-03-23 15:03:18 +00:00 |
cyndrdev
|
733e3f0b59
|
commited player w/ cheats enabled oopsie
|
2021-03-23 11:52:33 +00:00 |
cyndrdev
|
da33cc4a4a
|
updated animation controller, got new anims in-game
|
2021-03-23 11:48:43 +00:00 |
Cat Flynn
|
927a1b9dd7
|
create killbox prefab
|
2021-03-22 16:45:42 +00:00 |
Cat Flynn
|
0fdc569380
|
Merge branch 'main' into feature/boost-puzzle-design
|
2021-03-22 15:59:28 +00:00 |
Cat Flynn
|
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
|
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 |
Cat Flynn
|
9037fd264c
|
animation and audio event on falling platforms
|
2021-03-17 18:31:33 +00:00 |
Cat Flynn
|
292ca65bb2
|
respawn fallaway floor after a few seconds in the safe zone
|
2021-03-17 18:04:31 +00:00 |
Cat Flynn
|
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 |
cyndrdev
|
b5a3054b5f
|
fixed weird subtitle issues
|
2021-03-15 17:15:18 +00:00 |
Cinder Foster-Smith
|
ed9be08db3
|
Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass
See merge request kernel-panic/revival!49
|
2021-03-15 16:51:40 +00:00 |
cyndrdev
|
0712af572f
|
Merge branch 'main' into Camera2ndPass
|
2021-03-15 16:36:48 +00:00 |
cyndrdev
|
b57ee3dcb1
|
applied changes to prefabs
|
2021-03-15 16:35:38 +00:00 |
cyndrdev
|
9f352f6ffe
|
Merge branch 'main' into feature/inject-prompt-artefact-ui
|
2021-03-15 16:23:04 +00:00 |
cyndrdev
|
a6a8f0ee2d
|
fixed dialogue font
|
2021-03-15 16:21:40 +00:00 |
Cinder Foster-Smith
|
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 |
Programmer-DField
|
b724107be4
|
Added the cursor script to the camera prefab. One problem is that the cursor needs to be visible and contained to the window in the artifiact screen. Will catch up with Cinder about this.
|
2021-03-15 12:52:43 +00:00 |
Cat Flynn
|
b8a2e67a33
|
platform-specific input prompt above nearby artefacts
|
2021-03-12 18:29:36 +00:00 |
Cat Flynn
|
a9dfbbc99d
|
Merge branch 'main' into ArrowWall
|
2021-03-12 17:41:34 +00:00 |
Cat Flynn
|
3c4f28844f
|
basic world space artefact interaction prompt
|
2021-03-12 17:15:27 +00:00 |
Cat Flynn
|
6baf92ea9a
|
add spline walkway prefab
|
2021-03-12 15:38:23 +00:00 |