 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 |
|
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 |
|
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 |
Novvator
|
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 |
LojZa33
|
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 |
|
cyndrdev
|
f20fe247a7
|
added VO FMOD events
|
2021-03-05 13:34:45 +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 |
|
cyndrdev
|
b164558076
|
added temporary VO lines
|
2021-03-05 13:02:07 +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 |
|
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 |
|
LojZa33
|
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 |
|
cyndrdev
|
d8b2e1e977
|
added events & banks for new audio
|
2021-03-04 15:40:32 +00:00 |
|
cyndrdev
|
363ae1cb58
|
added cai's WIP music track
|
2021-03-04 15:05:39 +00:00 |
|
cyndrdev
|
695440e978
|
added cai's audio stuff
|
2021-03-04 14:52:46 +00:00 |
CharlieTinley
|
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 |
|
Novvator
|
faf6c30b3e
|
small fixes
|
2021-03-03 16:45:09 +00:00 |
|
Programmer-DField
|
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 |
|
Programmer-DField
|
be850a3795
|
Changes made as per code review.
|
2021-03-02 19:47:28 +00:00 |
|
CharlieTinley
|
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 |
|
Novvator
|
e79053ebb5
|
bug fix in InputSettings UpdateMode
|
2021-03-02 17:50:27 +00:00 |
|
Novvator
|
f58f89a9ee
|
fixed bug when timeScale = 0
|
2021-03-02 17:10:12 +00:00 |
|
Novvator
|
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 |
|
Programmer-DField
|
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 |
|
Programmer-DField
|
7fee30a4bd
|
No drastic changes. Just demo shown to the team.
|
2021-03-01 18:33:28 +00:00 |
|
Programmer-DField
|
0e6d9f2a8b
|
See below
|
2021-03-01 18:10:11 +00:00 |
|
Novvator
|
81ef58415a
|
artefactUI test
|
2021-03-01 18:09:21 +00:00 |
|
Programmer-DField
|
40075087aa
|
As before
|
2021-03-01 18:03:57 +00:00 |
|
Programmer-DField
|
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 |