Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_be.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Абраць Блок
 keybind.break_block.name = Разбурыць Блок
 keybind.select_all_units.name = Выбраць Ўсе Адзінкі
 keybind.select_all_unit_factories.name = Выбраць Усе Адзінкавыя Заводы
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Зняць Вылучэнне
 keybind.pickupCargo.name = Узяць Груз
 keybind.dropCargo.name = Бросіць Груз

core/assets/bundles/bundle_bg.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Вземи блок
 keybind.break_block.name = Унищожи блок
 keybind.select_all_units.name = Избери всички единици
 keybind.select_all_unit_factories.name = Избиране на всички фабрики за единици
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Премахни избора
 keybind.pickupCargo.name = Вземи товар
 keybind.dropCargo.name = Остави товар

core/assets/bundles/bundle_ca.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Selecciona un tipus de bloc des del mapa
 keybind.break_block.name = Desmunta un bloc
 keybind.select_all_units.name = Selecciona totes les unitats
 keybind.select_all_unit_factories.name = Selecciona totes les unitats fabricadores
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Cancel·la la selecció
 keybind.pickupCargo.name = Recull càrrega
 keybind.dropCargo.name = Deixa la càrrega

core/assets/bundles/bundle_cs.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Vybrat blok
 keybind.break_block.name = Rozbít blok
 keybind.select_all_units.name = Vybrat Všechny Jednotky
 keybind.select_all_unit_factories.name = Vybrat Všechny Továrny Jednotek
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Odznačit
 keybind.pickupCargo.name = Vyzvednout náklad
 keybind.dropCargo.name = Položit náklad

core/assets/bundles/bundle_da.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Tag blok
 keybind.break_block.name = Ødelæg blok
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Fravælg
 keybind.pickupCargo.name = Saml last op
 keybind.dropCargo.name = Smid last

core/assets/bundles/bundle_de.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Block auswählen
 keybind.break_block.name = Block zerstören
 keybind.select_all_units.name = Alle Einheiten auswählen
 keybind.select_all_unit_factories.name = Alle Einheitenfabriken auswählen
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Auswahl aufheben
 keybind.pickupCargo.name = Block aufheben
 keybind.dropCargo.name = Block fallen lassen

core/assets/bundles/bundle_es.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Copiar bloque
 keybind.break_block.name = Deconstruir bloque
 keybind.select_all_units.name = Seleccionar todas las unidades
 keybind.select_all_unit_factories.name = Seleccionar todas las fábricas de unidades
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deseleccionar
 keybind.pickupCargo.name = Cargar bloque/unidad
 keybind.dropCargo.name = Soltar bloque/unidad

core/assets/bundles/bundle_et.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Vali blokk
 keybind.break_block.name = Hävita blokk
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Tühista valik
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_eu.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Jaso blokea
 keybind.break_block.name = Apurtu blokea
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deshautatu
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_fi.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Ota palikka
 keybind.break_block.name = Riko palikka
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Poista valinta
 keybind.pickupCargo.name = Nosta lastia
 keybind.dropCargo.name = Pudota lastia

core/assets/bundles/bundle_fil.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_fr.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Choisir un bloc
 keybind.break_block.name = Supprimer un bloc
 keybind.select_all_units.name = Sélectionner toutes les Unités
 keybind.select_all_unit_factories.name = Sélectionner toutes les Usines d'Unités
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Désélectionner
 keybind.pickupCargo.name = Prendre un Chargement
 keybind.dropCargo.name = Lâcher un Chargement

core/assets/bundles/bundle_hu.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Blokk kiválasztása
 keybind.break_block.name = Blokk törlése
 keybind.select_all_units.name = Összes egység kijelölése
 keybind.select_all_unit_factories.name = Összes egységgyár kijelölése
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Blokk-kijelölés törlése
 keybind.pickupCargo.name = Rakomány felvétele
 keybind.dropCargo.name = Rakomány lerakása

core/assets/bundles/bundle_id_ID.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Memilih Blok
 keybind.break_block.name = Menghancurkan Blok
 keybind.select_all_units.name = Pilih Semua Unit
 keybind.select_all_unit_factories.name = Pilih Semua Pabrik Unit
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Batal Memilih
 keybind.pickupCargo.name = Angkat Muatan
 keybind.dropCargo.name = Turunkan Muatan

core/assets/bundles/bundle_it.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Scegli Blocco
 keybind.break_block.name = Rompi Blocco
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deseleziona
 keybind.pickupCargo.name = Raccogli Carico
 keybind.dropCargo.name = Rilascia Carico

core/assets/bundles/bundle_ja.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = ブロックの選択
 keybind.break_block.name = ブロックの破壊
 keybind.select_all_units.name = すべてのユニットを選択
 keybind.select_all_unit_factories.name = すべてのユニット工場を選択
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = 選択解除
 keybind.pickupCargo.name = 貨物を拾う
 keybind.dropCargo.name = 貨物を降ろす

core/assets/bundles/bundle_ko.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = 블록 선택
 keybind.break_block.name = 블록 파괴
 keybind.select_all_units.name = 전체 유닛 선택
 keybind.select_all_unit_factories.name = 전체 유닛 공장 선택
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = 선택 해제
 keybind.pickupCargo.name = 화물 집기
 keybind.dropCargo.name = 화물 내려놓기

core/assets/bundles/bundle_lt.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pasirinkti Bloką
 keybind.break_block.name = Išgriauti Bloką
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Panaikinti Pasirinkimą
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_nl.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Kies Blok
 keybind.break_block.name = Breek Blok
 keybind.select_all_units.name = Selecteer Alle Eenheden
 keybind.select_all_unit_factories.name = Selecteer Alle Eenheidsfabrieken
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselecteer
 keybind.pickupCargo.name = Pak Vracht Op
 keybind.dropCargo.name = Laat Vracht Vallen

core/assets/bundles/bundle_nl_BE.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_pl.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Wybierz Blok
 keybind.break_block.name = Zniszcz Blok
 keybind.select_all_units.name = Wybierz Wszystkie Jednostki
 keybind.select_all_unit_factories.name = Wybierz Wszystkie Fabryki Jednostek
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Odznacz
 keybind.pickupCargo.name = Podnieś Ładunek
 keybind.dropCargo.name = Opuść Ładunek

core/assets/bundles/bundle_pt_BR.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pegar bloco
 keybind.break_block.name = Quebrar bloco
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Desmarcar
 keybind.pickupCargo.name = Pegar Carga
 keybind.dropCargo.name = Soltar Carga

core/assets/bundles/bundle_pt_PT.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pegar Bloco
 keybind.break_block.name = Partir Bloco
 keybind.select_all_units.name = Selecionar Todas as Unidades
 keybind.select_all_unit_factories.name = Selecionar Todas as Fábricas
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Desselecionar
 keybind.pickupCargo.name = Pegar Carga
 keybind.dropCargo.name = Largar Carga

core/assets/bundles/bundle_ro.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Ia Bloc
 keybind.break_block.name = Distruge Bloc
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselectează
 keybind.pickupCargo.name = Ridică Încărcătura
 keybind.dropCargo.name = Aruncă Încărcătura

core/assets/bundles/bundle_ru.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Выбрать блок
 keybind.break_block.name = Разрушить блок
 keybind.select_all_units.name = Выбрать все единицы
 keybind.select_all_unit_factories.name = Выбрать все заводы единиц
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Снять выделение
 keybind.pickupCargo.name = Взять груз
 keybind.dropCargo.name = Сбросить груз

core/assets/bundles/bundle_sr.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Izaberi Blok
 keybind.break_block.name = Razori Blok
 keybind.select_all_units.name = Izaberi Sve Jedinice
 keybind.select_all_unit_factories.name = Izaberi Sve Fabrike Jedinica
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Uzmi Tovar
 keybind.dropCargo.name = Spusti Tovar

core/assets/bundles/bundle_sv.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_th.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = เลือกบล็อก
 keybind.break_block.name = ทุบบล็อก
 keybind.select_all_units.name = เลือกยูนิตทั้งหมด
 keybind.select_all_unit_factories.name = เลือกโรงงานยูนิตทั้งหมด
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = ยกเลิกการเลือก
 keybind.pickupCargo.name = ยกสิ่งบรรทุกขึ้น
 keybind.dropCargo.name = วางสิ่งบรรทุกลง

core/assets/bundles/bundle_tk.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.select_all_units.name = Select All Units
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Eldeki yapiyi birak
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo

core/assets/bundles/bundle_tr.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Blok Seç
 keybind.break_block.name = Blok Kır
 keybind.select_all_units.name = Tüm Birimleri Seç
 keybind.select_all_unit_factories.name = Select All Unit Factories
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Seçimleri Kaldır
 keybind.pickupCargo.name = Kargoyu Al
 keybind.dropCargo.name = Kargoyu Bırak

core/assets/bundles/bundle_uk_UA.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Вибрати блок
 keybind.break_block.name = Зламати блок
 keybind.select_all_units.name = Вибрати всі одиниці
 keybind.select_all_unit_factories.name = Вибрати всі заводи одиниць
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Скасувати
 keybind.pickupCargo.name = Взяти вантаж
 keybind.dropCargo.name = Скинути вантаж

core/assets/bundles/bundle_vi.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = Nhặt khối
 keybind.break_block.name = Phá khối
 keybind.select_all_units.name = Chọn tất cả đơn vị
 keybind.select_all_unit_factories.name = Chọn tất cả các nhà máy đơn vị
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = Bỏ chọn
 keybind.pickupCargo.name = Nhặt hàng
 keybind.dropCargo.name = Thả hàng

core/assets/bundles/bundle_zh_CN.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = 选择建筑
 keybind.break_block.name = 拆除建筑
 keybind.select_all_units.name = 选择所有单位
 keybind.select_all_unit_factories.name = 选择所有单位工厂
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = 取消选择
 keybind.pickupCargo.name = 拾取载荷
 keybind.dropCargo.name = 释放载荷

core/assets/bundles/bundle_zh_TW.properties

@@ -1359,6 +1359,8 @@ keybind.pick.name = 選擇方塊
 keybind.break_block.name = 移除方塊
 keybind.select_all_units.name = 選擇所有單位
 keybind.select_all_unit_factories.name = 選擇所有單位工廠
+keybind.select_all_unit_transport.name = Select All Unit Transports
+keybind.select_across_screen.name = Select Across Screen (Hold)
 keybind.deselect.name = 取消選取
 keybind.pickupCargo.name = 撿起貨物
 keybind.dropCargo.name = 丟棄貨物

core/assets/contributors

@@ -179,3 +179,4 @@ cardillan
 Justacommonegg
 IchMagSchokolade
 MonoChronos
+RushieWashie

core/src/mindustry/input/Binding.java

@@ -42,6 +42,8 @@ public class Binding{
 
     selectAllUnits = KeyBind.add("select_all_units", KeyCode.g),
     selectAllUnitFactories = KeyBind.add("select_all_unit_factories", KeyCode.h),
+    selectAllUnitTransport = KeyBind.add("select_all_unit_transport", KeyCode.unset),
+    selectAcrossScreen = KeyBind.add("select_across_screen", KeyCode.altLeft),
 
     cancelOrders = KeyBind.add("cancel_orders", KeyCode.unset),
 

core/src/mindustry/input/DesktopInput.java

@@ -294,9 +294,30 @@ public class DesktopInput extends InputHandler{
             if(input.keyTap(Binding.selectAllUnits)){
                 selectedUnits.clear();
                 commandBuildings.clear();
-                for(var unit : player.team().data().units){
+                if(input.keyDown(Binding.selectAcrossScreen)){
-                    if(unit.allowCommand()){
+                    camera.bounds(Tmp.r1);
-                        selectedUnits.add(unit);
+                    selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height));
+                }else {
+                    for(var unit : player.team().data().units){
+                        if(unit.allowCommand()){
+                            selectedUnits.add(unit);
+                        }
+                    }
+                }
+
+            }
+
+            if(input.keyTap(Binding.selectAllUnitTransport)){
+                selectedUnits.clear();
+                commandBuildings.clear();
+                if(input.keyDown(Binding.selectAcrossScreen)){
+                    camera.bounds(Tmp.r1);
+                    selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height, u -> u instanceof Payloadc));
+                }else {
+                    for(var unit : player.team().data().units){
+                        if(unit.allowCommand() && unit instanceof  Payloadc){
+                            selectedUnits.add(unit);
+                        }
                     }
                 }
             }
@@ -309,6 +330,10 @@ public class DesktopInput extends InputHandler{
                         commandBuildings.add(build);
                     }
                 }
+                if(input.keyDown(Binding.selectAcrossScreen)){
+                    camera.bounds(Tmp.r1);
+                    commandBuildings.retainAll(b -> Tmp.r1.overlaps(b.x - (b.hitSize() /2), b.y - (b.hitSize() /2), b.hitSize(), b.hitSize()));
+                }
             }
 
             for(int i = 0; i < controlGroupBindings.length; i++){