Merge branch 'sasha80'

# Conflicts: # consts.gd
2024-08-16 08:47:01 +03:00
parent d79cad1600 350440da38
commit a23199d20a
2 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ mono_crash.*.json
 /.idea/
 /bin/
 /build/
+/bin/
 /html/
 /commit.gd
 /.godot/
--- a/consts.gd
+++ b/consts.gd
@@ -5,7 +5,7 @@ const MENU_SCENE_FILE: String = 'res://меню.tscn'

 # Адрес имитатора
 const MAIN_ADDR = [ '127.0.0.1',  42022 ]
-const DST_ADDR = [ '127.0.0.1',   42023 ]
+const DST_ADDR =  [ '127.0.0.1',   42023 ]


 const TABLE_ROW_HIGHT    = 34                       # Высота строки таблицы в пикселях