 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 |