ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
516 Commits 1 Branch 0 Tags 876 MiB
Commit Graph

516 Commits

Author SHA1 Message Date
Cat Flynn afdf5ce87b Merge branch 'main' into feature/audio-integration 2021-03-05 15:39:03 +00:00
Cat Flynn f5262cda2c implement vo lines via programmer instrument lol 2021-03-05 15:34:52 +00:00
Cinder Foster-Smith 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
cyndrdev a5b2f863fe finalised main menu 2021-03-05 15:29:20 +00:00
cyndrdev 69e68e4879 Merge branch 'main' into feature/menus 2021-03-05 14:16:58 +00:00
cyndrdev 87e5249578 tried to fix FMOD dialogue issue 2021-03-05 14:11:16 +00:00
cyndrdev 6a1a99d59b Merge branch 'main' into feature/audio-integration 2021-03-05 13:42:27 +00:00
cyndrdev 377a13fb4c meta shenanigans 2021-03-05 13:42:06 +00:00
cyndrdev f20fe247a7 added VO FMOD events 2021-03-05 13:34:45 +00:00
Cat Flynn 6100035289 banks weren't tracked? 2021-03-05 13:26:45 +00:00
Cat Flynn 1aee232cb6 artefact registration, register event listeners after awake event 2021-03-05 13:26:15 +00:00
cyndrdev b164558076 added temporary VO lines 2021-03-05 13:02:07 +00:00
Cat Flynn b64e4e30af update fmod meta file apparently 2021-03-05 12:52:40 +00:00
Cat Flynn 1978a691d1 development build on ci 2021-03-05 12:52:28 +00:00
Cat Flynn 27e512a780 delete unused script 2021-03-05 12:49:44 +00:00
Cinder Foster-Smith 5e63fc8154 Merge branch 'Traps' into 'main' 
Traps

See merge request kernel-panic/revival!19
 2021-03-05 12:17:25 +00:00
cyndrdev 98a9003556 Merge branch 'main' into Traps 2021-03-05 12:06:35 +00:00
Cinder Foster-Smith 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
Cat Flynn 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
Cat Flynn 427ca62821 place artefacts and add dialogue triggers 2021-03-04 18:53:12 +00:00
Cat Flynn fe1e69fa94 add safe and kill planes 2021-03-04 16:55:29 +00:00
cyndrdev d8b2e1e977 added events & banks for new audio 2021-03-04 15:40:32 +00:00
cyndrdev 363ae1cb58 added cai's WIP music track 2021-03-04 15:05:39 +00:00
cyndrdev 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
Cat Flynn e772598beb add level geometry to main scene 2021-03-03 20:29:55 +00:00
Cat Flynn 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
Cat Flynn 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
Cat Flynn 0290806bbc use SO-based references for respawn position and events 2021-03-03 12:53:52 +00:00
Cat Flynn 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
Cinder Foster-Smith 76c07b7fa1 Merge branch 'CineCamera' into 'main' 
Cine camera

See merge request kernel-panic/revival!22
 2021-03-02 19:19:04 +00:00
cyndrdev ad40b0195e made main use new cameras 2021-03-02 19:06:17 +00:00
cyndrdev 1e8710a926 Merge branch 'main' into CineCamera 2021-03-02 19:05:19 +00:00
cyndrdev 7551e3434e added player glue prefab 2021-03-02 19:04:38 +00:00
cyndrdev f90267dedf added cameras into seperate prefab 2021-03-02 18:59:04 +00:00
Cat Flynn f28e4e27fa bump wait time in build 2021-03-02 18:44:59 +00:00
cyndrdev ef203777ae Merge branch 'main' into CineCamera 2021-03-02 18:44:31 +00:00
Cinder Foster-Smith 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
Cat Flynn 3690668097 Merge branch 'artefactUI' into 'main' 
Artefact UI

See merge request kernel-panic/revival!21
 2021-03-02 18:35:16 +00:00
cyndrdev 1d8eff8015 fixed camera rotation issues' 2021-03-02 18:28:13 +00:00
Cat Flynn bdbbaa32a8 trigger dialogue after artefact ui is dismissed 2021-03-02 18:27:56 +00:00
Cat Flynn 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