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 |
|
|
|
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
|
343fa46c3c
|
peaceful merge conflict
|
2019-11-18 20:04:36 +01:00 |
|
SlightlyObscure
|
1024e9bc69
|
added outline for interactions and key prompt
|
2019-11-18 20:00:45 +01:00 |
|
|
|
4f02c64752
|
Add a Meldewesen to the basic level concept
|
2019-11-18 18:58:53 +01:00 |
|
|
|
d40c9af92f
|
Move factory to own scene
|
2019-11-18 18:32:38 +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 |
|
|
|
5e8db31103
|
Add gameplay details to greyboxed level
Key and Meldewesen house
|
2019-11-18 17:30:36 +01:00 |
|
|
|
2bf8e0694b
|
Add basic greyboxed level
|
2019-11-18 17:19:51 +01:00 |
|
