231 Commits

Author SHA1 Message Date
1536dc4e67 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 18:29:41 +01:00
317258f344 bugfix: removing collectibles after collect; checking right key lvls 2020-01-28 18:29:11 +01:00
Leon Palluch
846a84db93 restarted time in factory 2020-01-28 18:27:49 +01:00
6a49d7ea5e Re-add factory music 2020-01-28 18:20:36 +01:00
02803ec9fb Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 18:15:24 +01:00
545e92a82e Tweak parameter towards release thigns 2020-01-28 18:15:12 +01:00
Ententerminator
d57594e8bd masked smoke 2020-01-28 18:09:14 +01:00
4d30239030 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 18:01:14 +01:00
Leon Palluch
94e36c1db3 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 18:00:51 +01:00
Leon Palluch
a0b73a9ebd factory trees 2020-01-28 18:00:37 +01:00
9ab426fcbe Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 18:00:11 +01:00
8c865a85c7 More Meldewesen / better things 2020-01-28 18:00:03 +01:00
Ententerminator
0b31bda8c5 mergeSurge 2020-01-28 17:56:25 +01:00
Ententerminator
b79f21ad1f factory masked and true 2020-01-28 17:56:02 +01:00
88d0b65261 duplicating collectibles for global inventory 2020-01-28 17:52:32 +01:00
a8e1dfcc3f Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 17:43:43 +01:00
0e2e48b7d5 singleton inventory 2020-01-28 17:43:21 +01:00
a70f992ea3 Move player back home if caught 2020-01-28 17:41:51 +01:00
Leon Palluch
519bdfebac Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 17:35:14 +01:00
Leon Palluch
dca81e4726 factory room decoration 2020-01-28 17:35:07 +01:00
bdaa4e4e3b Set outsideworld key card id to 1 2020-01-28 17:34:06 +01:00
46cc87389e Set key id in player house door to 20 2020-01-28 17:32:35 +01:00
5f9ae3450b Tunnel scene work + minor material fixes 2020-01-28 17:00:48 +01:00
edea7fc8b4 Fix Meldewesen visibility cone issues 2020-01-28 16:42:04 +01:00
c52cb0b885 Secret tunnel entrance in player house 2020-01-28 16:20:03 +01:00
2b24f99d8c Weird bugfix for project.godot 2020-01-28 16:19:38 +01:00
04784770df Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 16:05:56 +01:00
879839d36d Also interpolate light energy depending on daytime 2020-01-28 16:05:41 +01:00
ab455bdd67 Fake house, new graphics 2020-01-28 15:59:36 +01:00
b5689a5511 pillometer texture change depending on pill level 2020-01-28 15:52:57 +01:00
ef7529332f classes for key and keycard to be able to add items depending on class 2020-01-28 15:35:08 +01:00
b7a53651bb Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 15:01:14 +01:00
9e1ae38836 Finish labyrinth + win area 2020-01-28 15:00:59 +01:00
1430afdf6c less noises 2020-01-28 14:55:33 +01:00
a71a637c16 keycards and keys are per default collectible 2020-01-28 14:54:08 +01:00
c84c4bf370 Finish Labyrinth workflow 2020-01-28 14:37:17 +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
2d167726b3 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 14:12:22 +01:00
b6c129897b Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 13:42:45 +01:00
9ad6d9756c fixed behavior: Meldewesen runs back after player is not suspicious anymore 2020-01-28 13:42:23 +01:00
8a785ecdbc Make Meldewesen cone material local to prevent it from changing in all 2020-01-28 12:32:51 +01:00
ec939904fc Better scaling of visibility 2020-01-28 12:15:21 +01:00
fa69ab0897 Meldewesen visibility shouldn't go through walls anymore 2020-01-28 12:11:49 +01:00
ab28e19b8a Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 11:57:50 +01:00
aa27e11bb8 New ground stuff 2020-01-28 11:52:22 +01:00
f53784c746 preload workers 2020-01-28 11:47:16 +01:00
40db91aec2 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 11:42:32 +01:00
c412c91f4f Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace
# Conflicts:
#	Level/OutsideWorld.tscn
2020-01-28 11:42:21 +01:00
e70cb934b7 Move Environment script 2020-01-28 11:32:35 +01:00