|
cfa6ac4027
|
Merge branch '14-power_freeze' into 'main'
Resolve "glove: freeze"
See merge request kernel-panic/revival!47
|
2021-03-24 12:54:04 +00:00 |
|
|
1611962ae9
|
messy messy merge >n<
|
2021-03-24 12:45:19 +00:00 |
|
|
9bcde1e028
|
added music triggers
|
2021-03-24 11:50:07 +00:00 |
|
|
da33cc4a4a
|
updated animation controller, got new anims in-game
|
2021-03-23 11:48:43 +00:00 |
|
|
91be3b97b9
|
redesign arrow wall trap objects
|
2021-03-18 17:25:34 +00:00 |
|
|
af519d2ffe
|
pop-in animation on platform respawn
|
2021-03-17 18:37:56 +00:00 |
|
|
9037fd264c
|
animation and audio event on falling platforms
|
2021-03-17 18:31:33 +00:00 |
|
|
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 |
|
|
ed9be08db3
|
Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass
See merge request kernel-panic/revival!49
|
2021-03-15 16:51:40 +00:00 |
|
|
0712af572f
|
Merge branch 'main' into Camera2ndPass
|
2021-03-15 16:36:48 +00:00 |
|
|
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 |
|
|
b8a2e67a33
|
platform-specific input prompt above nearby artefacts
|
2021-03-12 18:29:36 +00:00 |
|
|
9baddf74a1
|
remove extraneous debug logs
|
2021-03-12 17:46:01 +00:00 |
|
|
a9dfbbc99d
|
Merge branch 'main' into ArrowWall
|
2021-03-12 17:41:34 +00:00 |
|
|
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 |
|
|
e1b5fc214a
|
Merge branch 'main' into feature/dialogue-inject-prompts
|
2021-03-11 20:44:31 +00:00 |
|
|
7d5c493bcd
|
inject input prompt sprites into dialogue
|
2021-03-11 20:25:16 +00:00 |
|
|
ecd6bab441
|
juiced artefact unlock screen
|
2021-03-11 19:34:32 +00:00 |
|
|
6538706e4a
|
bad rider >:l
|
2021-03-11 16:01:21 +00:00 |
|
|
720d3cc325
|
artefact preview
|
2021-03-11 15:50:19 +00:00 |
|
|
4883623740
|
made artefact preview work
|
2021-03-11 13:31:35 +00:00 |
|
|
43f5a68d45
|
artefact ui overhaul
|
2021-03-11 13:12:19 +00:00 |
|
|
a28207bbcd
|
added fade boi
|
2021-03-11 12:02:34 +00:00 |
|
|
9c4a16ec55
|
dialogue juice
|
2021-03-11 11:48:17 +00:00 |
|
|
d5de30107f
|
reset falling floor trap position on player respawn
|
2021-03-10 18:26:33 +00:00 |
|
|
762bbf6486
|
wip
|
2021-03-10 17:41:09 +00:00 |
|
|
4c689e0561
|
minor bugfixes
|
2021-03-09 14:24:31 +00:00 |
|
|
24be02e384
|
made stuff look good
|
2021-03-08 17:05:33 +00:00 |
|
|
aa9526268c
|
added graphics adjustment
|
2021-03-08 16:26:33 +00:00 |
|
|
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 |
|
|
c86d67031d
|
Merge branch 'main' into feature/audio-integration
|
2021-03-05 19:23:42 +00:00 |
|
|
34352d95ab
|
added audio stuffs
|
2021-03-05 18:22:18 +00:00 |
|
|
4d971c8170
|
Merge branch 'main' into Animation_IdletoWalkLocoMotion
|
2021-03-05 18:01:07 +00:00 |
|
|
143b3c2a7e
|
update player prefab
|
2021-03-05 18:00:50 +00:00 |
|
|
ec8648b67c
|
Merge branch 'main' into feature/falling-floor-trap-integration
|
2021-03-05 16:36:03 +00:00 |
|
|
e016e2b122
|
clean up trap floor prefab
|
2021-03-05 16:24:50 +00:00 |
|
|
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 |
|
|
687762b59e
|
Merge branch 'feature/menus' into 'main'
Feature/menus
See merge request kernel-panic/revival!31
|
2021-03-05 15:45:02 +00:00 |
|
|
afdf5ce87b
|
Merge branch 'main' into feature/audio-integration
|
2021-03-05 15:39:03 +00:00 |
|
|
f5262cda2c
|
implement vo lines via programmer instrument lol
|
2021-03-05 15:34:52 +00:00 |
|
|
a5b2f863fe
|
finalised main menu
|
2021-03-05 15:29:20 +00:00 |
|
|
87e5249578
|
tried to fix FMOD dialogue issue
|
2021-03-05 14:11:16 +00:00 |
|
|
1aee232cb6
|
artefact registration, register event listeners after awake event
|
2021-03-05 13:26:15 +00:00 |
|
|
27e512a780
|
delete unused script
|
2021-03-05 12:49:44 +00:00 |
|