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
a8d79c2b10
Changes in Artefact inheritance
2021-02-25 20:12:08 +00:00
7e06b98577
Added Artefact inheritance
...
PowerArtefacts now can unlock PlayerPowers
2021-02-25 14:21:35 +00:00
1f4c063c60
Updated the FallingFloor script. The floor now begins to lower, waits for a set period and then is destroyed. I plan to add a disssolve effect to make this transition look better. The player begins to slowly fall with the floor until the object is destroyed at which point the player falls with gravity hitting the sspike trap and "dying".
2021-02-25 00:51:11 +00:00
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
c540e2c7cb
Merge branch '33-trap-pitfall-art' into 'main'
...
Trap/SpikePit
Closes #33
See merge request kernel-panic/revival!12
2021-02-24 15:40:31 +00:00
Cat Flynn
f2a9cf4229
Merge branch 'main' into 33-trap-pitfall-art
2021-02-24 15:33:47 +00:00
cbb5825c20
Added SpikePit trap with the associated textures. Also did a small lighting change: added fog, some post processing effects etc
2021-02-24 15:21:44 +00:00
cyndrdev
cb279d7135
added menu font
2021-02-24 12:55:09 +00:00
Cat Flynn
e47f04fb79
trigger dialogue on artefact pickup
2021-02-23 13:05:42 +00:00
Cat Flynn
35d652bb95
unregister event on disable
2021-02-23 12:54:51 +00:00
Cat Flynn
c66bf6f1f1
replicate main scene setup in dialogue dev scene
2021-02-23 09:58:49 +00:00
Cat Flynn
d945aea322
add game event scriptable object
2021-02-23 09:52:04 +00:00
Cat Flynn
9ef1d12a40
ignore FMOD cache
2021-02-23 09:27:10 +00:00
Cat Flynn
5076b2b344
dont ignore banks lol
2021-02-22 17:55:00 +00:00
Cat Flynn
6b659a25c9
relative path to fmod project
2021-02-22 17:46:36 +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
d0cfd38119
add fmod project to repository
2021-02-22 15:28:31 +00:00
Cat Flynn
2fd0138e9d
add .ogg to LFS formats
2021-02-22 15:26:53 +00:00
Cinder Foster-Smith
0839767d25
Merge branch 'feature/checkpoints' into 'main'
...
Checkpoints
See merge request kernel-panic/revival!9
2021-02-22 15:26:00 +00:00
Cat Flynn
f8f037203c
import fmod plugin
2021-02-22 15:25:38 +00:00
Cat Flynn
955972e4a3
Merge branch 'main' into feature/dialogue-frontend
2021-02-22 10:33:36 +00:00
Cat Flynn
dace2961ee
Merge branch 'artefacts_list' into 'main'
...
Added Artefacts - Artefact Inventory (tracking system)
See merge request kernel-panic/revival!8
2021-02-22 09:07:46 +00:00
Cat Flynn
1fe3bbd79d
Merge branch 'main' into artefacts_list
2021-02-22 09:01:33 +00:00
f5cc5a4f14
Added nearbyArtefactID SerialInt
2021-02-19 20:38:45 +00:00
Cat Flynn
5d79c1b637
begin dialogue frontend implementation, placeholder dialogue ui
2021-02-19 16:33:02 +00:00
Cat Flynn
ddce06585f
use custom .data instead of raw csv file in dialogue db
2021-02-19 16:26:15 +00:00
4397ec0326
Changed Artefact and ArtefactInventory to Scriptable objects
...
Added artefact prefab
2021-02-19 15:14:14 +00:00
Cat Flynn
f1c9f8a752
fix error spam in edit mode
2021-02-18 17:24:15 +00:00
Cat Flynn
28b8b860d1
make log readable
2021-02-15 23:26:42 +00:00
Cat Flynn
9eea5cd4d5
add log that should have been there in the first place
2021-02-15 23:11:29 +00:00
Cat Flynn
618dab1052
Merge branch 'main' into Checkpoints
2021-02-15 18:58:35 +00:00
Cat Flynn
4013f6ef0c
Merge branch 'feature/character-controller' into 'main'
...
Feature/character controller
See merge request kernel-panic/revival!4
2021-02-15 18:09:32 +00:00
Cinder Foster-Smith
96860632ff
Feature/character controller
2021-02-15 18:09:32 +00:00
Cinder Foster-Smith
8388f7fd3e
Merge branch 'fix/early-ci-timeout' into 'main'
...
Fix/early ci timeout
See merge request kernel-panic/revival!6
2021-02-15 17:12:44 +00:00
Cat Flynn
6717be82f9
Fix/early ci timeout
2021-02-15 17:12:44 +00:00
079fa914a2
Updated animations. Disabled player controller during death. Generally cleaned code.
2021-02-15 16:23:29 +00:00
Cat Flynn
baefee4a00
Merge branch 'feature/import-dialogue' into 'main'
...
Feature/import dialogue
See merge request kernel-panic/revival!5
2021-02-15 13:42:14 +00:00
Cat Flynn
4e76ea2168
Feature/import dialogue
2021-02-15 13:42:14 +00:00
adb0c9e673
Added the Respawn Manager which allows for the use of multiple safe zones. Cleeaned up the code and made more efficient.
2021-02-15 13:14:42 +00:00
3b9e31a4b3
Added a safezone that reports the position of the player whenever they are within the area.
...
Added a deathzone that plays a death animation on trigger, fades the screen, respawns the player at the last known safe position and the fades the screen back in.
Added scripts for safezone and deathzone.
Added some make do animations and animators.
Added some materials for testing purposes.
2021-02-15 09:44:04 +00:00
7ff4569fde
Added Artefacts - Artefact Inventory (tracking system)
2021-02-14 15:08:59 +00:00
Cat Flynn
0642edc772
Merge branch 'feature/flow' into 'main'
...
Game Flow
See merge request kernel-panic/revival!3
2021-02-12 14:18:50 +00:00
cyndrdev
7a25b61f90
fixed ci issue
2021-02-12 14:12:26 +00:00
cyndrdev
95f04ad618
Merge branch 'feature/flow' of https://gitlab.badbrain.dev/kernel-panic/game into feature/flow
2021-02-12 14:05:16 +00:00
cyndrdev
7c769a2371
changes from code review
2021-02-12 14:04:12 +00:00
Cat Flynn
4424659082
Merge branch 'main' into feature/flow
2021-02-12 10:36:41 +00:00
cyndrdev
d62f3a7b6b
debug text visibility
2021-02-12 09:35:59 +00:00
Programmer-DField
Novvator
Cat Flynn
CharlieTinley
cyndrdev