115 Commits

Author SHA1 Message Date
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
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
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
ab455bdd67 Fake house, new graphics 2020-01-28 15:59:36 +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
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
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
c412c91f4f Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace
# Conflicts:
#	Level/OutsideWorld.tscn
2020-01-28 11:42:21 +01:00
e637a76e78 new nav paths for worker spawner 2020-01-28 11:26:37 +01:00
76d2c77a29 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-28 11:21:53 +01:00
SlightlyObscure
52ebb1bc24 now with 12% more walls 2020-01-28 00:14:27 +01:00
a8d78f70fe Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-27 18:04:49 +01:00
1984c3c6b8 Add street mesh (not done yet) 2020-01-27 18:04:32 +01:00
Leon Palluch
6ebab1cdfa Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-27 17:52:53 +01:00
Leon Palluch
dd8ef49694 walls walls walls 2020-01-27 17:52:40 +01:00
88a9cb49b5 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-27 17:25:42 +01:00
780006100e Add new building meshes 2020-01-27 17:25:30 +01:00
5638977ac8 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-27 17:15:55 +01:00
e39d7e42fb #31 so far... 2020-01-27 17:15:22 +01:00
Leon Palluch
47b17b65c3 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace 2020-01-27 16:44:21 +01:00
Leon Palluch
af6ba98abf added model for lvl2 keycard 2020-01-27 16:44:17 +01:00
2779be0e0e #31 2020-01-27 16:41:33 +01:00
d79735da24 Add labyrinth music 2020-01-27 16:00:58 +01:00
Leon Palluch
7322407c1c fucking mikey 2.0 2020-01-27 15:19:07 +01:00
Leon Palluch
14a7c3023a fucking mikey 2020-01-27 15:13:09 +01:00
Leon Palluch
f63312c755 added secret door to factory 2020-01-27 15:10:18 +01:00
73515e0454 cock sound only outside 2020-01-27 14:56:54 +01:00
24baf9b6b8 Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace
# Conflicts:
#	Level/InFactory.tscn
2020-01-27 14:51:17 +01:00
a47e2d143e cock sounds only outside 2020-01-27 14:50:14 +01:00
1c79e4cfad Add factory music (reacts to lever machine start) 2020-01-27 14:46:52 +01:00
Leon Palluch
791094c0a7 mergy merge 2020-01-27 14:31:25 +01:00