115 Commits

Author SHA1 Message Date
fc0eb63dc8 Fix issues with pill levels and collision 2020-01-08 11:37:26 +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
Leon Palluch
98cbef0649 pipe colors slightly working, but not really 2019-11-23 18:28:59 +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
SlightlyObscure
0d7fc95ed1 forlorn plumming 2019-11-21 23:52:54 +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
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
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
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
d32c0f485b Fix mouse look movement
Weird things happened
2019-11-21 10:33:26 +01:00
0c3d96030b - ternary (conditional) operator in godot ! :D 2019-11-21 08:31:40 +01:00
ecfba2d7f3 Fix whole HUD being hidden without interactable
This got mixed up in the merge I think...
2019-11-20 23:53:42 +01:00
8b83d6e7a3 Tweak player movement speed variables 2019-11-20 23:52:48 +01:00
1cf65caed8 Add footstep sound effect and animation
Sound is linked to Animation so it always plays when the camera nods
down
2019-11-20 23:52:11 +01:00
8403eb4716 - able to use a leading underscore to define function arguments as unused 2019-11-19 16:41:32 +01:00
785254f98a - added basic inventory and items (ugly but working!)
- TODO: move inventory handling to global
2019-11-19 13:46:44 +01:00
2ce505fe78 - set to Linux newlines 2019-11-19 12:43:35 +01:00
9599d80b62 - preparations for HUD 2019-11-19 12:08:11 +01:00
SlightlyObscure
1024e9bc69 added outline for interactions and key prompt 2019-11-18 20:00:45 +01:00
SlightlyObscure
469f254644 removed an oppsie 2019-11-18 18:25:57 +01:00
SlightlyObscure
95f354ed74 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-18 18:17:02 +01:00
SlightlyObscure
6a0e9f791b key functionality + doors 2019-11-18 18:16:46 +01:00
99f352111b Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2019-11-18 17:31:00 +01:00
b3c7cf25bc Increase view distance of player 2019-11-18 17:18:02 +01:00
SlightlyObscure
09ae350b9e mmmhhh fixes 2019-11-18 16:39:26 +01:00
2b809f9894 Move player camera up for a height of 2m
The player was previously just 1m tall, which is rather small
2019-11-18 16:33:02 +01:00
SlightlyObscure
892f85e8ad doors exist and can be opened 2019-11-18 16:15:20 +01:00
SlightlyObscure
67d95714f6 added models for keys 2019-11-17 23:35:56 +01:00
761ff2f264 Meldewesen only follows player with low pill level 2019-11-11 23:02:38 +01:00