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
9ae930df56
Animations
2021-03-22 23:34:02 +01:00
Cat Flynn
927a1b9dd7
create killbox prefab
2021-03-22 16:45:42 +00:00
Cat Flynn
0fdc569380
Merge branch 'main' into feature/boost-puzzle-design
2021-03-22 15:59:28 +00:00
cyndrdev
dd1924143f
fixed menus not working with keeb / controller
2021-03-22 02:20:38 +00:00
Cat Flynn
91be3b97b9
redesign arrow wall trap objects
2021-03-18 17:25:34 +00:00
49d1fc481a
Disabled mesh renderer and box collider on target for rolling boulder prefab. Also added the Mover script to the prefab.
2021-03-18 12:54:32 +00:00
914f7e584b
Further cleaning of code in both scripts.
2021-03-18 12:48:09 +00:00
b0b5c09c54
Cleaned up the script so it now works independant of gravity. Added a second Mover script that controls the speed and direction the boulder moves once triggered. Added a target to the prefab as this is the point at which the boulder moves towards.
2021-03-18 12:34:08 +00:00
1b02a15353
Made changes to the RollingBoulder script. The trap now works much more simply. The player enters a trigger and this sets the rigidbody to use gravity setting the boulder on its journey down the ramp. Player death works as with other traps. I need to speak with Cat as he mentioned using physics may not be the best, by this I assume he means gravity, so I need some advice on a different solution.
2021-03-17 22:07:33 +00:00
f049b97297
Added the a RollingBoulder script as well as a boulder (sphere) and ramp (plane). Visual studio decided it wanted to update so saving work at this point.
2021-03-17 20:50:08 +00:00
Cat Flynn
af519d2ffe
pop-in animation on platform respawn
2021-03-17 18:37:56 +00:00
Cat Flynn
9037fd264c
animation and audio event on falling platforms
2021-03-17 18:31:33 +00:00
Cat Flynn
63ed52fe4a
import dotween
2021-03-17 18:12:17 +00:00
Cat Flynn
292ca65bb2
respawn fallaway floor after a few seconds in the safe zone
2021-03-17 18:04:31 +00:00
Cat Flynn
4370729700
monochrome emission
2021-03-17 15:24:03 +00:00
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
9f25b5f426
Orb_MAT
2021-03-17 01:00:53 +01:00
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
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
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
04c462d9a8
timefreeze Orb
2021-03-15 16:36:01 +01:00
42196fa144
Merge branch 'main' of https://gitlab.badbrain.dev/kernel-panic/game into Animation_IdletoWalkLocoMotion
2021-03-15 16:04:53 +01: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
723ab5d894
Rotating orb artefact [freeze]
2021-03-14 19:53:48 +01:00
873c0908ef
power freeze now works + UI indicator
2021-03-13 02:01:20 +00:00
29ec4cf76c
Testing radius of lower rig.
2021-03-12 23:07:54 +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
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
Cat Flynn
513b0a1eb3
import pathcreator
2021-03-12 14:33:05 +00:00
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
Cat Flynn
e1b5fc214a
Merge branch 'main' into feature/dialogue-inject-prompts
2021-03-11 20:44:31 +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
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
4c689e0561
minor bugfixes
2021-03-09 14:24:31 +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
660569601d
first implementation of freeze
2021-03-08 14:16:20 +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
4d971c8170
Merge branch 'main' into Animation_IdletoWalkLocoMotion
2021-03-05 18:01:07 +00:00
Cat Flynn
143b3c2a7e
update player prefab
2021-03-05 18:00:50 +00:00
Cat Flynn
dba218cc7e
delete script
2021-03-05 17:50:10 +00:00
e81cab42e0
no message
2021-03-05 18:44:27 +01:00
cyndrdev
4ca7a5b91b
Merge branch 'main' into feature/audio-integration
2021-03-05 17:19:17 +00:00
cyndrdev
de3cfe7449
tweaked VO settings
2021-03-05 17:17:58 +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
cyndrdev
87e5249578
tried to fix FMOD dialogue issue
2021-03-05 14:11:16 +00:00
cyndrdev
6a1a99d59b
Merge branch 'main' into feature/audio-integration
2021-03-05 13:42:27 +00:00
cyndrdev
377a13fb4c
meta shenanigans
2021-03-05 13:42:06 +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
27e512a780
delete unused script
2021-03-05 12:49:44 +00:00
cyndrdev
98a9003556
Merge branch 'main' into Traps
2021-03-05 12:06:35 +00:00
Cat Flynn
a2003fa4a0
Merge branch 'main' into Anims_Idle+Walk
2021-03-05 11:32:43 +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
e0a80e3103
Animations Idle Walk(to be fixed)
2021-03-04 23:11:28 +01: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
b6888e891c
Added artifacts from source.
2021-03-03 13:12:11 +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
be850a3795
Changes made as per code review.
2021-03-02 19:47:28 +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
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
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
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
e79053ebb5
bug fix in InputSettings UpdateMode
2021-03-02 17:50:27 +00:00
f58f89a9ee
fixed bug when timeScale = 0
2021-03-02 17:10:12 +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
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
7fee30a4bd
No drastic changes. Just demo shown to the team.
2021-03-01 18:33:28 +00:00
0e6d9f2a8b
See below
2021-03-01 18:10:11 +00:00
81ef58415a
artefactUI test
2021-03-01 18:09:21 +00:00
40075087aa
As before
2021-03-01 18:03:57 +00:00
169c2a4477
Now have a work around for the camera.
2021-03-01 18:03:30 +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
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
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
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
078e356810
The respawwn system is now ppicking up the position of the player correctly. However, still not sending the player to the last known respawn point.
2021-02-26 17:08:41 +00:00
2773c3f954
Continued work on getting the respawn system working, merge has broken functionality.
2021-02-26 15:02:33 +00:00
3ef56e2bc1
Added a shader with dissolve effect. Ckleaned up use of tags now using compare.tag which is more efficient. The spike trap is now functionally working however, ppolish does need to be applied to the final outcome.
2021-02-26 14:50:30 +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
1f4c063c60
Updated the FallingFloor script. The floor now begins to lower, waits for a set period and then is destroyed. I plan to add a disssolve effect to make this transition look better. The player begins to slowly fall with the floor until the object is destroyed at which point the player falls with gravity hitting the sspike trap and "dying".
2021-02-25 00:51:11 +00:00
83cd280778
Working to get the trap system working. Added a prototype for the spike trap. Need to work on the code to get the floor to fall away under the player.
2021-02-24 23:41:33 +00:00
Cat Flynn
f2a9cf4229
Merge branch 'main' into 33-trap-pitfall-art
2021-02-24 15:33:47 +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
cyndrdev
cb279d7135
added menu font
2021-02-24 12:55:09 +00:00
Cat Flynn
e47f04fb79
trigger dialogue on artefact pickup
2021-02-23 13:05:42 +00:00
Cat Flynn
35d652bb95
unregister event on disable
2021-02-23 12:54:51 +00:00
Cat Flynn
c66bf6f1f1
replicate main scene setup in dialogue dev scene
2021-02-23 09:58:49 +00:00
Cat Flynn
d945aea322
add game event scriptable object
2021-02-23 09:52:04 +00:00
Cat Flynn
9ef1d12a40
ignore FMOD cache
2021-02-23 09:27:10 +00:00
Cat Flynn
6b659a25c9
relative path to fmod project
2021-02-22 17:46:36 +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
60634152d3
play audio via FMOD using key from dialogue database
2021-02-22 15:29:17 +00:00
Cinder Foster-Smith
0839767d25
Merge branch 'feature/checkpoints' into 'main'
...
Checkpoints
See merge request kernel-panic/revival!9
2021-02-22 15:26:00 +00:00
Cat Flynn
f8f037203c
import fmod plugin
2021-02-22 15:25:38 +00:00
Cat Flynn
955972e4a3
Merge branch 'main' into feature/dialogue-frontend
2021-02-22 10:33:36 +00:00
Cat Flynn
1fe3bbd79d
Merge branch 'main' into artefacts_list
2021-02-22 09:01:33 +00:00
f5cc5a4f14
Added nearbyArtefactID SerialInt
2021-02-19 20:38:45 +00:00
Cat Flynn
5d79c1b637
begin dialogue frontend implementation, placeholder dialogue ui
2021-02-19 16:33:02 +00:00
Cat Flynn
ddce06585f
use custom .data instead of raw csv file in dialogue db
2021-02-19 16:26:15 +00:00
4397ec0326
Changed Artefact and ArtefactInventory to Scriptable objects
...
Added artefact prefab
2021-02-19 15:14:14 +00:00
Cat Flynn
f1c9f8a752
fix error spam in edit mode
2021-02-18 17:24:15 +00:00
Cat Flynn
28b8b860d1
make log readable
2021-02-15 23:26:42 +00:00
Cat Flynn
9eea5cd4d5
add log that should have been there in the first place
2021-02-15 23:11:29 +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
Cat Flynn
4e76ea2168
Feature/import dialogue
2021-02-15 13:42:14 +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
7ff4569fde
Added Artefacts - Artefact Inventory (tracking system)
2021-02-14 15:08:59 +00:00
cyndrdev
7a25b61f90
fixed ci issue
2021-02-12 14:12:26 +00:00
cyndrdev
95f04ad618
Merge branch 'feature/flow' of https://gitlab.badbrain.dev/kernel-panic/game into feature/flow
2021-02-12 14:05:16 +00:00
cyndrdev
7c769a2371
changes from code review
2021-02-12 14:04:12 +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
Cat Flynn
e681a3f306
properly tail log and check build result
2021-02-01 18:00:00 +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
cyndrdev
10a02047ce
package setup
2021-01-27 07:43:40 +00:00
Cat Flynn
bd5bc825d3
initial commit
2021-01-25 19:44:17 +00:00
cyndrdev
LojZa33
Cat Flynn
Programmer-DField
Novvator
CharlieTinley