149 Commits

Author SHA1 Message Date
fc0eb63dc8 Fix issues with pill levels and collision 2020-01-08 11:37:26 +01:00
SlightlyObscure
0688ba411a finished pipe game 2020-01-02 01:59:35 +01:00
5b6fe3e2c8 Add ambient music which changes based on pill level 2019-12-30 00:53:18 +01:00
SlightlyObscure
67f38c1f24 worked on pipe game 2019-12-28 18:36:48 +01:00
5c212f3560 Meldewesen following player 2019-12-27 20:50:38 +01:00
88e184e52d updated detection of forbidden areas 2019-12-27 20:21:52 +01:00
c1a0d5672d Meldewesen stops following in pill level is high enough
adjusted pill level
2019-12-27 19:09:11 +01:00
3cfd698276 added nose for Meldewesen for easier debugging
set Min Pill level to 1 -> otherwise collisions seems to stop working
changed Meldewesen behavior: only "catch" player if is in forbidden Area, otherwise just following
2019-12-27 18:10:09 +01:00
f2dbcc91a5 fixed lever
outline-refactoring
2019-12-14 21:05:09 +01:00
0d37f1076d added fadeOut effect if get in touch with a meldewesen
only triggers for under 50 % Pill level, otherwise there will be an conversation
2019-12-14 15:32:29 +01:00
07cbb545c0 enabled 3D Audio Listener 2019-12-03 12:42:03 +01:00
d77f55705c adding sound for eating (stolen by Karl made by Marlene eating an apple)
adding collision for Player - Meldewesen
2019-12-03 12:33:10 +01:00
Ententerminator
e2063273b4 removed test 2019-11-25 10:51:13 +01:00
Ententerminator
9c830f691d test 2019-11-25 10:50:02 +01:00
Ententerminator
4da78fe7c7 added start menu animation 2019-11-24 13:38:43 +01:00
Ententerminator
e089dc5d1a merge 2019-11-24 12:42:02 +01:00
Ententerminator
ba56ec493d added starut menu, maybe add hover color for disembark 2019-11-23 21:07:26 +01:00
SlightlyObscure
4f9bbc389b longer pipe ray casts 2019-11-23 20:44:25 +01:00
Leon Palluch
0a35eb1c24 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-23 18:29:12 +01:00
Leon Palluch
98cbef0649 pipe colors slightly working, but not really 2019-11-23 18:28:59 +01:00
Ententerminator
fb74bc51b9 now with sandwich 2019-11-23 15:39:03 +01:00
5e72c7c699 Change 'Things' to 'Interactables', new structure 2019-11-22 12:19:22 +01:00
6be42f3d7a Rename 'pills' to 'Pills' for consistency 2019-11-22 12:16:08 +01:00
a79ae2402b Move materials to their own top-level folder 2019-11-22 12:15:51 +01:00
696b1cf724 Move Models to Resources 2019-11-22 12:12:35 +01:00
SlightlyObscure
0c8b8e208a lever model 2019-11-22 11:11:10 +01:00
SlightlyObscure
0d7fc95ed1 forlorn plumming 2019-11-21 23:52:54 +01:00
Leon Palluch
e0c708e8af Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-21 21:46:15 +01:00
Leon Palluch
fc712e4ac8 factory gameplay scene added 2019-11-21 21:45:48 +01:00
4bb474dbed final pill taking 2019-11-21 14:17:28 +01:00
a5f3e610a7 animation for taking pills 2019-11-21 13:50:49 +01:00
fb5b6da3d3 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-21 13:31:59 +01:00
da7780fe81 animation for pill taking 2019-11-21 13:31:52 +01:00
Ententerminator
ccf8cc08bf automerge 2019-11-21 13:28:31 +01:00
Ententerminator
7e0c17b5f7 automarge 2019-11-21 13:27:10 +01:00
32ebab464b Add logger trace when footstep sound should play
Sound is not working currently on my machine... need to test
2019-11-21 13:26:51 +01:00
790734e2c1 Add door open, door close sound effect files 2019-11-21 13:26:35 +01:00
Ententerminator
0cd0c4e9b7 added pill TRUEFORM 2019-11-21 13:26:28 +01:00
e09722ba4c Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-21 12:46:16 +01:00
9d82dbe521 Tweaks for pill-based visuals and collision 2019-11-21 12:45:44 +01:00
51e263e83d Collision depends on pill level; works in World
World is now the default scene since the old one hasn't been modified
for this
2019-11-21 12:37:54 +01:00
0d8c940170 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace
# Conflicts:
#	Characters/Player/Player.tscn
2019-11-21 12:37:50 +01:00
92c8e66e63 Collision also changes depending on pill status
Corresponds to visibility
2019-11-21 12:36:41 +01:00
d16f88f39b added animation for PillTaking 2019-11-21 12:22:55 +01:00
09e0f32503 Add shader which mixes true and masked view
Player now has 2 cameras (one true, one masked), each with a viewport,
which the shader alternates between based on the Pill factor.
2019-11-21 12:19:03 +01:00
4c683444dd PillTaker is now a spacial (due to its child need a position) 2019-11-21 11:28:48 +01:00
41e2d5b096 moved "taking pill" to own script 2019-11-21 11:25:59 +01:00
233573ad44 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-21 10:42:05 +01:00
130584c4e2 - using getter for receiving values from globals (pill _max) 2019-11-21 10:41:57 +01:00
bd3118c7b3 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-21 10:33:45 +01:00