Commit Graph

513 Commits

Author SHA1 Message Date
Cat Flynn f5ceac5d0d assign textures in orb mat, use specular workflow, assign mat to model 2021-03-17 15:20:26 +00:00
Cat Flynn 13438cd751 re-import textures and create smoothness map 2021-03-17 15:19:00 +00:00
LojZa33 9f25b5f426 Orb_MAT 2021-03-17 01:00:53 +01:00
LojZa33 27f459f068 Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into time-freezing-artefact 2021-03-16 20:01:46 +01:00
Cat Flynn e92ae299d8 boost puzzles 1 2 complete 3 wip 2021-03-16 16:38:46 +00:00
Novvator b94d9d7f32 changes made as per code review 2021-03-16 15:49:54 +00:00
cyndrdev eb82f4d95d cursor 2021-03-15 18:30:52 +00:00
cyndrdev b5a3054b5f fixed weird subtitle issues 2021-03-15 17:15:18 +00:00
Cinder Foster-Smith ed9be08db3 Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass

See merge request kernel-panic/revival!49
2021-03-15 16:51:40 +00:00
Cinder Foster-Smith f8d3529420 Merge branch 'feature/inject-prompt-artefact-ui' into 'main'
basic world space artefact interaction prompt

Closes #93

See merge request kernel-panic/revival!46
2021-03-15 16:44:54 +00:00
cyndrdev 0712af572f Merge branch 'main' into Camera2ndPass 2021-03-15 16:36:48 +00:00
cyndrdev b57ee3dcb1 applied changes to prefabs 2021-03-15 16:35:38 +00:00
cyndrdev 9f352f6ffe Merge branch 'main' into feature/inject-prompt-artefact-ui 2021-03-15 16:23:04 +00:00
cyndrdev a6a8f0ee2d fixed dialogue font 2021-03-15 16:21:40 +00:00
Cinder Foster-Smith 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
Cat Flynn 89ec092d49 Merge branch 'ArrowWall' into 'main'
Arrow wall

Closes #50

See merge request kernel-panic/revival!28
2021-03-12 18:31:43 +00:00
Cat Flynn b8a2e67a33 platform-specific input prompt above nearby artefacts 2021-03-12 18:29:36 +00:00
Cat Flynn 9baddf74a1 remove extraneous debug logs 2021-03-12 17:46:01 +00:00
Cat Flynn a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
Cat Flynn 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
Cat Flynn 6baf92ea9a add spline walkway prefab 2021-03-12 15:38:23 +00:00
Cat Flynn 513b0a1eb3 import pathcreator 2021-03-12 14:33:05 +00:00
Cat Flynn 4ccf346241 Merge branch 'feature/menus' into 'main'
made pretty button boyes

See merge request kernel-panic/revival!44
2021-03-12 12:12:05 +00:00
Programmer-DField baad3163e6 Made changes as per code review. 2021-03-12 11:52:56 +00:00
cyndrdev ba3d232088 made button bois pretty 2021-03-12 00:39:08 +00:00
cyndrdev 8e62127c71 added new whooshes 2021-03-12 00:18:10 +00:00
Cinder Foster-Smith f7a4f943e8 Merge branch 'feature/dialogue-inject-prompts' into 'main'
inject input prompt sprites into dialogue

Closes #86

See merge request kernel-panic/revival!43
2021-03-11 20:56:26 +00:00
Cat Flynn e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts 2021-03-11 20:44:31 +00:00
Cat Flynn e3c468a1c0 remove early timeout from build script 2021-03-11 20:35:31 +00:00
Cat Flynn aad2389939 Merge branch 'feature/menus' into 'main'
created artefact preview screen.

See merge request kernel-panic/revival!42
2021-03-11 20:33:08 +00:00
Cat Flynn 7d5c493bcd inject input prompt sprites into dialogue 2021-03-11 20:25:16 +00:00
cyndrdev bdd9fc2e39 buttons 2021-03-11 20:23:20 +00:00
cyndrdev ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +00:00
cyndrdev 6538706e4a bad rider >:l 2021-03-11 16:01:21 +00:00