Cat Flynn
bff72788e6
make puzzle more forgiving
2021-04-16 20:28:21 +01:00
Cat Flynn
9d9de550e1
tune bloom and match controls to prompt
2021-04-16 20:19:19 +01:00
Cat Flynn
7c7ca3c48c
artefact control prefabs
2021-04-16 19:55:34 +01:00
Cat Flynn
120e7574d0
add gloves lol
2021-04-16 19:31:49 +01:00
cyndrdev
338868d041
Merge branch 'main' into feature/menus
2021-04-16 16:39:06 +01:00
cyndrdev
9bb1b4e9df
added artefact description writing
2021-04-16 16:26:42 +01:00
Cat Flynn
c3312b7d93
disable cheats on player
2021-04-16 15:03:50 +01:00
Cat Flynn
6ef4923b3d
make freeze 3 playable without boost
2021-04-16 15:00:37 +01:00
Cat Flynn
6cb0d90ee8
remove random walkway intersecting level
2021-04-16 14:18:19 +01:00
cyndrdev
cf8d58690d
added new freeze voice lines
2021-04-16 14:00:46 +01:00
Cat Flynn
0708d9fd40
create freeze artefact and move dialogue trigger
2021-04-16 13:16:11 +01:00
cyndrdev
c96036b304
Merge branch 'main' into feature/boost-level-integration
2021-04-16 12:26:47 +01:00
cyndrdev
13ca75f3d3
applied cam changes to prefab
2021-04-16 12:17:15 +01:00
f2644a1a39
changed player to his original starting position
2021-04-16 01:00:06 +01:00
45e5d4cbe3
small change
2021-04-16 00:58:16 +01:00
7fec70745b
added freeze levels in main
2021-04-16 00:57:25 +01:00
8af98dc169
Merge branch 'feature/boost-level-integration' of https://gitlab.badbrain.dev/kernel-panic/game into 95-freeze-sequence
2021-04-15 21:47:45 +01:00
44935911a5
finalized the freeze levels and made a small change to the RollingBoulder
2021-04-15 20:31:09 +01:00
Cat Flynn
77ce74c45a
matrginally improve courtyard collision geometry
2021-04-15 19:36:53 +01:00
Cat Flynn
5cdd4e376f
improve camera controls
2021-04-15 19:32:09 +01:00
Cat Flynn
2bdfa81a7a
vastly improve lighting
2021-04-15 17:19:54 +01:00
Cat Flynn
e7e4bbde07
Merge branch '115-secret-door-pressure-plate' into 'main'
...
Added pressure plate and secret door prefab
See merge request kernel-panic/revival!64
2021-04-15 14:21:17 +00:00
Cat Flynn
85fe992fa1
use events to link plate and door
...
also removed unnecessary prefabs and moved animations to animation
folder
2021-04-15 15:11:02 +01:00
Cat Flynn
717fd1c428
integrate boost level design
2021-04-15 14:44:06 +01:00
577070a551
added PressurePlate test scene
2021-04-15 00:43:20 +01:00
cyndrdev
07c89104f9
fixed time freeze not working
2021-04-13 15:33:59 +01:00
Cinder Foster-Smith
fffb50a6a2
Merge branch 'RollingBoulder' into 'main'
...
Rolling boulder
See merge request kernel-panic/revival!52
2021-03-25 19:19:26 +00:00
Cinder Foster-Smith
35fd443bd0
Merge branch 'fix/safe-zone-spawn-pos' into 'main'
...
respawn in middle of safe zone
Closes #117
See merge request kernel-panic/revival!58
2021-03-25 19:04:48 +00:00
cyndrdev
1e5022e3e8
Merge branch 'main' into RollingBoulder
2021-03-25 19:00:32 +00:00
cyndrdev
6e74da102c
minor fixes
2021-03-25 19:00:13 +00:00
Cat Flynn
7041d71c6f
fix safe zone scale and appearance in builds
2021-03-25 17:24:17 +00:00
Cat Flynn
c489c8ef49
Merge branch 'feature/menus' into 'main'
...
ui sounds :)
See merge request kernel-panic/revival!59
2021-03-25 17:19:26 +00:00
cyndrdev
b26abcc081
beta time babey
2021-03-25 12:20:32 +00:00
cyndrdev
a841238f56
added ui clicks
2021-03-25 12:19:44 +00:00
cyndrdev
242ccb6fcb
Merge branch 'main' into feature/menus
2021-03-25 11:27:13 +00:00
Cat Flynn
01e8c30439
Merge branch 'main' into feature/boost-puzzle-design
2021-03-25 11:24:50 +00:00
Cat Flynn
94959bcb71
Merge branch 'main' into feature/boost-puzzle-design
2021-03-25 10:43:47 +00:00
Cat Flynn
122d0e1ff3
implement falling platform chain
2021-03-24 16:54:34 +00:00
cyndrdev
317a1ea53b
settings tweaked
2021-03-24 11:52:01 +00:00
cyndrdev
9bcde1e028
added music triggers
2021-03-24 11:50:07 +00:00
Cat Flynn
a83cad4a2a
create 3rd boost puzzle
2021-03-23 15:03:18 +00:00
cyndrdev
733e3f0b59
commited player w/ cheats enabled oopsie
2021-03-23 11:52:33 +00:00
cyndrdev
da33cc4a4a
updated animation controller, got new anims in-game
2021-03-23 11:48:43 +00:00
Cat Flynn
927a1b9dd7
create killbox prefab
2021-03-22 16:45:42 +00:00
cyndrdev
dd1924143f
fixed menus not working with keeb / controller
2021-03-22 02:20:38 +00:00
Cat Flynn
e92ae299d8
boost puzzles 1 2 complete 3 wip
2021-03-16 16:38:46 +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
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
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
a07f31fbf2
Final check over before merge request.
2021-03-15 12:56:45 +00:00
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
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
d299976da2
More fine tuning of the rigs. Enabled the Y-axis recentering.
2021-03-15 12:15:55 +00:00
65d46f7f18
Adjusted height of rigs to give a better view ahead, above, and below.
2021-03-15 12:06:53 +00:00
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
ab8999b105
Fine tuned look ahead smoothing.
2021-03-15 11:19:42 +00:00
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
29ec4cf76c
Testing radius of lower rig.
2021-03-12 23:07:54 +00:00
Cat Flynn
a9dfbbc99d
Merge branch 'main' into ArrowWall
2021-03-12 17:41:34 +00:00
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
8a81d12da5
Moved the follow target to be inline with the player model's shoulders.
2021-03-12 16:25:36 +00:00
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
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
cyndrdev
ecd6bab441
juiced artefact unlock screen
2021-03-11 19:34:32 +00:00
cyndrdev
599ff42a13
fixed main menu
2021-03-11 15:51:09 +00:00
cyndrdev
720d3cc325
artefact preview
2021-03-11 15:50:19 +00:00
cyndrdev
4883623740
made artefact preview work
2021-03-11 13:31:35 +00:00
cyndrdev
43f5a68d45
artefact ui overhaul
2021-03-11 13:12:19 +00:00
cyndrdev
a76d00efa9
fixed scaling issues
2021-03-11 12:15:05 +00:00
cyndrdev
a28207bbcd
added fade boi
2021-03-11 12:02:34 +00:00
cyndrdev
9c4a16ec55
dialogue juice
2021-03-11 11:48:17 +00:00
Cat Flynn
d5de30107f
reset falling floor trap position on player respawn
2021-03-10 18:26:33 +00:00
Cat Flynn
762bbf6486
wip
2021-03-10 17:41:09 +00:00
cyndrdev
30df2a4b71
branding ™️
2021-03-08 17:34:51 +00:00
cyndrdev
da08bdd574
oopsie
2021-03-08 17:19:14 +00:00
cyndrdev
faa05ad1a8
final pretties
2021-03-08 17:18:43 +00:00
cyndrdev
24be02e384
made stuff look good
2021-03-08 17:05:33 +00:00
cyndrdev
aa9526268c
added graphics adjustment
2021-03-08 16:26:33 +00:00
cyndrdev
1d06cf5fb4
backend for playerpref audio
2021-03-08 15:13:19 +00:00
cyndrdev
50685f7d43
merged main properly
2021-03-05 19:33:23 +00:00
cyndrdev
c86d67031d
Merge branch 'main' into feature/audio-integration
2021-03-05 19:23:42 +00:00
cyndrdev
563f1f0cbf
boot flow stuff
2021-03-05 18:40:20 +00:00
cyndrdev
34352d95ab
added audio stuffs
2021-03-05 18:22:18 +00:00
Cat Flynn
dd98fd5c40
speed up walk anim
2021-03-05 18:08:55 +00:00
Cat Flynn
6e8f8c313f
update player in main scene
2021-03-05 18:06:37 +00:00
Cat Flynn
ec8648b67c
Merge branch 'main' into feature/falling-floor-trap-integration
2021-03-05 16:36:03 +00:00
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
154d809540
Merge branch 'feature/audio-integration' into 'main'
...
Feature/audio integration
Closes #56
See merge request kernel-panic/revival!32
2021-03-05 15:48:36 +00:00
Cat Flynn
687762b59e
Merge branch 'feature/menus' into 'main'
...
Feature/menus
See merge request kernel-panic/revival!31
2021-03-05 15:45:02 +00:00
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
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
Cat Flynn
1aee232cb6
artefact registration, register event listeners after awake event
2021-03-05 13:26:15 +00:00
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
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
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
faf6c30b3e
small fixes
2021-03-03 16:45:09 +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
88fd38453b
Created the ALPHA level with collisions on geometry
2021-03-02 19:33:54 +00:00
cyndrdev
ad40b0195e
made main use new cameras
2021-03-02 19:06:17 +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
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
e79053ebb5
bug fix in InputSettings UpdateMode
2021-03-02 17:50:27 +00:00
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
81ef58415a
artefactUI test
2021-03-01 18:09:21 +00:00
cyndrdev
f2cf6256c1
menu WIP
2021-03-01 17:57:41 +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
14a4d3c1b8
Merge branch 'main' into feature/artefact-dialogue
2021-03-01 16:18:24 +00:00
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
Cat Flynn
51f32cc70f
Merge branch 'main' into artefact_inheritance
2021-02-26 17:17:42 +00:00
a8d79c2b10
Changes in Artefact inheritance
2021-02-25 20:12:08 +00:00
7e06b98577
Added Artefact inheritance
...
PowerArtefacts now can unlock PlayerPowers
2021-02-25 14:21:35 +00:00
cbb5825c20
Added SpikePit trap with the associated textures. Also did a small lighting change: added fog, some post processing effects etc
2021-02-24 15:21:44 +00:00
Cat Flynn
e47f04fb79
trigger dialogue on artefact pickup
2021-02-23 13:05:42 +00:00
Cat Flynn
c66bf6f1f1
replicate main scene setup in dialogue dev scene
2021-02-23 09:58:49 +00:00
Cinder Foster-Smith
8a96a44a64
Merge branch 'feature/dialogue-frontend' into 'main'
...
Feature/dialogue frontend
See merge request kernel-panic/revival!10
2021-02-22 17:13:47 +00:00
cyndrdev
6f8ed8ee6d
power tweaks, scene & prefab fixes
2021-02-22 17:11:15 +00:00
Cat Flynn
5d79c1b637
begin dialogue frontend implementation, placeholder dialogue ui
2021-02-19 16:33:02 +00:00
Cat Flynn
618dab1052
Merge branch 'main' into Checkpoints
2021-02-15 18:58:35 +00:00
Cinder Foster-Smith
96860632ff
Feature/character controller
2021-02-15 18:09:32 +00:00
079fa914a2
Updated animations. Disabled player controller during death. Generally cleaned code.
2021-02-15 16:23:29 +00:00
adb0c9e673
Added the Respawn Manager which allows for the use of multiple safe zones. Cleeaned up the code and made more efficient.
2021-02-15 13:14:42 +00:00
3b9e31a4b3
Added a safezone that reports the position of the player whenever they are within the area.
...
Added a deathzone that plays a death animation on trigger, fades the screen, respawns the player at the last known safe position and the fades the screen back in.
Added scripts for safezone and deathzone.
Added some make do animations and animators.
Added some materials for testing purposes.
2021-02-15 09:44:04 +00:00
Cat Flynn
4424659082
Merge branch 'main' into feature/flow
2021-02-12 10:36:41 +00:00
cyndrdev
d62f3a7b6b
debug text visibility
2021-02-12 09:35:59 +00:00
cyndrdev
a4906a35d4
gameflow
2021-02-12 09:32:10 +00:00
e790ef7493
Created small block out of the level for the programmers to test the mechanics
2021-02-09 15:48:42 +00:00
cyndrdev
7fefaae405
basic camera controller
2021-01-27 12:06:17 +00:00
cyndrdev
ab7cd608cb
basic player controller and input handling
2021-01-27 11:27:56 +00:00
Cat Flynn
bd5bc825d3
initial commit
2021-01-25 19:44:17 +00:00
Cat Flynn
cyndrdev
Novvator
Programmer-DField
CharlieTinley