44 Commits

Author SHA1 Message Date
b7a53651bb Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 15:01:14 +01:00
844091a464 Add tree / tentacle things and environment mesh 2020-01-28 14:36:25 +01:00
6cacaf6a2e #55 /spend 1h 2020-01-28 14:34:07 +01:00
Leon Palluch
c0221a8259 fixed player ray cast 2020-01-27 15:21:49 +01:00
a51eec71b1 Fix window scaling not being applied on viewport 2020-01-27 00:41:16 +01:00
Ententerminator
c8155d3080 daytime visuals added 2020-01-26 23:57:12 +01:00
bfa4fa77f1 added day cycle restart sound 2020-01-26 16:45:25 +01:00
8bc640e98c player was forced on a diet because he didn't fit anymore through doors 2020-01-26 16:32:57 +01:00
5f4bb0ffa4 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-26 00:52:44 +01:00
060d0e6081 Make player viewports render shadows 2020-01-26 00:52:03 +01:00
588167dbae #43 #43 46 2020-01-26 00:48:08 +01:00
Ententerminator
f21e5855b9 grobe daytime visuals graphics oder so 2020-01-25 19:21:28 +01:00
fc0eb63dc8 Fix issues with pill levels and collision 2020-01-08 11:37:26 +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
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
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
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
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
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
9599d80b62 - preparations for HUD 2019-11-19 12:08:11 +01:00
SlightlyObscure
469f254644 removed an oppsie 2019-11-18 18:25:57 +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
f67b7e6361 Meldewesen player visibility works with new Player 2019-11-11 10:20:23 +01:00
341c8ba2f2 - some improvements, beautify code *_* 2019-11-02 19:53:07 +01:00
f280e6e349 - added basic movement and camera control
- collsion with floor does not work!
2019-11-02 19:02:16 +01:00
b88d68d27b - added Player 2019-11-02 16:04:03 +01:00