|
|
de3cfe7449
|
tweaked VO settings
|
2021-03-05 17:17:58 +00:00 |
|
|
|
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 |
|
|
|
6a1a99d59b
|
Merge branch 'main' into feature/audio-integration
|
2021-03-05 13:42:27 +00:00 |
|
|
|
377a13fb4c
|
meta shenanigans
|
2021-03-05 13:42:06 +00:00 |
|
|
|
f20fe247a7
|
added VO FMOD events
|
2021-03-05 13:34:45 +00:00 |
|
|
|
6100035289
|
banks weren't tracked?
|
2021-03-05 13:26:45 +00:00 |
|
|
|
1aee232cb6
|
artefact registration, register event listeners after awake event
|
2021-03-05 13:26:15 +00:00 |
|
|
|
b164558076
|
added temporary VO lines
|
2021-03-05 13:02:07 +00:00 |
|
|
|
b64e4e30af
|
update fmod meta file apparently
|
2021-03-05 12:52:40 +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 |
|
|
|
d8b2e1e977
|
added events & banks for new audio
|
2021-03-04 15:40:32 +00:00 |
|
|
|
363ae1cb58
|
added cai's WIP music track
|
2021-03-04 15:05:39 +00:00 |
|
|
|
695440e978
|
added cai's audio stuff
|
2021-03-04 14:52:46 +00:00 |
|
CharlieTinley
|
45ec2145ef
|
minor bug fixes
|
2021-03-03 21:36:35 +00:00 |
|
|
|
e772598beb
|
add level geometry to main scene
|
2021-03-03 20:29:55 +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 |
|
|
|
84c67b7f11
|
Merge branch 'Feature/TrimSheet' into 'main'
ALPHA LEVEL
See merge request kernel-panic/revival!24
|
2021-03-02 21:07:43 +00:00 |
|
Programmer-DField
|
be850a3795
|
Changes made as per code review.
|
2021-03-02 19:47:28 +00:00 |
|
CharlieTinley
|
88fd38453b
|
Created the ALPHA level with collisions on geometry
|
2021-03-02 19:33:54 +00:00 |
|
|
|
ad40b0195e
|
made main use new cameras
|
2021-03-02 19:06:17 +00:00 |
|
|
|
1e8710a926
|
Merge branch 'main' into CineCamera
|
2021-03-02 19:05:19 +00:00 |
|
|
|
7551e3434e
|
added player glue prefab
|
2021-03-02 19:04:38 +00:00 |
|
|
|
f90267dedf
|
added cameras into seperate prefab
|
2021-03-02 18:59:04 +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 |
|
Programmer-DField
|
7fee30a4bd
|
No drastic changes. Just demo shown to the team.
|
2021-03-01 18:33:28 +00:00 |
|
Programmer-DField
|
0e6d9f2a8b
|
See below
|
2021-03-01 18:10:11 +00:00 |
|
Novvator
|
81ef58415a
|
artefactUI test
|
2021-03-01 18:09:21 +00:00 |
|
Programmer-DField
|
40075087aa
|
As before
|
2021-03-01 18:03:57 +00:00 |
|
Programmer-DField
|
169c2a4477
|
Now have a work around for the camera.
|
2021-03-01 18:03:30 +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 |
|
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 |
|
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 |
|
