106 Commits

Author SHA1 Message Date
b5a3054b5f fixed weird subtitle issues 2021-03-15 17:15:18 +00:00
0712af572f Merge branch 'main' into Camera2ndPass 2021-03-15 16:36:48 +00:00
b57ee3dcb1 applied changes to prefabs 2021-03-15 16:35:38 +00:00
Programmer-DField
a07f31fbf2 Final check over before merge request. 2021-03-15 12:56:45 +00:00
Programmer-DField
b724107be4 Added the cursor script to the camera prefab. One problem is that the cursor needs to be visible and contained to the window in the artifiact screen. Will catch up with Cinder about this. 2021-03-15 12:52:43 +00:00
Programmer-DField
148f153ea5 Added a script to the scene that both hides and locks the cursor. You can now operatee the camera without this being seen on screen. 2021-03-15 12:27:02 +00:00
Programmer-DField
d299976da2 More fine tuning of the rigs. Enabled the Y-axis recentering. 2021-03-15 12:15:55 +00:00
Programmer-DField
65d46f7f18 Adjusted height of rigs to give a better view ahead, above, and below. 2021-03-15 12:06:53 +00:00
Programmer-DField
59d5f6b53c Made changes to the collision for the camera. In a tight area the camera will now move toward the player. 2021-03-15 11:28:46 +00:00
Programmer-DField
ab8999b105 Fine tuned look ahead smoothing. 2021-03-15 11:19:42 +00:00
Programmer-DField
5473a5fc10 Added look ahead to each rig. Top, middle and bottom. The camera now pans towards direction of travel without having any input in the look direction. 2021-03-15 10:03:20 +00:00
Programmer-DField
29ec4cf76c Testing radius of lower rig. 2021-03-12 23:07:54 +00:00
a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
Programmer-DField
9f3ec84ad8 Changed the height of the middle rig on the follow cam. This is now closer to player shoulder height. Also lowered the radius of the middle rig so it is now closer to the player. Added a small amount of look ahead time and smoothness (This will need to be configured more once the actual player model is in place). THis setting turn the camera toward the direction the player is moving (Cinder mentioned this in an earlier meeting). 2021-03-12 16:39:27 +00:00
Programmer-DField
8a81d12da5 Moved the follow target to be inline with the player model's shoulders. 2021-03-12 16:25:36 +00:00
Programmer-DField
7c56c0defa Changes made as suggested in code review (part2) 2021-03-12 15:58:18 +00:00
ba3d232088 made button bois pretty 2021-03-12 00:39:08 +00:00
8e62127c71 added new whooshes 2021-03-12 00:18:10 +00:00
ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +00:00
720d3cc325 artefact preview 2021-03-11 15:50:19 +00:00
4883623740 made artefact preview work 2021-03-11 13:31:35 +00:00
43f5a68d45 artefact ui overhaul 2021-03-11 13:12:19 +00:00
a76d00efa9 fixed scaling issues 2021-03-11 12:15:05 +00:00
a28207bbcd added fade boi 2021-03-11 12:02:34 +00:00
9c4a16ec55 dialogue juice 2021-03-11 11:48:17 +00:00
d5de30107f reset falling floor trap position on player respawn 2021-03-10 18:26:33 +00:00
762bbf6486 wip 2021-03-10 17:41:09 +00:00
1d06cf5fb4 backend for playerpref audio 2021-03-08 15:13:19 +00:00
50685f7d43 merged main properly 2021-03-05 19:33:23 +00:00
dd98fd5c40 speed up walk anim 2021-03-05 18:08:55 +00:00
6e8f8c313f update player in main scene 2021-03-05 18:06:37 +00: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
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
1aee232cb6 artefact registration, register event listeners after awake event 2021-03-05 13:26:15 +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
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
ad40b0195e made main use new cameras 2021-03-02 19:06:17 +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
af34631ed8 artefactUI now works 2021-03-02 16:33:31 +00:00
Novvator
81ef58415a artefactUI test 2021-03-01 18:09:21 +00:00
Novvator
a8d79c2b10 Changes in Artefact inheritance 2021-02-25 20:12:08 +00:00