Merge remote-tracking branch 'origin/master'

This commit is contained in:
Epowerj
2022-10-30 16:54:20 -04:00
41 changed files with 107 additions and 19 deletions
+1
View File
@@ -1114,6 +1114,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Select Region keybind.schematic_select.name = Select Region
keybind.schematic_menu.name = Schematic Menu keybind.schematic_menu.name = Schematic Menu
keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_x.name = Flip Schematic X
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = наследуе курсорам
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Абраць вобласць keybind.schematic_select.name = Абраць вобласць
keybind.schematic_menu.name = Меню схем keybind.schematic_menu.name = Меню схем
keybind.schematic_flip_x.name = Адлюстраваць схему па восі X keybind.schematic_flip_x.name = Адлюстраваць схему па восі X
+1
View File
@@ -1101,6 +1101,7 @@ keybind.mouse_move.name = Следвай Мишката
keybind.pan.name = Панорамен Изглед keybind.pan.name = Панорамен Изглед
keybind.boost.name = Ускорение keybind.boost.name = Ускорение
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Избери Регион keybind.schematic_select.name = Избери Регион
keybind.schematic_menu.name = Меню със Схеми keybind.schematic_menu.name = Меню със Схеми
keybind.schematic_flip_x.name = Завърти Схема по X keybind.schematic_flip_x.name = Завърти Схема по X
+1
View File
@@ -1106,6 +1106,7 @@ keybind.mouse_move.name = Segueix el ratolí
keybind.pan.name = Desplaça la vista keybind.pan.name = Desplaça la vista
keybind.boost.name = Sobrevola keybind.boost.name = Sobrevola
keybind.command_mode.name = Mode de comandament keybind.command_mode.name = Mode de comandament
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Selecciona una regió keybind.schematic_select.name = Selecciona una regió
keybind.schematic_menu.name = Menú de plànols keybind.schematic_menu.name = Menú de plànols
keybind.schematic_flip_x.name = Volta el plànol horitzontalment keybind.schematic_flip_x.name = Volta el plànol horitzontalment
+1
View File
@@ -1103,6 +1103,7 @@ keybind.mouse_move.name = Následovat myš
keybind.pan.name = Následovat kameru keybind.pan.name = Následovat kameru
keybind.boost.name = Posílení keybind.boost.name = Posílení
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Vybrat oblast keybind.schematic_select.name = Vybrat oblast
keybind.schematic_menu.name = Nabídka šablon keybind.schematic_menu.name = Nabídka šablon
keybind.schematic_flip_x.name = Překlopit šablona podle svislé osy keybind.schematic_flip_x.name = Překlopit šablona podle svislé osy
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Følg musen
keybind.pan.name = Panorer billede keybind.pan.name = Panorer billede
keybind.boost.name = Forstærk keybind.boost.name = Forstærk
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Vælg region keybind.schematic_select.name = Vælg region
keybind.schematic_menu.name = Skabelon-visning keybind.schematic_menu.name = Skabelon-visning
keybind.schematic_flip_x.name = Flip skabelon X keybind.schematic_flip_x.name = Flip skabelon X
+1
View File
@@ -1106,6 +1106,7 @@ keybind.mouse_move.name = Der Maus folgen
keybind.pan.name = Kamera alleine bewegen keybind.pan.name = Kamera alleine bewegen
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Bereich auswählen keybind.schematic_select.name = Bereich auswählen
keybind.schematic_menu.name = Entwurfsmenü keybind.schematic_menu.name = Entwurfsmenü
keybind.schematic_flip_x.name = Entwurf umdrehen X keybind.schematic_flip_x.name = Entwurf umdrehen X
+1
View File
@@ -1112,6 +1112,7 @@ keybind.mouse_move.name = Seguir al cursor
keybind.pan.name = Desplazar la cámara keybind.pan.name = Desplazar la cámara
keybind.boost.name = Sobrevolar keybind.boost.name = Sobrevolar
keybind.command_mode.name = Modo Escuadrón keybind.command_mode.name = Modo Escuadrón
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Seleccionar región keybind.schematic_select.name = Seleccionar región
keybind.schematic_menu.name = Menú de esquemas keybind.schematic_menu.name = Menú de esquemas
keybind.schematic_flip_x.name = Invertir esquema X keybind.schematic_flip_x.name = Invertir esquema X
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Select Region keybind.schematic_select.name = Select Region
keybind.schematic_menu.name = Schematic Menu keybind.schematic_menu.name = Schematic Menu
keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_x.name = Flip Schematic X
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Hautatu eskualdea keybind.schematic_select.name = Hautatu eskualdea
keybind.schematic_menu.name = Eskema menua keybind.schematic_menu.name = Eskema menua
keybind.schematic_flip_x.name = Itzulbiratu X keybind.schematic_flip_x.name = Itzulbiratu X
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Seuraa Hiirtä
keybind.pan.name = Kelaa näkymää keybind.pan.name = Kelaa näkymää
keybind.boost.name = Tehosta keybind.boost.name = Tehosta
keybind.command_mode.name = Komentotila keybind.command_mode.name = Komentotila
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Valitse alue keybind.schematic_select.name = Valitse alue
keybind.schematic_menu.name = Kaavio Valikko keybind.schematic_menu.name = Kaavio Valikko
keybind.schematic_flip_x.name = Käännä kaavio X-akselilla keybind.schematic_flip_x.name = Käännä kaavio X-akselilla
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Select Region keybind.schematic_select.name = Select Region
keybind.schematic_menu.name = Schematic Menu keybind.schematic_menu.name = Schematic Menu
keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_x.name = Flip Schematic X
+1
View File
@@ -1111,6 +1111,7 @@ keybind.mouse_move.name = Suivre la souris
keybind.pan.name = Vue Panoramique keybind.pan.name = Vue Panoramique
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Mode « Commande » keybind.command_mode.name = Mode « Commande »
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Sélectionner une Région keybind.schematic_select.name = Sélectionner une Région
keybind.schematic_menu.name = Menu des schémas keybind.schematic_menu.name = Menu des schémas
keybind.schematic_flip_x.name = Retourner le schéma sur l'axe des X keybind.schematic_flip_x.name = Retourner le schéma sur l'axe des X
+1
View File
@@ -1100,6 +1100,7 @@ keybind.mouse_move.name = Egér követése
keybind.pan.name = Felderítés keybind.pan.name = Felderítés
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Terület kijelölése keybind.schematic_select.name = Terület kijelölése
keybind.schematic_menu.name = Schematic menü keybind.schematic_menu.name = Schematic menü
keybind.schematic_flip_x.name = Schematic tükrözése vízszintesen keybind.schematic_flip_x.name = Schematic tükrözése vízszintesen
@@ -1111,6 +1111,7 @@ keybind.mouse_move.name = Ikuti Tetikus
keybind.pan.name = Tampilan Geser keybind.pan.name = Tampilan Geser
keybind.boost.name = Dorongan keybind.boost.name = Dorongan
keybind.command_mode.name = Mode Perintah keybind.command_mode.name = Mode Perintah
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Pilih Daerah keybind.schematic_select.name = Pilih Daerah
keybind.schematic_menu.name = Menu Skema keybind.schematic_menu.name = Menu Skema
keybind.schematic_flip_x.name = Balik Skema X keybind.schematic_flip_x.name = Balik Skema X
+1
View File
@@ -1098,6 +1098,7 @@ keybind.mouse_move.name = Segui il Mouse
keybind.pan.name = Vista Panoramica keybind.pan.name = Vista Panoramica
keybind.boost.name = Scatto keybind.boost.name = Scatto
keybind.command_mode.name = Modalità di comando keybind.command_mode.name = Modalità di comando
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Seleziona Regione keybind.schematic_select.name = Seleziona Regione
keybind.schematic_menu.name = Menu Schematica keybind.schematic_menu.name = Menu Schematica
keybind.schematic_flip_x.name = Ruota Schematica Orizzontalmente keybind.schematic_flip_x.name = Ruota Schematica Orizzontalmente
+1
View File
@@ -1103,6 +1103,7 @@ keybind.mouse_move.name = マウスを追う
keybind.pan.name = 視点移動 keybind.pan.name = 視点移動
keybind.boost.name = ブースト keybind.boost.name = ブースト
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = 範囲選択 keybind.schematic_select.name = 範囲選択
keybind.schematic_menu.name = 設計図メニュー keybind.schematic_menu.name = 設計図メニュー
keybind.schematic_flip_x.name = 設計図をX座標で反転 keybind.schematic_flip_x.name = 設計図をX座標で反転
+1
View File
@@ -1104,6 +1104,7 @@ keybind.mouse_move.name = 커서를 따라서 이동
keybind.pan.name = 팬 보기 keybind.pan.name = 팬 보기
keybind.boost.name = 이륙 keybind.boost.name = 이륙
keybind.command_mode.name = 명령 모드 keybind.command_mode.name = 명령 모드
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = 영역 설정 keybind.schematic_select.name = 영역 설정
keybind.schematic_menu.name = 설계도 메뉴 keybind.schematic_menu.name = 설계도 메뉴
keybind.schematic_flip_x.name = 설계도 X축 뒤집기 keybind.schematic_flip_x.name = 설계도 X축 뒤집기
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Sekti Pelę
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Pasirinkite Regioną keybind.schematic_select.name = Pasirinkite Regioną
keybind.schematic_menu.name = Schemų Meniu keybind.schematic_menu.name = Schemų Meniu
keybind.schematic_flip_x.name = Apversti schemą per X ašį keybind.schematic_flip_x.name = Apversti schemą per X ašį
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Volg Muis
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Selecteer gebied keybind.schematic_select.name = Selecteer gebied
keybind.schematic_menu.name = Ontwerp Menu keybind.schematic_menu.name = Ontwerp Menu
keybind.schematic_flip_x.name = Spiegel ontwerp X keybind.schematic_flip_x.name = Spiegel ontwerp X
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Select Region keybind.schematic_select.name = Select Region
keybind.schematic_menu.name = Schematic Menu keybind.schematic_menu.name = Schematic Menu
keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_x.name = Flip Schematic X
+1
View File
@@ -1102,6 +1102,7 @@ keybind.mouse_move.name = Podążaj Za Myszą
keybind.pan.name = Widok Panoramiczny keybind.pan.name = Widok Panoramiczny
keybind.boost.name = Przyspiesz keybind.boost.name = Przyspiesz
keybind.command_mode.name = Tryb Komend keybind.command_mode.name = Tryb Komend
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Wybierz region keybind.schematic_select.name = Wybierz region
keybind.schematic_menu.name = Menu schematów keybind.schematic_menu.name = Menu schematów
keybind.schematic_flip_x.name = Obróć schemat w poziomie keybind.schematic_flip_x.name = Obróć schemat w poziomie
@@ -1113,6 +1113,7 @@ keybind.mouse_move.name = Seguir o Cursor
keybind.pan.name = Câmera livre keybind.pan.name = Câmera livre
keybind.boost.name = Impulsionar keybind.boost.name = Impulsionar
keybind.command_mode.name = Modo de Comando keybind.command_mode.name = Modo de Comando
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Selecionar região keybind.schematic_select.name = Selecionar região
keybind.schematic_menu.name = Menu de Esquemas keybind.schematic_menu.name = Menu de Esquemas
keybind.schematic_flip_x.name = Girar o Esquema no eixo X keybind.schematic_flip_x.name = Girar o Esquema no eixo X
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Selecionar região keybind.schematic_select.name = Selecionar região
keybind.schematic_menu.name = Menu esquemático keybind.schematic_menu.name = Menu esquemático
keybind.schematic_flip_x.name = Rodar esquema X keybind.schematic_flip_x.name = Rodar esquema X
+1
View File
@@ -1103,6 +1103,7 @@ keybind.mouse_move.name = Urmărește Mouseul
keybind.pan.name = Mișcă Harta keybind.pan.name = Mișcă Harta
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Selectează Regiunea keybind.schematic_select.name = Selectează Regiunea
keybind.schematic_menu.name = Meniu Scheme keybind.schematic_menu.name = Meniu Scheme
keybind.schematic_flip_x.name = Întoarce Schema X keybind.schematic_flip_x.name = Întoarce Schema X
+1
View File
@@ -1102,6 +1102,7 @@ keybind.mouse_move.name = Следовать за курсором
keybind.pan.name = Панорамирование камеры keybind.pan.name = Панорамирование камеры
keybind.boost.name = Полёт/ускорение keybind.boost.name = Полёт/ускорение
keybind.command_mode.name = Командование боевыми единицами keybind.command_mode.name = Командование боевыми единицами
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Выбрать область keybind.schematic_select.name = Выбрать область
keybind.schematic_menu.name = Меню схем keybind.schematic_menu.name = Меню схем
keybind.schematic_flip_x.name = Отразить схему по оси X keybind.schematic_flip_x.name = Отразить схему по оси X
+1
View File
@@ -1103,6 +1103,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Upravljački Mod keybind.command_mode.name = Upravljački Mod
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Izageri Region keybind.schematic_select.name = Izageri Region
keybind.schematic_menu.name = Menu Šema keybind.schematic_menu.name = Menu Šema
keybind.schematic_flip_x.name = Okreni Šemu X keybind.schematic_flip_x.name = Okreni Šemu X
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Select Region keybind.schematic_select.name = Select Region
keybind.schematic_menu.name = Schematic Menu keybind.schematic_menu.name = Schematic Menu
keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_x.name = Flip Schematic X
+1
View File
@@ -1104,6 +1104,7 @@ keybind.mouse_move.name = ตามเม้าส์
keybind.pan.name = เคลื่อนการมองเห็น keybind.pan.name = เคลื่อนการมองเห็น
keybind.boost.name = บูสต์ keybind.boost.name = บูสต์
keybind.command_mode.name = โหมดสั่งการ keybind.command_mode.name = โหมดสั่งการ
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = เลือกพื้นที่ keybind.schematic_select.name = เลือกพื้นที่
keybind.schematic_menu.name = เมนูแผนผัง keybind.schematic_menu.name = เมนูแผนผัง
keybind.schematic_flip_x.name = กลับด้านแผนผังแกน X keybind.schematic_flip_x.name = กลับด้านแผนผังแกน X
+1
View File
@@ -1091,6 +1091,7 @@ keybind.mouse_move.name = Follow Mouse
keybind.pan.name = Pan View keybind.pan.name = Pan View
keybind.boost.name = Boost keybind.boost.name = Boost
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Select Region keybind.schematic_select.name = Select Region
keybind.schematic_menu.name = Schematic Menu keybind.schematic_menu.name = Schematic Menu
keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_x.name = Flip Schematic X
+1
View File
@@ -1103,6 +1103,7 @@ keybind.mouse_move.name = Fareyi Takip Et
keybind.pan.name = Yatay Kaydırma Görünümü keybind.pan.name = Yatay Kaydırma Görünümü
keybind.boost.name = Yükselt keybind.boost.name = Yükselt
keybind.command_mode.name = Komuta Modu keybind.command_mode.name = Komuta Modu
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Bölge Seç keybind.schematic_select.name = Bölge Seç
keybind.schematic_menu.name = Şema Menüsü keybind.schematic_menu.name = Şema Menüsü
keybind.schematic_flip_x.name = Şemayı X ekseninde Döndür keybind.schematic_flip_x.name = Şemayı X ekseninde Döndür
@@ -1109,6 +1109,7 @@ keybind.mouse_move.name = Рухатися за мишею
keybind.pan.name = Політ камери за мишею keybind.pan.name = Політ камери за мишею
keybind.boost.name = Прискорення keybind.boost.name = Прискорення
keybind.command_mode.name = Режим командування keybind.command_mode.name = Режим командування
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Вибрати ділянку keybind.schematic_select.name = Вибрати ділянку
keybind.schematic_menu.name = Меню схем keybind.schematic_menu.name = Меню схем
keybind.schematic_flip_x.name = Віддзеркалити за віссю X keybind.schematic_flip_x.name = Віддзеркалити за віссю X
+1
View File
@@ -1103,6 +1103,7 @@ keybind.mouse_move.name = Theo chuột
keybind.pan.name = Di chuyển góc nhìn keybind.pan.name = Di chuyển góc nhìn
keybind.boost.name = Tăng tốc keybind.boost.name = Tăng tốc
keybind.command_mode.name = Command Mode keybind.command_mode.name = Command Mode
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = Chọn khu vực keybind.schematic_select.name = Chọn khu vực
keybind.schematic_menu.name = Menu bản thiết kế keybind.schematic_menu.name = Menu bản thiết kế
keybind.schematic_flip_x.name = Lật bản thiết kế X keybind.schematic_flip_x.name = Lật bản thiết kế X
@@ -1104,6 +1104,7 @@ keybind.mouse_move.name = 单位跟随鼠标
keybind.pan.name = 鼠标控制镜头 keybind.pan.name = 鼠标控制镜头
keybind.boost.name = 启动助推 keybind.boost.name = 启动助推
keybind.command_mode.name = 指挥模式 keybind.command_mode.name = 指挥模式
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = 框选建筑 keybind.schematic_select.name = 框选建筑
keybind.schematic_menu.name = 蓝图目录 keybind.schematic_menu.name = 蓝图目录
keybind.schematic_flip_x.name = 水平翻转 keybind.schematic_flip_x.name = 水平翻转
@@ -1111,6 +1111,7 @@ keybind.mouse_move.name = 跟隨滑鼠
keybind.pan.name = 平移鏡頭 keybind.pan.name = 平移鏡頭
keybind.boost.name = 加速 keybind.boost.name = 加速
keybind.command_mode.name = 指揮模式 keybind.command_mode.name = 指揮模式
keybind.rebuild_select.name = Rebuild Region
keybind.schematic_select.name = 選擇區域 keybind.schematic_select.name = 選擇區域
keybind.schematic_menu.name = 藍圖目錄 keybind.schematic_menu.name = 藍圖目錄
keybind.schematic_flip_x.name = X軸翻轉 keybind.schematic_flip_x.name = X軸翻轉
@@ -262,7 +262,7 @@ public class BlockRenderer{
public void drawDestroyed(){ public void drawDestroyed(){
if(!Core.settings.getBool("destroyedblocks")) return; if(!Core.settings.getBool("destroyedblocks")) return;
if(control.input.isPlacing() || control.input.isBreaking()){ if(control.input.isPlacing() || control.input.isBreaking() || control.input.isRebuildSelecting()){
brokenFade = Mathf.lerpDelta(brokenFade, 1f, 0.1f); brokenFade = Mathf.lerpDelta(brokenFade, 1f, 0.1f);
}else{ }else{
brokenFade = Mathf.lerpDelta(brokenFade, 0f, 0.1f); brokenFade = Mathf.lerpDelta(brokenFade, 0f, 0.1f);
+1
View File
@@ -31,6 +31,7 @@ public enum Binding implements KeyBind{
diagonal_placement(KeyCode.controlLeft), diagonal_placement(KeyCode.controlLeft),
pick(KeyCode.mouseMiddle), pick(KeyCode.mouseMiddle),
rebuild_select(KeyCode.b),
schematic_select(KeyCode.f), schematic_select(KeyCode.f),
schematic_flip_x(KeyCode.z), schematic_flip_x(KeyCode.z),
schematic_flip_y(KeyCode.x), schematic_flip_y(KeyCode.x),
+45 -3
View File
@@ -12,15 +12,20 @@ import arc.scene.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.entities.units.*; import mindustry.entities.units.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.game.Teams.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.input.Placement.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import java.util.*;
import static arc.Core.*; import static arc.Core.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
import static mindustry.input.PlaceMode.*; import static mindustry.input.PlaceMode.*;
@@ -109,9 +114,27 @@ public class DesktopInput extends InputHandler{
drawBreakSelection(selectX, selectY, cursorX, cursorY, !Core.input.keyDown(Binding.schematic_select) ? maxLength : Vars.maxSchematicSize); drawBreakSelection(selectX, selectY, cursorX, cursorY, !Core.input.keyDown(Binding.schematic_select) ? maxLength : Vars.maxSchematicSize);
} }
if(Core.input.keyDown(Binding.schematic_select) && !Core.scene.hasKeyboard() && mode != breaking){ if(!Core.scene.hasKeyboard() && mode != breaking){
if(Core.input.keyDown(Binding.schematic_select)){
drawSelection(schemX, schemY, cursorX, cursorY, Vars.maxSchematicSize); drawSelection(schemX, schemY, cursorX, cursorY, Vars.maxSchematicSize);
}else if(Core.input.keyDown(Binding.rebuild_select)){
//TODO color?
drawSelection(schemX, schemY, cursorX, cursorY, 0, Pal.sapBulletBack, Pal.sapBullet);
NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, schemX, schemY, cursorX, cursorY, false, 0, 1f);
Tmp.r1.set(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
for(BlockPlan plan : player.team().data().plans){
Block block = content.block(plan.block);
if(block.bounds(plan.x, plan.y, Tmp.r2).overlaps(Tmp.r1)){
drawSelected(plan.x, plan.y, content.block(plan.block), Pal.sapBullet);
} }
}
}
}
drawCommanded(); drawCommanded();
@@ -467,7 +490,7 @@ public class DesktopInput extends InputHandler{
player.unit().clearBuilding(); player.unit().clearBuilding();
} }
if(Core.input.keyTap(Binding.schematic_select) && !Core.scene.hasKeyboard() && mode != breaking){ if((Core.input.keyTap(Binding.schematic_select) || Core.input.keyTap(Binding.rebuild_select)) && !Core.scene.hasKeyboard() && mode != breaking){
schemX = rawCursorX; schemX = rawCursorX;
schemY = rawCursorY; schemY = rawCursorY;
} }
@@ -485,7 +508,8 @@ public class DesktopInput extends InputHandler{
selectPlans.clear(); selectPlans.clear();
} }
if(Core.input.keyRelease(Binding.schematic_select) && !Core.scene.hasKeyboard() && selectX == -1 && selectY == -1 && schemX != -1 && schemY != -1){ if( !Core.scene.hasKeyboard() && selectX == -1 && selectY == -1 && schemX != -1 && schemY != -1){
if(Core.input.keyRelease(Binding.schematic_select)){
lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY); lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY);
useSchematic(lastSchematic); useSchematic(lastSchematic);
if(selectPlans.isEmpty()){ if(selectPlans.isEmpty()){
@@ -493,6 +517,24 @@ public class DesktopInput extends InputHandler{
} }
schemX = -1; schemX = -1;
schemY = -1; schemY = -1;
}else if(input.keyRelease(Binding.rebuild_select)){
//TODO rebuild!!!
NormalizeResult result = Placement.normalizeArea(schemX, schemY, rawCursorX, rawCursorY, rotation, false, 999999999);
Tmp.r1.set(result.x * tilesize, result.y * tilesize, (result.x2 - result.x) * tilesize, (result.y2 - result.y) * tilesize);
Iterator<BlockPlan> broken = player.team().data().plans.iterator();
while(broken.hasNext()){
BlockPlan plan = broken.next();
Block block = content.block(plan.block);
if(block.bounds(plan.x, plan.y, Tmp.r2).overlaps(Tmp.r1)){
player.unit().addBuild(new BuildPlan(plan.x, plan.y, plan.rotation, content.block(plan.block), plan.config));
}
}
schemX = -1;
schemY = -1;
}
} }
if(!selectPlans.isEmpty()){ if(!selectPlans.isEmpty()){
+10 -2
View File
@@ -1165,13 +1165,17 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
protected void drawSelection(int x1, int y1, int x2, int y2, int maxLength){ protected void drawSelection(int x1, int y1, int x2, int y2, int maxLength){
drawSelection(x1, y1, x2, y2, maxLength, Pal.accentBack, Pal.accent);
}
protected void drawSelection(int x1, int y1, int x2, int y2, int maxLength, Color col1, Color col2){
NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, maxLength, 1f); NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, maxLength, 1f);
Lines.stroke(2f); Lines.stroke(2f);
Draw.color(Pal.accentBack); Draw.color(col1);
Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y); Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y);
Draw.color(Pal.accent); Draw.color(col2);
Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
} }
@@ -1486,6 +1490,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
return false; return false;
} }
public boolean isRebuildSelecting(){
return input.keyDown(Binding.rebuild_select);
}
public float mouseAngle(float x, float y){ public float mouseAngle(float x, float y){
return Core.input.mouseWorld(getMouseX(), getMouseY()).sub(x, y).angle(); return Core.input.mouseWorld(getMouseX(), getMouseY()).sub(x, y).angle();
} }
+1 -1
View File
@@ -1,5 +1,5 @@
package mindustry.input; package mindustry.input;
public enum PlaceMode{ public enum PlaceMode{
none, breaking, placing, schematicSelect none, breaking, placing, schematicSelect, rebuildSelect
} }
+2
View File
@@ -376,6 +376,7 @@ public class Placement{
} }
} }
if(maxLength > 0){
if(Math.abs(endx - tilex) > maxLength){ if(Math.abs(endx - tilex) > maxLength){
endx = Mathf.sign(endx - tilex) * maxLength + tilex; endx = Mathf.sign(endx - tilex) * maxLength + tilex;
} }
@@ -383,6 +384,7 @@ public class Placement{
if(Math.abs(endy - tiley) > maxLength){ if(Math.abs(endy - tiley) > maxLength){
endy = Mathf.sign(endy - tiley) * maxLength + tiley; endy = Mathf.sign(endy - tiley) * maxLength + tiley;
} }
}
int dx = endx - tilex, dy = endy - tiley; int dx = endx - tilex, dy = endy - tiley;