|
|
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 |
|
|
|
f31bea874a
|
Merge branch 'bug/artefact-interaction' into 'main'
Bug/artefact interaction
Closes #65
See merge request kernel-panic/revival!30
|
2021-03-05 15:34:08 +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 |
|
|
|
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 |
|
|
|
1978a691d1
|
development build on ci
|
2021-03-05 12:52:28 +00:00 |
|
|
|
27e512a780
|
delete unused script
|
2021-03-05 12:49:44 +00:00 |
|
|
|
5e63fc8154
|
Merge branch 'Traps' into 'main'
Traps
See merge request kernel-panic/revival!19
|
2021-03-05 12:17:25 +00:00 |
|
|
|
98a9003556
|
Merge branch 'main' into Traps
|
2021-03-05 12:06:35 +00:00 |
|
|
|
ba60e1e567
|
Merge branch 'Feature/alpha-level-design' into 'main'
Feature/alpha level design
Closes #54
See merge request kernel-panic/revival!27
|
2021-03-05 12:00:22 +00:00 |
|
|
|
a2003fa4a0
|
Merge branch 'main' into Anims_Idle+Walk
|
2021-03-05 11:32:43 +00:00 |
|
Programmer-DField
|
1a47208d3f
|
Added the Arrow wall functionality. The arrow will fire in a specified direction at a specified speed. The arrow will destory itself on contact with the player immediately and after a specified time when colliding with any other game object (to give the effect the arrow is stuck in the wall). If the arrow collides with the player they will die, and be respawned at the last safe position.
|
2021-03-04 23:31:22 +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 |
|
|
|
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 |
|
|
|
4b7fbae286
|
Merge branch 'artefactUI_fixes' into 'main'
small fixes
See merge request kernel-panic/revival!26
|
2021-03-03 17:57:53 +00:00 |
|
Novvator
|
faf6c30b3e
|
small fixes
|
2021-03-03 16:45:09 +00:00 |
|
Programmer-DField
|
b6888e891c
|
Added artifacts from source.
|
2021-03-03 13:12:11 +00:00 |
|
|
|
53c5ec45d5
|
Merge branch 'bug/broken-respawn' into 'main'
use SO-based references for respawn position and events
Closes #49
See merge request kernel-panic/revival!25
|
2021-03-03 13:08:35 +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 |
|
|
|
76c07b7fa1
|
Merge branch 'CineCamera' into 'main'
Cine camera
See merge request kernel-panic/revival!22
|
2021-03-02 19:19:04 +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 |
|
|
|
f28e4e27fa
|
bump wait time in build
|
2021-03-02 18:44:59 +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 |
|
|
|
3690668097
|
Merge branch 'artefactUI' into 'main'
Artefact UI
See merge request kernel-panic/revival!21
|
2021-03-02 18:35:16 +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 |
|
