Commit Graph

109 Commits

Author SHA1 Message Date
Cat Flynn f28e4e27fa bump wait time in build 2021-03-02 18:44:59 +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
Cat Flynn 3690668097 Merge branch 'artefactUI' into 'main'
Artefact UI

See merge request kernel-panic/revival!21
2021-03-02 18:35:16 +00:00
Cat Flynn bdbbaa32a8 trigger dialogue after artefact ui is dismissed 2021-03-02 18:27:56 +00:00
Cat Flynn 0281749075 Merge branch 'main' into artefactUI 2021-03-02 18:20:23 +00:00
Novvator e79053ebb5 bug fix in InputSettings UpdateMode 2021-03-02 17:50:27 +00:00
Novvator f58f89a9ee fixed bug when timeScale = 0 2021-03-02 17:10:12 +00:00
Novvator af34631ed8 artefactUI now works 2021-03-02 16:33:31 +00:00
Cat Flynn cc28ee3c2f add prefab for scripted dialogue trigger zone 2021-03-02 13:24:18 +00:00
Novvator 81ef58415a artefactUI test 2021-03-01 18:09:21 +00:00
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 bc22b55334 Merge branch 'feature/artefact-dialogue' into 'main'
Feature/artefact dialogue

See merge request kernel-panic/revival!11
2021-03-01 16:56:19 +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 4a504f2d7f Merge branch 'artefact_inheritance' into 'main'
Added Artefact inheritance

See merge request kernel-panic/revival!13
2021-02-26 17:32:37 +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
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
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 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
Novvator 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
Novvator 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