|
|
afdf5ce87b
|
Merge branch 'main' into feature/audio-integration
|
2021-03-05 15:39:03 +00:00 |
|
|
|
f5262cda2c
|
implement vo lines via programmer instrument lol
|
2021-03-05 15:34:52 +00:00 |
|
|
|
87e5249578
|
tried to fix FMOD dialogue issue
|
2021-03-05 14:11:16 +00:00 |
|
|
|
1aee232cb6
|
artefact registration, register event listeners after awake event
|
2021-03-05 13:26:15 +00:00 |
|
|
|
27e512a780
|
delete unused script
|
2021-03-05 12:49:44 +00:00 |
|
|
|
98a9003556
|
Merge branch 'main' into Traps
|
2021-03-05 12:06:35 +00:00 |
|
|
|
427ca62821
|
place artefacts and add dialogue triggers
|
2021-03-04 18:53:12 +00:00 |
|
|
|
fe1e69fa94
|
add safe and kill planes
|
2021-03-04 16:55:29 +00:00 |
|
Novvator
|
faf6c30b3e
|
small fixes
|
2021-03-03 16:45:09 +00:00 |
|
|
|
0290806bbc
|
use SO-based references for respawn position and events
|
2021-03-03 12:53:52 +00:00 |
|
Programmer-DField
|
be850a3795
|
Changes made as per code review.
|
2021-03-02 19:47:28 +00:00 |
|
|
|
1e8710a926
|
Merge branch 'main' into CineCamera
|
2021-03-02 19:05:19 +00:00 |
|
|
|
ef203777ae
|
Merge branch 'main' into CineCamera
|
2021-03-02 18:44:31 +00:00 |
|
|
|
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 |
|
|
|
1d8eff8015
|
fixed camera rotation issues'
|
2021-03-02 18:28:13 +00:00 |
|
|
|
bdbbaa32a8
|
trigger dialogue after artefact ui is dismissed
|
2021-03-02 18:27:56 +00:00 |
|
|
|
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 |
|
|
|
cc28ee3c2f
|
add prefab for scripted dialogue trigger zone
|
2021-03-02 13:24:18 +00:00 |
|
Programmer-DField
|
368b03f848
|
Camera now has collison detection. As well as main functionality. These are easily edited using the Cinemachine freelook options. The camera is controlled using the Cinemachine input provider and is attached to the current look controls.
|
2021-03-01 23:26:35 +00:00 |
|
Novvator
|
81ef58415a
|
artefactUI test
|
2021-03-01 18:09:21 +00:00 |
|
Programmer-DField
|
169c2a4477
|
Now have a work around for the camera.
|
2021-03-01 18:03:30 +00:00 |
|
|
|
14a4d3c1b8
|
Merge branch 'main' into feature/artefact-dialogue
|
2021-03-01 16:18:24 +00:00 |
|
Programmer-DField
|
a46f4ddb74
|
Have solved the problem where the camera seemed to be setting the player as dead. The script now checks to see if the collison was with player and only acts if true.
|
2021-03-01 16:04:17 +00:00 |
|
Programmer-DField
|
4bead84e56
|
Added the falling rocks trap. The player can now trigger the rocks to fall and the death and respawn script will run when a collision is detected. Need to look at an issue where the collision is detected even when the player is not hit. Possibly the camera?
|
2021-02-28 00:54:20 +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
|
2773c3f954
|
Continued work on getting the respawn system working, merge has broken functionality.
|
2021-02-26 15:02:33 +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 |
|
|
|
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 |
|
|
|
d945aea322
|
add game event scriptable object
|
2021-02-23 09:52:04 +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 |
|
|
|
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 |
|
|
|
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 |
|
