Merge remote-tracking branch 'sasha/master'

# Conflicts:
#	scripts/interfer.gd
This commit is contained in:
MaD_CaT
2025-07-25 14:13:02 +03:00
19 changed files with 378 additions and 271 deletions

View File

@@ -33,8 +33,8 @@ config/mod_bus_driver_port="48000"
config/mod_bus_driver_address="localhost"
interfer/resend_timeout=1000.0
config/external_cu=false
config/unit_afsp_left_bort="http://127.0.0.1:8080/reports/left_SelfTestReport.json"
config/unit_afsp_right_bort="http://127.0.0.1:8080/reports/right_SelfTestReport.json"
config/unit_afsp_left_bort="http://127.0.0.1:8000/selftest_left.json"
config/unit_afsp_right_bort="http://127.0.0.1:8000/selftest_right.json"
config/unit_rr_request_period=5.0
config/kems_files_path="user://kems/"
config/emsg_files_path="user://emsg/"
@@ -84,7 +84,7 @@ gdscript/warnings/integer_division=0
window/size/viewport_width=1600
window/size/viewport_height=1200
window/size/mode=3
window/size/window_height_override=768
window/subwindows/embed_subwindows=false
window/stretch/mode="canvas_items"
window/dpi/allow_hidpi=false