|
|
363ae1cb58
|
added cai's WIP music track
|
2021-03-04 15:05:39 +00:00 |
|
|
|
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 |
|
|
|
e772598beb
|
add level geometry to main scene
|
2021-03-03 20:29:55 +00:00 |
|
|
|
4b7fbae286
|
Merge branch 'artefactUI_fixes' into 'main'
small fixes
See merge request kernel-panic/revival!26
|
2021-03-03 17:57:53 +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 |
|
|
|
53c5ec45d5
|
Merge branch 'bug/broken-respawn' into 'main'
use SO-based references for respawn position and events
Closes #49
See merge request kernel-panic/revival!25
|
2021-03-03 13:08:35 +00:00 |
|
|
|
0290806bbc
|
use SO-based references for respawn position and events
|
2021-03-03 12:53:52 +00:00 |
|
|
|
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 |
|
|
|
76c07b7fa1
|
Merge branch 'CineCamera' into 'main'
Cine camera
See merge request kernel-panic/revival!22
|
2021-03-02 19:19:04 +00:00 |
|
|
|
ad40b0195e
|
made main use new cameras
|
2021-03-02 19:06:17 +00:00 |
|
|
|
1e8710a926
|
Merge branch 'main' into CineCamera
|
2021-03-02 19:05:19 +00:00 |
|
|
|
7551e3434e
|
added player glue prefab
|
2021-03-02 19:04:38 +00:00 |
|
|
|
f90267dedf
|
added cameras into seperate prefab
|
2021-03-02 18:59:04 +00:00 |
|
|
|
f28e4e27fa
|
bump wait time in build
|
2021-03-02 18:44:59 +00:00 |
|
|
|
ef203777ae
|
Merge branch 'main' into CineCamera
|
2021-03-02 18:44:31 +00:00 |
|
|
|
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 |
|
|
|
3690668097
|
Merge branch 'artefactUI' into 'main'
Artefact UI
See merge request kernel-panic/revival!21
|
2021-03-02 18:35:16 +00:00 |
|
|
|
1d8eff8015
|
fixed camera rotation issues'
|
2021-03-02 18:28:13 +00:00 |
|
|
|
bdbbaa32a8
|
trigger dialogue after artefact ui is dismissed
|
2021-03-02 18:27:56 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f2cf6256c1
|
menu WIP
|
2021-03-01 17:57:41 +00:00 |
|
|
|
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 |
|
|
|
bc22b55334
|
Merge branch 'feature/artefact-dialogue' into 'main'
Feature/artefact dialogue
See merge request kernel-panic/revival!11
|
2021-03-01 16:56:19 +00:00 |
|
|
|
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 |
|
CharlieTinley
|
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 |
|
|
|
4a504f2d7f
|
Merge branch 'artefact_inheritance' into 'main'
Added Artefact inheritance
See merge request kernel-panic/revival!13
|
2021-02-26 17:32:37 +00:00 |
|
|
|
51f32cc70f
|
Merge branch 'main' into artefact_inheritance
|
2021-02-26 17:17:42 +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
|
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 |
|
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 |
|
