Merge branch 'main' into tiff

This commit is contained in:
tiffanyfrias10
2021-12-05 20:05:14 -06:00
115 changed files with 3371 additions and 107 deletions

View File

@@ -54,6 +54,17 @@ screenshot={
"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":16777245,"unicode":0,"echo":false,"script":null)
]
}
player_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]
2d_physics/layer_1="Immovable"
2d_physics/layer_2="Player"
2d_physics/layer_3="Enemies"
[physics]