 Cat Flynn
|
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 |
 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 |
|
Programmer-DField
|
baad3163e6
|
Made changes as per code review.
|
2021-03-12 11:52:56 +00:00 |
|
cyndrdev
|
ba3d232088
|
made button bois pretty
|
2021-03-12 00:39:08 +00:00 |
|
Cat Flynn
|
e1b5fc214a
|
Merge branch 'main' into feature/dialogue-inject-prompts
|
2021-03-11 20:44:31 +00:00 |
|
Cat Flynn
|
7d5c493bcd
|
inject input prompt sprites into dialogue
|
2021-03-11 20:25:16 +00:00 |
|
cyndrdev
|
ecd6bab441
|
juiced artefact unlock screen
|
2021-03-11 19:34:32 +00:00 |
|
cyndrdev
|
720d3cc325
|
artefact preview
|
2021-03-11 15:50:19 +00:00 |
|
cyndrdev
|
4883623740
|
made artefact preview work
|
2021-03-11 13:31:35 +00:00 |
|
cyndrdev
|
43f5a68d45
|
artefact ui overhaul
|
2021-03-11 13:12:19 +00:00 |
|
cyndrdev
|
a76d00efa9
|
fixed scaling issues
|
2021-03-11 12:15:05 +00:00 |
|
cyndrdev
|
a28207bbcd
|
added fade boi
|
2021-03-11 12:02:34 +00:00 |
|
cyndrdev
|
9c4a16ec55
|
dialogue juice
|
2021-03-11 11:48:17 +00:00 |
|
Cat Flynn
|
d5de30107f
|
reset falling floor trap position on player respawn
|
2021-03-10 18:26:33 +00:00 |
|
Cat Flynn
|
762bbf6486
|
wip
|
2021-03-10 17:41:09 +00:00 |
|
cyndrdev
|
4c689e0561
|
minor bugfixes
|
2021-03-09 14:24:31 +00:00 |
|
cyndrdev
|
faa05ad1a8
|
final pretties
|
2021-03-08 17:18:43 +00:00 |
|
cyndrdev
|
24be02e384
|
made stuff look good
|
2021-03-08 17:05:33 +00:00 |
|
cyndrdev
|
1d06cf5fb4
|
backend for playerpref audio
|
2021-03-08 15:13:19 +00:00 |
|
Cat Flynn
|
4d971c8170
|
Merge branch 'main' into Animation_IdletoWalkLocoMotion
|
2021-03-05 18:01:07 +00:00 |
|
Cat Flynn
|
143b3c2a7e
|
update player prefab
|
2021-03-05 18:00:50 +00:00 |
|
Cat Flynn
|
ec8648b67c
|
Merge branch 'main' into feature/falling-floor-trap-integration
|
2021-03-05 16:36:03 +00:00 |
|
Cat Flynn
|
43a01934bc
|
update trap prefab
|
2021-03-05 16:32:21 +00:00 |
|
Cat Flynn
|
e016e2b122
|
clean up trap floor prefab
|
2021-03-05 16:24:50 +00:00 |
|
Cat Flynn
|
687762b59e
|
Merge branch 'feature/menus' into 'main'
Feature/menus
See merge request kernel-panic/revival!31
|
2021-03-05 15:45:02 +00:00 |
|
cyndrdev
|
a5b2f863fe
|
finalised main menu
|
2021-03-05 15:29:20 +00:00 |
|
cyndrdev
|
69e68e4879
|
Merge branch 'main' into feature/menus
|
2021-03-05 14:16:58 +00:00 |
|
cyndrdev
|
98a9003556
|
Merge branch 'main' into Traps
|
2021-03-05 12:06:35 +00:00 |
|
Cat Flynn
|
427ca62821
|
place artefacts and add dialogue triggers
|
2021-03-04 18:53:12 +00:00 |
|
Cat Flynn
|
fe1e69fa94
|
add safe and kill planes
|
2021-03-04 16:55:29 +00:00 |
|
Cat Flynn
|
0290806bbc
|
use SO-based references for respawn position and events
|
2021-03-03 12:53:52 +00:00 |
|
cyndrdev
|
1e8710a926
|
Merge branch 'main' into CineCamera
|
2021-03-02 19:05:19 +00:00 |
|
cyndrdev
|
7551e3434e
|
added player glue prefab
|
2021-03-02 19:04:38 +00:00 |
|
cyndrdev
|
f90267dedf
|
added cameras into seperate prefab
|
2021-03-02 18:59:04 +00:00 |
|
cyndrdev
|
ef203777ae
|
Merge branch 'main' into CineCamera
|
2021-03-02 18:44:31 +00:00 |
|
Cinder Foster-Smith
|
83b313dc8d
|
Merge branch 'feature/scripted-dialogue-triggers' into 'main'
add prefab for scripted dialogue trigger zone
See merge request kernel-panic/revival!20
|
2021-03-02 18:37:56 +00:00 |
|
cyndrdev
|
1d8eff8015
|
fixed camera rotation issues'
|
2021-03-02 18:28:13 +00:00 |
|
Cat Flynn
|
0281749075
|
Merge branch 'main' into artefactUI
|
2021-03-02 18:20:23 +00:00 |
|
Cat Flynn
|
cc28ee3c2f
|
add prefab for scripted dialogue trigger zone
|
2021-03-02 13:24:18 +00:00 |
|
Programmer-DField
|
169c2a4477
|
Now have a work around for the camera.
|
2021-03-01 18:03:30 +00:00 |
|
cyndrdev
|
f2cf6256c1
|
menu WIP
|
2021-03-01 17:57:41 +00:00 |
|
Cat Flynn
|
14a4d3c1b8
|
Merge branch 'main' into feature/artefact-dialogue
|
2021-03-01 16:18:24 +00:00 |
|
Programmer-DField
|
078e356810
|
The respawwn system is now ppicking up the position of the player correctly. However, still not sending the player to the last known respawn point.
|
2021-02-26 17:08:41 +00:00 |
|
Programmer-DField
|
3ef56e2bc1
|
Added a shader with dissolve effect. Ckleaned up use of tags now using compare.tag which is more efficient. The spike trap is now functionally working however, ppolish does need to be applied to the final outcome.
|
2021-02-26 14:50:30 +00:00 |
|
Novvator
|
a8d79c2b10
|
Changes in Artefact inheritance
|
2021-02-25 20:12:08 +00:00 |
|
Novvator
|
7e06b98577
|
Added Artefact inheritance
PowerArtefacts now can unlock PlayerPowers
|
2021-02-25 14:21:35 +00:00 |
|
Programmer-DField
|
83cd280778
|
Working to get the trap system working. Added a prototype for the spike trap. Need to work on the code to get the floor to fall away under the player.
|
2021-02-24 23:41:33 +00:00 |
|
Cat Flynn
|
e47f04fb79
|
trigger dialogue on artefact pickup
|
2021-02-23 13:05:42 +00:00 |
|
Cat Flynn
|
c66bf6f1f1
|
replicate main scene setup in dialogue dev scene
|
2021-02-23 09:58:49 +00:00 |
|
Cinder Foster-Smith
|
8a96a44a64
|
Merge branch 'feature/dialogue-frontend' into 'main'
Feature/dialogue frontend
See merge request kernel-panic/revival!10
|
2021-02-22 17:13:47 +00:00 |
|
cyndrdev
|
6f8ed8ee6d
|
power tweaks, scene & prefab fixes
|
2021-02-22 17:11:15 +00:00 |
|
Cat Flynn
|
60634152d3
|
play audio via FMOD using key from dialogue database
|
2021-02-22 15:29:17 +00:00 |
|
Cat Flynn
|
1fe3bbd79d
|
Merge branch 'main' into artefacts_list
|
2021-02-22 09:01:33 +00:00 |
|
Novvator
|
4397ec0326
|
Changed Artefact and ArtefactInventory to Scriptable objects
Added artefact prefab
|
2021-02-19 15:14:14 +00:00 |
|
Cinder Foster-Smith
|
96860632ff
|
Feature/character controller
|
2021-02-15 18:09:32 +00:00 |
|
cyndrdev
|
7a25b61f90
|
fixed ci issue
|
2021-02-12 14:12:26 +00:00 |