Skip to content

Commit b84d6ba

Browse files
Merge branch 'master' into Publishing_Branch_Playground_Steam
2 parents 45dc018 + 6df5c47 commit b84d6ba

File tree

13 files changed

+72
-64
lines changed

13 files changed

+72
-64
lines changed

assets/i18n/localization.csv

Lines changed: 53 additions & 52 deletions
Large diffs are not rendered by default.
44 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.
20 Bytes
Binary file not shown.
52 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.
32 Bytes
Binary file not shown.
20 Bytes
Binary file not shown.

global/autoload/audio/audio.tscn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ idle_audio_stream = ExtResource("10_5odgy")
2424
combat_audio_stream = ExtResource("9_86iap")
2525

2626
[node name="Audio" type="Node"]
27+
process_mode = 3
2728
script = ExtResource("1_7i6rq")
2829

2930
[node name="SfxQueue" parent="." instance=ExtResource("2_bb4fe")]

project.godot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ swap_music_next={
105105
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":77,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
106106
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":77,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
107107
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":77,"unicode":0,"location":0,"echo":false,"script":null)
108+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":78,"key_label":0,"unicode":110,"location":0,"echo":false,"script":null)
109+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":78,"physical_keycode":0,"key_label":0,"unicode":110,"location":0,"echo":false,"script":null)
110+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":78,"unicode":110,"location":0,"echo":false,"script":null)
108111
]
109112
}
110113
master_music_toggle={

0 commit comments

Comments
 (0)