Commit Graph

24 Commits

Author SHA1 Message Date
Cat Flynn baf850d5f8 Merge branch 'Feature/TrimSheet' into 'main'
Added the trim sheet to Engine with its meshes, Set up some basic lighting...

See merge request kernel-panic/revival!16
2021-03-01 17:54:13 +00:00
Cat Flynn 14a4d3c1b8 Merge branch 'main' into feature/artefact-dialogue 2021-03-01 16:18:24 +00:00
CharlieTinley 895fe53fdd Added the trim sheet to Engine wiht its meshes, Set up some basic lighting pass, Built some of the world 2021-02-26 18:40:13 +00:00
Cat Flynn 51f32cc70f Merge branch 'main' into artefact_inheritance 2021-02-26 17:17:42 +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
CharlieTinley 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
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 5d79c1b637 begin dialogue frontend implementation, placeholder dialogue ui 2021-02-19 16:33:02 +00:00
Cat Flynn 618dab1052 Merge branch 'main' into Checkpoints 2021-02-15 18:58:35 +00:00
Cinder Foster-Smith 96860632ff Feature/character controller 2021-02-15 18:09:32 +00:00
Programmer-DField 079fa914a2 Updated animations. Disabled player controller during death. Generally cleaned code. 2021-02-15 16:23:29 +00:00
Programmer-DField 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
Programmer-DField 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
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
cyndrdev a4906a35d4 gameflow 2021-02-12 09:32:10 +00:00
CharlieTinley e790ef7493 Created small block out of the level for the programmers to test the mechanics 2021-02-09 15:48:42 +00:00
cyndrdev 7fefaae405 basic camera controller 2021-01-27 12:06:17 +00:00
cyndrdev ab7cd608cb basic player controller and input handling 2021-01-27 11:27:56 +00:00
Cat Flynn bd5bc825d3 initial commit 2021-01-25 19:44:17 +00:00