280 Commits

Author SHA1 Message Date
b5a3054b5f fixed weird subtitle issues 2021-03-15 17:15:18 +00:00
ed9be08db3 Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass

See merge request kernel-panic/revival!49
2021-03-15 16:51:40 +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
9f352f6ffe Merge branch 'main' into feature/inject-prompt-artefact-ui 2021-03-15 16:23:04 +00:00
a6a8f0ee2d fixed dialogue font 2021-03-15 16:21:40 +00:00
9cedec4d74 Merge branch 'feature/path-spline' into 'main'
Feature/path spline

Closes #44

See merge request kernel-panic/revival!45
2021-03-15 16:13:41 +00:00
LojZa33
04c462d9a8 timefreeze Orb 2021-03-15 16:36:01 +01:00
LojZa33
42196fa144 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into Animation_IdletoWalkLocoMotion 2021-03-15 16:04:53 +01: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
LojZa33
723ab5d894 Rotating orb artefact [freeze] 2021-03-14 19:53:48 +01:00
Novvator
873c0908ef power freeze now works + UI indicator 2021-03-13 02:01:20 +00:00
Programmer-DField
29ec4cf76c Testing radius of lower rig. 2021-03-12 23:07:54 +00:00
b8a2e67a33 platform-specific input prompt above nearby artefacts 2021-03-12 18:29:36 +00:00
9baddf74a1 remove extraneous debug logs 2021-03-12 17:46:01 +00:00
a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
3c4f28844f basic world space artefact interaction prompt 2021-03-12 17:15:27 +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
6baf92ea9a add spline walkway prefab 2021-03-12 15:38:23 +00:00
513b0a1eb3 import pathcreator 2021-03-12 14:33:05 +00:00
Programmer-DField
baad3163e6 Made changes as per code review. 2021-03-12 11:52:56 +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
e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts 2021-03-11 20:44:31 +00:00
7d5c493bcd inject input prompt sprites into dialogue 2021-03-11 20:25:16 +00:00
bdd9fc2e39 buttons 2021-03-11 20:23:20 +00:00
ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +00:00
6538706e4a bad rider >:l 2021-03-11 16:01:21 +00:00
599ff42a13 fixed main menu 2021-03-11 15:51:09 +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
4c689e0561 minor bugfixes 2021-03-09 14:24:31 +00:00
30df2a4b71 branding™️ 2021-03-08 17:34:51 +00:00
da08bdd574 oopsie 2021-03-08 17:19:14 +00:00
faa05ad1a8 final pretties 2021-03-08 17:18:43 +00:00