Merge branch 'devMechanics' into devPlayerStats

This commit is contained in:
Jan Schuffenhauer
2020-04-18 16:29:11 +02:00
parent 40ea76cc7c
commit dd870a1aa9
44 changed files with 1963 additions and 40 deletions

View File

@@ -42,8 +42,8 @@ SoundControler="*res://Autoloads/SoundControler.gd"
[display]
window/size/width=320
window/size/height=180
window/size/width=480
window/size/height=270
window/size/test_width=1280
window/size/test_height=720
window/stretch/mode="2d"
@@ -104,6 +104,16 @@ skip={
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null)
]
}
roll={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
]
}
attack={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
]
}
[layer_names]