Cat Flynn
91be3b97b9
redesign arrow wall trap objects
2021-03-18 17:25:34 +00:00
Programmer-DField
914f7e584b
Further cleaning of code in both scripts.
2021-03-18 12:48:09 +00:00
Programmer-DField
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
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
292ca65bb2
respawn fallaway floor after a few seconds in the safe zone
2021-03-17 18:04:31 +00:00
Novvator
b94d9d7f32
changes made as per code review
2021-03-16 15:49:54 +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
9f352f6ffe
Merge branch 'main' into feature/inject-prompt-artefact-ui
2021-03-15 16:23:04 +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
Novvator
873c0908ef
power freeze now works + UI indicator
2021-03-13 02:01:20 +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
7c56c0defa
Changes made as suggested in code review (part2)
2021-03-12 15:58:18 +00:00
Programmer-DField
baad3163e6
Made changes as per code review.
2021-03-12 11:52:56 +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
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
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
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
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
c86d67031d
Merge branch 'main' into feature/audio-integration
2021-03-05 19:23:42 +00:00
cyndrdev
34352d95ab
added audio stuffs
2021-03-05 18:22:18 +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
ec8648b67c
Merge branch 'main' into feature/falling-floor-trap-integration
2021-03-05 16:36:03 +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
87e5249578
tried to fix FMOD dialogue issue
2021-03-05 14:11:16 +00:00
Cat Flynn
1aee232cb6
artefact registration, register event listeners after awake event
2021-03-05 13:26:15 +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
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
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
Novvator
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
Programmer-DField
be850a3795
Changes made as per code review.
2021-03-02 19:47:28 +00:00
cyndrdev
1e8710a926
Merge branch 'main' into CineCamera
2021-03-02 19:05:19 +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
Novvator
81ef58415a
artefactUI test
2021-03-01 18:09:21 +00:00
Programmer-DField
169c2a4477
Now have a work around for the camera.
2021-03-01 18:03:30 +00:00
Cat Flynn
14a4d3c1b8
Merge branch 'main' into feature/artefact-dialogue
2021-03-01 16:18:24 +00:00
Programmer-DField
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
Programmer-DField
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
Programmer-DField
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
Programmer-DField
2773c3f954
Continued work on getting the respawn system working, merge has broken functionality.
2021-02-26 15:02:33 +00:00
Programmer-DField
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
Novvator
a8d79c2b10
Changes in Artefact inheritance
2021-02-25 20:12:08 +00:00
Novvator
7e06b98577
Added Artefact inheritance
...
PowerArtefacts now can unlock PlayerPowers
2021-02-25 14:21:35 +00:00
Programmer-DField
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
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
d945aea322
add game event scriptable object
2021-02-23 09:52:04 +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
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
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
Novvator
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
Novvator
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
Programmer-DField
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
Programmer-DField
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
Programmer-DField
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
Novvator
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