Novvator
|
873c0908ef
|
power freeze now works + UI indicator
|
2021-03-13 02:01:20 +00:00 |
cyndrdev
|
4c689e0561
|
minor bugfixes
|
2021-03-09 14:24:31 +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
|
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 |
Cat Flynn
|
1aee232cb6
|
artefact registration, register event listeners after awake event
|
2021-03-05 13:26:15 +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 |
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 |
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
|
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 |
Novvator
|
81ef58415a
|
artefactUI test
|
2021-03-01 18:09:21 +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 |
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 |
Cat Flynn
|
e47f04fb79
|
trigger dialogue on artefact pickup
|
2021-02-23 13:05:42 +00:00 |
Cat Flynn
|
c66bf6f1f1
|
replicate main scene setup in dialogue dev scene
|
2021-02-23 09:58:49 +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
|
5d79c1b637
|
begin dialogue frontend implementation, placeholder dialogue ui
|
2021-02-19 16:33:02 +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 |