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
Novvator
81ef58415a
artefactUI test
2021-03-01 18:09:21 +00:00
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
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
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
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
e47f04fb79
trigger dialogue on artefact pickup
2021-02-23 13:05:42 +00:00
35d652bb95
unregister event on disable
2021-02-23 12:54:51 +00:00
c66bf6f1f1
replicate main scene setup in dialogue dev scene
2021-02-23 09:58:49 +00:00
d945aea322
add game event scriptable object
2021-02-23 09:52:04 +00:00
9ef1d12a40
ignore FMOD cache
2021-02-23 09:27:10 +00:00
6b659a25c9
relative path to fmod project
2021-02-22 17:46:36 +00:00
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
6f8ed8ee6d
power tweaks, scene & prefab fixes
2021-02-22 17:11:15 +00:00
60634152d3
play audio via FMOD using key from dialogue database
2021-02-22 15:29:17 +00:00
0839767d25
Merge branch 'feature/checkpoints' into 'main'
...
Checkpoints
See merge request kernel-panic/revival!9
2021-02-22 15:26:00 +00:00
f8f037203c
import fmod plugin
2021-02-22 15:25:38 +00:00
955972e4a3
Merge branch 'main' into feature/dialogue-frontend
2021-02-22 10:33:36 +00:00
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
5d79c1b637
begin dialogue frontend implementation, placeholder dialogue ui
2021-02-19 16:33:02 +00:00
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
f1c9f8a752
fix error spam in edit mode
2021-02-18 17:24:15 +00:00
28b8b860d1
make log readable
2021-02-15 23:26:42 +00:00
9eea5cd4d5
add log that should have been there in the first place
2021-02-15 23:11:29 +00:00
618dab1052
Merge branch 'main' into Checkpoints
2021-02-15 18:58:35 +00:00
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
4e76ea2168
Feature/import dialogue
2021-02-15 13:42:14 +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
Novvator
7ff4569fde
Added Artefacts - Artefact Inventory (tracking system)
2021-02-14 15:08:59 +00:00
7a25b61f90
fixed ci issue
2021-02-12 14:12:26 +00:00
95f04ad618
Merge branch 'feature/flow' of https://gitlab.badbrain.dev/kernel-panic/game into feature/flow
2021-02-12 14:05:16 +00:00
7c769a2371
changes from code review
2021-02-12 14:04:12 +00:00
4424659082
Merge branch 'main' into feature/flow
2021-02-12 10:36:41 +00:00
d62f3a7b6b
debug text visibility
2021-02-12 09:35:59 +00:00
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
e681a3f306
properly tail log and check build result
2021-02-01 18:00:00 +00:00
7fefaae405
basic camera controller
2021-01-27 12:06:17 +00:00
ab7cd608cb
basic player controller and input handling
2021-01-27 11:27:56 +00:00
