 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
|
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 |
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Cat Flynn
|
51f32cc70f
|
Merge branch 'main' into artefact_inheritance
|
2021-02-26 17:17:42 +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 |
|
Cat Flynn
|
f2a9cf4229
|
Merge branch 'main' into 33-trap-pitfall-art
|
2021-02-24 15:33:47 +00:00 |
|
CharlieTinley
|
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 |