Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
faef202
Repeat the map arrays over the torus
Sep 5, 2026
28a5172
Deal a repeated map's colonies to fresh teams and write it as a map
Sep 5, 2026
c4ce8cd
Let the map chooser repeat a map
Sep 5, 2026
8bcdf6f
Paint buildings and units in team colours on the map preview
Sep 5, 2026
bd8ecc6
Allow 32 x 32 maps in the editor
Sep 5, 2026
ff77bd9
Label the repeat controls and let the colony count lead
Sep 5, 2026
26b75f7
Add a headless dump of a repeated map's colonies
Sep 5, 2026
c475eed
Guard each bound update on its own line in dumpResources
Sep 5, 2026
1805c2f
Preview the repeated map and give the chooser room
Sep 5, 2026
2c02d5c
Keep each base together across the wrap and clip counts to the repeat
Sep 5, 2026
49eda81
Carry the remaining plain building and unit fields when repeating a map
Sep 5, 2026
c00f60e
Write tiled maps to the temp directory, not the maps folder
Sep 6, 2026
e8c8229
Add map tiling review screenshots
Giszmo Sep 12, 2026
a4ba323
Remove the review screenshots from the branch tip
Giszmo Sep 12, 2026
dd81750
Give every catalog exactly one entry for each tiling string
Giszmo Sep 12, 2026
a37fe29
Merge master into feat/map-tiling-rebased
genixpro Sep 14, 2026
9800072
Check that a LAN guest downloads a tiled map that exists only in temp
genixpro Sep 14, 2026
45e87e1
Carry painted areas and clearing flag choices over when repeating a map
genixpro Sep 14, 2026
f264a62
Offer 32 x 32 in the editor only, not the custom-game lobby
genixpro Sep 14, 2026
0fd6e80
Merge master into feat/map-tiling-rebased (#281, #282)
genixpro Sep 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,16 @@ jobs:
scons -j$(nproc) release=1 server=0 global-gradient-test
./build/src/GlobalGradientHarness

- name: Build and run the map tiling regression
run: |
scons -j$(nproc) release=1 server=0 map-tiling-test
python3 test/run-savegame-safety-tests.py build/src/MapTilingHarness

- name: Build and run the LAN session regression
run: |
scons -j$(nproc) release=1 server=0 lan-test
python3 test/run_lan_session_test.py build/src/LANSessionHarness
python3 test/run_lan_session_test.py build/src/LANSessionHarness --tiled --output output/lan-session-tiled

- name: Build and run the aspect-ratio regression
env:
Expand Down
14 changes: 14 additions & 0 deletions data/texts.ar.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2212,3 +2212,17 @@ OpenGL غير متوفر في هذا الإصدار.
يرجى الانتظار
[Map preview choose another]
اختر خريطة
[repeat map horizontally]
كرر الخريطة أفقيًا
[repeat map vertically]
كرر الخريطة عموديًا
[tile x]
تكرار x
[tile y]
تكرار y
[bases]
قواعد
[number of colonies]
عدد المستعمرات، واحدة لكل لاعب؛ زيادته تكرر الخريطة حتى تتسع لها
[bases per colony]
القواعد لكل مستعمرة؛ القاعدة فريق واحد من الخريطة كما رُسمت، بمبانيه ووحداته
14 changes: 14 additions & 0 deletions data/texts.br.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2210,3 +2210,17 @@ Klikit evit klask en-dro
Gortozit mar plij
[Map preview choose another]
Dibabit ur gartenn
[repeat map horizontally]
Repetir o mapa na horizontal
[repeat map vertically]
Repetir o mapa na vertical
[tile x]
repetição x
[tile y]
repetição y
[bases]
bases
[number of colonies]
Número de colônias, uma por jogador; aumentá-lo repete o mapa até que caibam
[bases per colony]
Bases por colônia; uma base é um time do mapa como foi desenhado, com seus prédios e unidades
14 changes: 14 additions & 0 deletions data/texts.ca.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2222,3 +2222,17 @@ Fes clic per tornar-ho a provar
Espera un moment
[Map preview choose another]
Tria un mapa
[repeat map horizontally]
Repeteix el mapa horitzontalment
[repeat map vertically]
Repeteix el mapa verticalment
[tile x]
repetició x
[tile y]
repetició y
[bases]
bases
[number of colonies]
Nombre de colònies, una per jugador; augmentar-lo repeteix el mapa fins que hi càpiguen
[bases per colony]
Bases per colònia; una base és un equip del mapa tal com està dibuixat, amb els seus edificis i unitats
14 changes: 14 additions & 0 deletions data/texts.cz.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2214,3 +2214,17 @@ Kliknutím zkuste znovu
Čekejte prosím
[Map preview choose another]
Vyberte mapu
[repeat map horizontally]
Opakovat mapu vodorovně
[repeat map vertically]
Opakovat mapu svisle
[tile x]
opakování x
[tile y]
opakování y
[bases]
základny
[number of colonies]
Počet kolonií, jedna na hráče; zvýšení opakuje mapu, dokud se nevejdou
[bases per colony]
Základny na kolonii; základna je jeden tým mapy tak, jak byla nakreslena, s jeho budovami a jednotkami
14 changes: 14 additions & 0 deletions data/texts.de.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2214,3 +2214,17 @@ Zum Wiederholen klicken
Bitte warten
[Map preview choose another]
Karte auswählen
[repeat map horizontally]
Karte horizontal wiederholen
[repeat map vertically]
Karte vertikal wiederholen
[tile x]
Wiederholung x
[tile y]
Wiederholung y
[bases]
Basen
[number of colonies]
Anzahl der Kolonien, eine pro Spieler; ein höherer Wert wiederholt die Karte, bis sie Platz finden
[bases per colony]
Basen pro Kolonie; eine Basis ist ein Team der gezeichneten Karte mit seinen Gebäuden und Einheiten
14 changes: 14 additions & 0 deletions data/texts.dk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2290,3 +2290,17 @@ Klik for at prøve igen
Vent venligst
[Map preview choose another]
Vælg et kort
[repeat map horizontally]
Gentag kortet vandret
[repeat map vertically]
Gentag kortet lodret
[tile x]
gentagelse x
[tile y]
gentagelse y
[bases]
baser
[number of colonies]
Antal kolonier, én pr. spiller; et højere tal gentager kortet, indtil de er plads til dem
[bases per colony]
Baser pr. koloni; en base er ét hold fra kortet, som det er tegnet, med dets bygninger og enheder
14 changes: 14 additions & 0 deletions data/texts.en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2212,3 +2212,17 @@ Click to retry
Please wait
[Map preview choose another]
Choose a map
[repeat map horizontally]
Repeat map horizontally
[repeat map vertically]
Repeat map vertically
[tile x]
tile x
[tile y]
tile y
[bases]
bases
[number of colonies]
Number of colonies, one per player; raising it repeats the map until they fit
[bases per colony]
Bases per colony; a base is one team of the map as drawn, its buildings and units
14 changes: 14 additions & 0 deletions data/texts.eo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2212,3 +2212,17 @@ Alklaku por reprovi
Bonvolu atendi
[Map preview choose another]
Elektu mapon
[repeat map horizontally]
Ripeti la mapon horizontale
[repeat map vertically]
Ripeti la mapon vertikale
[tile x]
ripeto x
[tile y]
ripeto y
[bases]
bazoj
[number of colonies]
Nombro de kolonioj, unu po ludanto; pliigi ĝin ripetas la mapon ĝis ili enspaciĝas
[bases per colony]
Bazoj po kolonio; bazo estas unu teamo de la mapo kiel desegnite, kun ĝiaj konstruaĵoj kaj unuoj
14 changes: 14 additions & 0 deletions data/texts.es.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2214,3 +2214,17 @@ Haz clic para reintentar
Espera un momento
[Map preview choose another]
Elige un mapa
[repeat map horizontally]
Repetir el mapa en horizontal
[repeat map vertically]
Repetir el mapa en vertical
[tile x]
repetición x
[tile y]
repetición y
[bases]
bases
[number of colonies]
Número de colonias, una por jugador; aumentarlo repite el mapa hasta que quepan
[bases per colony]
Bases por colonia; una base es un equipo del mapa tal como está dibujado, con sus edificios y unidades
14 changes: 14 additions & 0 deletions data/texts.eu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2224,3 +2224,17 @@ Egin klik berriro saiatzeko
Itxaron mesedez
[Map preview choose another]
Aukeratu mapa bat
[repeat map horizontally]
Errepikatu mapa horizontalki
[repeat map vertically]
Errepikatu mapa bertikalki
[tile x]
errepikapena x
[tile y]
errepikapena y
[bases]
baseak
[number of colonies]
Kolonia kopurua, bat jokalari bakoitzeko; handitzean mapa errepikatzen da denak sartu arte
[bases per colony]
Oinarriak koloniako; oinarria marraztutako maparen talde bat da, bere eraikin eta unitateekin
14 changes: 14 additions & 0 deletions data/texts.fa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2212,3 +2212,17 @@ OpenGL در این بیلد موجود نیست.
لطفاً صبر کنید
[Map preview choose another]
یک نقشه انتخاب کنید
[repeat map horizontally]
تکرار نقشه به صورت افقی
[repeat map vertically]
تکرار نقشه به صورت عمودی
[tile x]
تکرار x
[tile y]
تکرار y
[bases]
پایگاه‌ها
[number of colonies]
تعداد مستعمره‌ها، یکی برای هر بازیکن؛ افزایش آن نقشه را تکرار می‌کند تا جا شوند
[bases per colony]
پایگاه برای هر مستعمره؛ هر پایگاه یک تیم از نقشهٔ کشیده‌شده است، با ساختمان‌ها و واحدهایش
14 changes: 14 additions & 0 deletions data/texts.fi.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2214,3 +2214,17 @@ Yritä uudelleen napsauttamalla
Odota hetki
[Map preview choose another]
Valitse kartta
[repeat map horizontally]
Toista kartta vaakasuunnassa
[repeat map vertically]
Toista kartta pystysuunnassa
[tile x]
toisto x
[tile y]
toisto y
[bases]
tukikohtaa
[number of colonies]
Siirtokuntien määrä, yksi pelaajaa kohden; sen kasvattaminen toistaa karttaa, kunnes ne mahtuvat
[bases per colony]
Tukikohtia siirtokuntaa kohden; tukikohta on piirretyn kartan yksi joukkue rakennuksineen ja yksiköineen
14 changes: 14 additions & 0 deletions data/texts.fr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2224,3 +2224,17 @@ Cliquez pour réessayer
Veuillez patienter
[Map preview choose another]
Choisissez une carte
[repeat map horizontally]
Répéter la carte horizontalement
[repeat map vertically]
Répéter la carte verticalement
[tile x]
répétition x
[tile y]
répétition y
[bases]
bases
[number of colonies]
Nombre de colonies, une par joueur ; l'augmenter répète la carte jusqu'à ce qu'elles tiennent
[bases per colony]
Bases par colonie ; une base est une équipe de la carte telle que dessinée, avec ses bâtiments et ses unités
14 changes: 14 additions & 0 deletions data/texts.gr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2284,3 +2284,17 @@ Cortex
Παρακαλώ περιμένετε
[Map preview choose another]
Επιλέξτε χάρτη
[repeat map horizontally]
Επανάληψη χάρτη οριζόντια
[repeat map vertically]
Επανάληψη χάρτη κάθετα
[tile x]
επανάληψη x
[tile y]
επανάληψη y
[bases]
βάσεις
[number of colonies]
Αριθμός αποικιών, μία ανά παίκτη· η αύξησή του επαναλαμβάνει τον χάρτη μέχρι να χωρέσουν
[bases per colony]
Βάσεις ανά αποικία· βάση είναι μία ομάδα του χάρτη όπως σχεδιάστηκε, με τα κτίρια και τις μονάδες της
14 changes: 14 additions & 0 deletions data/texts.hu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2214,3 +2214,17 @@ Kattintson az újrapróbáláshoz
Kérem, várjon
[Map preview choose another]
Válasszon térképet
[repeat map horizontally]
Térkép ismétlése vízszintesen
[repeat map vertically]
Térkép ismétlése függőlegesen
[tile x]
ismétlés x
[tile y]
ismétlés y
[bases]
bázis
[number of colonies]
Kolóniák száma, játékosonként egy; növelése addig ismétli a térképet, amíg elférnek
[bases per colony]
Bázisok kolóniánként; egy bázis a megrajzolt térkép egy csapata, épületeivel és egységeivel
14 changes: 14 additions & 0 deletions data/texts.id.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2210,3 +2210,17 @@ Klik untuk mencoba lagi
Harap tunggu
[Map preview choose another]
Pilih peta
[repeat map horizontally]
Ulangi peta secara horizontal
[repeat map vertically]
Ulangi peta secara vertikal
[tile x]
ulang x
[tile y]
ulang y
[bases]
markas
[number of colonies]
Jumlah koloni, satu per pemain; menaikkannya mengulang peta sampai semuanya muat
[bases per colony]
Markas per koloni; satu markas adalah satu tim dari peta seperti digambar, beserta bangunan dan unitnya
14 changes: 14 additions & 0 deletions data/texts.it.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2276,3 +2276,17 @@ Fai clic per riprovare
Attendi
[Map preview choose another]
Scegli una mappa
[repeat map horizontally]
Ripeti la mappa in orizzontale
[repeat map vertically]
Ripeti la mappa in verticale
[tile x]
ripetizione x
[tile y]
ripetizione y
[bases]
basi
[number of colonies]
Numero di colonie, una per giocatore; aumentarlo ripete la mappa finché non ci stanno
[bases per colony]
Basi per colonia; una base è una squadra della mappa così come è disegnata, con i suoi edifici e le sue unità
14 changes: 14 additions & 0 deletions data/texts.ja.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2210,3 +2210,17 @@ Globulation 2 のカーソルを表示します。
お待ちください
[Map preview choose another]
マップを選択
[repeat map horizontally]
マップを横に繰り返す
[repeat map vertically]
マップを縦に繰り返す
[tile x]
繰り返し x
[tile y]
繰り返し y
[bases]
拠点
[number of colonies]
コロニーの数(プレイヤーごとに1つ)。増やすと収まるまでマップを繰り返します
[bases per colony]
コロニーあたりの拠点数。拠点とは描かれたマップの1チームで、その建物とユニットを含みます
7 changes: 7 additions & 0 deletions data/texts.keys.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1104,3 +1104,10 @@
[Map preview retry]
[Map preview please wait]
[Map preview choose another]
[repeat map horizontally]
[repeat map vertically]
[tile x]
[tile y]
[bases]
[number of colonies]
[bases per colony]
14 changes: 14 additions & 0 deletions data/texts.ko.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2210,3 +2210,17 @@ Globulation 2 커서를 표시합니다.
잠시 기다려 주세요
[Map preview choose another]
지도 선택
[repeat map horizontally]
맵을 가로로 반복
[repeat map vertically]
맵을 세로로 반복
[tile x]
반복 x
[tile y]
반복 y
[bases]
기지
[number of colonies]
식민지 수, 플레이어마다 하나; 늘리면 모두 들어갈 때까지 맵을 반복합니다
[bases per colony]
식민지당 기지 수; 기지는 그려진 맵의 한 팀과 그 건물 및 유닛입니다
14 changes: 14 additions & 0 deletions data/texts.nl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2238,3 +2238,17 @@ Klik om opnieuw te proberen
Even geduld
[Map preview choose another]
Kies een kaart
[repeat map horizontally]
Kaart horizontaal herhalen
[repeat map vertically]
Kaart verticaal herhalen
[tile x]
herhaling x
[tile y]
herhaling y
[bases]
bases
[number of colonies]
Aantal kolonies, één per speler; verhogen herhaalt de kaart tot ze passen
[bases per colony]
Bases per kolonie; een basis is één team van de kaart zoals getekend, met zijn gebouwen en eenheden
Loading
Loading