daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts when trying to merge main into forest

Browse Source
This commit is contained in:
Jasmine Hyder
2021-12-08 14:43:39 -06:00
parent 1a8ef7ff92 d6e7dd9db3
commit 6d9267d23b
131 changed files with 3271 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
project.godot
View File

@@ -47,6 +47,14 @@ player_up={
player_down={
"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":83,"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)
, 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)
]
}
screenshot={
@@ -55,6 +63,12 @@ screenshot={
]
}
[layer_names]
2d_physics/layer_1="Immovable"
2d_physics/layer_2="Player"
2d_physics/layer_3="Enemies"
[physics]
common/enable_pause_aware_picking=true