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

150 Commits

Author SHA1 Message Date
Cat Flynn 43a01934bc update trap prefab 2021-03-05 16:32:21 +00:00
Cat Flynn e016e2b122 clean up trap floor prefab 2021-03-05 16:24:50 +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
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
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 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
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
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
Novvator af34631ed8 artefactUI now works 2021-03-02 16:33:31 +00:00
Cat Flynn 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
Cat Flynn 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
Cat Flynn bc22b55334 Merge branch 'feature/artefact-dialogue' into 'main' 
Feature/artefact dialogue

See merge request kernel-panic/revival!11
 2021-03-01 16:56:19 +00:00
Cat Flynn 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