|
|
4d971c8170
|
Merge branch 'main' into Animation_IdletoWalkLocoMotion
|
2021-03-05 18:01:07 +00:00 |
|
|
|
143b3c2a7e
|
update player prefab
|
2021-03-05 18:00:50 +00:00 |
|
|
|
dba218cc7e
|
delete script
|
2021-03-05 17:50:10 +00:00 |
|
LojZa33
|
e81cab42e0
|
no message
|
2021-03-05 18:44:27 +01:00 |
|
|
|
ec8648b67c
|
Merge branch 'main' into feature/falling-floor-trap-integration
|
2021-03-05 16:36:03 +00:00 |
|
|
|
43a01934bc
|
update trap prefab
|
2021-03-05 16:32:21 +00:00 |
|
|
|
e016e2b122
|
clean up trap floor prefab
|
2021-03-05 16:24:50 +00:00 |
|
|
|
154d809540
|
Merge branch 'feature/audio-integration' into 'main'
Feature/audio integration
Closes #56
See merge request kernel-panic/revival!32
|
2021-03-05 15:48:36 +00:00 |
|
|
|
687762b59e
|
Merge branch 'feature/menus' into 'main'
Feature/menus
See merge request kernel-panic/revival!31
|
2021-03-05 15:45:02 +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 |
|
|
|
a5b2f863fe
|
finalised main menu
|
2021-03-05 15:29:20 +00:00 |
|
|
|
69e68e4879
|
Merge branch 'main' into feature/menus
|
2021-03-05 14:16:58 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a2003fa4a0
|
Merge branch 'main' into Anims_Idle+Walk
|
2021-03-05 11:32:43 +00:00 |
|
LojZa33
|
e0a80e3103
|
Animations Idle Walk(to be fixed)
|
2021-03-04 23:11:28 +01: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 |
|
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 |
|
