Sync upstream into main - #4

Open

github-actions[bot] wants to merge 129 commits into

mainfrom

Commits on Jun 18, 2026

SolLua: use sol::lua_nil instead of the sol::nil alias

MarkKropf
authored and
sprunk
committed
a43ebcd
float3: drop redundant direct streflop_cond.h include

authored and
sprunk
committed
3e83e20
SafeUtil: include <type_traits> and <memory> directly (#3025)

authored
517608f

Commits on Jun 19, 2026

LuaTextures: log glTexImage failures instead of returning nil silently

iamaperson000
authored and
sprunk
committed
6318fb6
fix: guard against already-dead reclaim targets (#3020)
bruno-dasilva
authored
54348ff

Commits on Jun 20, 2026

CUtils: use const dirent* for the scandir selector on all platforms

tomjn
authored and
sprunk
committed
e91a58f
legacy: only require X11 on non-Apple UNIX

tomjn
authored and
sprunk
committed
580100a
FindSevenZip: also accept the 7zz binary name

tomjn
authored and
sprunk
committed
d13dcd3
macOS: remove dead SDL 1.2-era SDLMain.{m,h}

tomjn
authored and
sprunk
committed
0da81b4

Commits on Jun 21, 2026

Fix SplinterFaction card link format
ScarylePoo
authored
83642b0

Commits on Jun 22, 2026

fix: update section min-level in place instead of appending duplicates (#3052)

bruno-dasilva
and
claude
authored
13b6804

Commits on Jun 23, 2026

Convert `u8string_view` to `string` using explicit size

devgit283
authored and
sprunk
committed
1caa3c5
Fix inconsistent class/struct forward declarations

devgit283
authored and
sprunk
committed
2186ee4

Commits on Jun 25, 2026

macOS: guard X11/Xlib.h include for non-X11 platforms

tomjn
authored and
sprunk
committed
a854046

Commits on Jun 29, 2026

fix: address sse2neon/streflop macro redefinition warning (#2999)
bruno-dasilva
authored
ab68d6f
glad: do not build the GLX loader on macOS

tomjn
authored and
sprunk
committed
52b55cf
docs: add ENGINE_PERFORMANCE.md with some notes on engine internals (#2919)

bruno-dasilva
and
claude
authored
4034d5a
System: add missing <algorithm> includes for libc++

tomjn
authored and
sprunk
committed
7e07543
DemoTool: link nowide and fmt for their include directories

authored and
sprunk
committed
cf3b083
Fix truncated sync checksum in demotool dump

burnhamrobertp
authored and
sprunk
committed
f898efc

Commits on Jun 30, 2026

Portability in archive handlers
tomjn
authored
8141bf2

Commits on Jul 1, 2026

Commits on Jul 2, 2026

Move `isHeadless` from `Engine` to `Platform`. (#3067)
sprunk
authored
d313449
Add Lua trace ray functions (#1624)
12345swordy
authored
092cb0a

Commits on Jul 4, 2026

Fix #3019, missing include
sprunk
committed
f1df2dc
Fix #2987, edge scrolling threshold
sprunk
committed
a15b7b3
Add type checking to ADD_FOO Lua defs macros
sprunk
committed
2b85283
Remove legacy engineoptions
sprunk
committed
ed68dc1

Commits on Jul 6, 2026

fix desync
lostsquirrel1
committed
615d257

Commits on Jul 7, 2026

SpringMath: add Catmull-Rom bicubic interpolation helpers

authored and
sprunk
committed
c420138

Commits on Jul 8, 2026

Update BARb 1.6.26
rlcevg
committed
6eecb24

Commits on Jul 9, 2026

fix: links to other getting-started pages

L01sValencia
authored and
sprunk
committed
62206aa
Fix LuaSocket VFS mode error in LuaMenu
tomjn
authored
2d4b031

Commits on Jul 10, 2026

Fix various typos in site articles (#3090)
L01sValencia
authored
21b121c
Dump state handles resource packs
sprunk
committed
2ccc5c0
doc/site: rename 7Z_VERSION env var so mise/Tera can parse it

tomjn
authored and
sprunk
committed
74408d1
System: move float3/float4/Matrix44f str() out of line

tomjn
authored and
sprunk
committed
0ea0be0
Remove Java AI bindings (#3059)
12345swordy
authored
c5cb63a

Commits on Jul 13, 2026

Fix unbindaction not clearing scancode bindings

burnhamrobertp
authored and
sprunk
committed
9c2cb5f
fix: bump pr-downloader to suppress false positive gcc warning

bruno-dasilva
authored and
sprunk
committed
6c97815
`Spring.SetSkyBoxTexture` performs setup if needed
PtaQQ
authored
3b76f97
LuaParser: run Spring.TimeCheck's callback under unitsync/dedicated

tomjn
authored and
sprunk
committed
d306d39

Commits on Jul 14, 2026

fix wide char to utf8 conversions. (#3100)
lostsquirrel1
authored
598d866

Commits on Jul 15, 2026

Commits on Jul 16, 2026

Add `gadget:ResourceExcess(excessTable) -> bool`
sprunk
committed
3f7e649
Add spAddTeamResourceExcessStats

keithharvey
authored and
sprunk
committed
c5fa84d
Add debug.emulateMouseWheel input emulation

burnhamrobertp
authored and
sprunk
committed
d5cc495

Commits on Jul 17, 2026

Add a `cancelcommand` action
burnhamrobertp
authored
75e64c5

Commits on Jul 18, 2026

Update changelog.
sprunk
committed
708f074

Commits on Jul 19, 2026

Commits on Jul 20, 2026

Bump game version in synctest.yml
bruno-dasilva
authored
8059a16
Fix `/unbind` for keychains
burnhamrobertp
authored
359436d

Commits on Jul 21, 2026

Fix stale `spGetActionHotKeys` returns (#3082)
burnhamrobertp
authored
a23be68

Commits on Jul 22, 2026

Fixes to `Spring.SetMapShader` (#3127)
PtaQQ
authored
48e9b00
Optimize LuaPushNamedFoo using compile time key hashing (#2986)
dargem
authored
8e677dc

Commits on Jul 23, 2026

Debug logs for loading splat normals

PtaQQ
authored and
sprunk
committed
946aabe
Fix SMF DNTS gating and fallback textures

PtaQQ
authored and
sprunk
committed
510b1ae
Add mapoptions for blank map splats

PtaQQ
authored and
sprunk
committed
bcd9533

Commits on Jul 26, 2026

fix(synctest): workaround widget timing nondeterminism (#3124)
bruno-dasilva
authored
1f5323a

Commits on Jul 27, 2026

Commits on Jul 28, 2026

Fix units having the wrong path id after loading a save game. (#3120)
shawjef3
authored
ae7a172
Update changelog for PR 3120
lostsquirrel1
committed
fcafdea
Support alternate file extensions for replays (#2975)

BElluu
and
sprunk
authored
d16867b
Update BARb 1.6.27 (#3130)
rlcevg
authored
50ce22b
fix: link test_DemoFileExtension against ZLIB::ZLIB for windows build (#3139)

authored
22dd314
Updated changelog
lostsquirrel1
committed
77e9065
Sim/COB: avoid UB in float-to-short angle casts (fixes arm64/x86 desync) (#3075)
tomjn
authored
7104ab1

Commits on Jul 29, 2026

Fail loading when modrules parsing fails
12345swordy
authored
44ff15f
refactor: extract ghost drawing to DrawGhostedBuildings (#3107)

lostsquirrel1
and
bruno-dasilva
authored
1435ef8
fix(GLSL/GL4): draw ghost buildings with the palette they were last seen under (#3108)

lostsquirrel1
and
bruno-dasilva
authored
eab1615
refactor(GL4): extract EmplaceInstance submission primitive (#3109)

lostsquirrel1
and
bruno-dasilva
authored
223f924
perf(GL4): batch ghost-building rendering (#3110)

lostsquirrel1
and
bruno-dasilva
authored
1dfbd72
Changes: (#3066)
Nouridin
authored
e238786
MouseHandler: route XButtons (Mouse4/5) as keybinds instead of mouse ownership (#2613)
color-dev
authored
bdd7662
Update changelog
lostsquirrel1
committed
3d1e961
Bar 106 fix publish workflow (#3146)
lostsquirrel1
authored
3fdeec0
fix changelog page 2026.06
lostsquirrel1
committed
e39c69a
smmalloc: drop the leaked INLINE macro in a single wrapper header (#3026)

tomjn
and
MarkKropf
authored
d6e9943
Remove all instances of 32 bit support from cmake file (#3033)

12345swordy
and
12345swordy
authored
ae77ffd
send gameprogress packet on connection initialization (#2872)
loveridge
authored
694a832
Explicitly use InSonarJammer or InJammer depending on the tested sensor (#2980)
Fx-Doo
authored
586b1cd
fix: minor Lua EmmyLua type annotations (#2888)
keithharvey
authored
e7f8488
Tweak ASAN compile & fix a couple of bugs (#2663)

authored
f2a681d
update changelog
lostsquirrel1
committed
2cd3aac

Commits on Jul 31, 2026

Fix recent changelogs and prepare changelogs for release 2026.07
lostsquirrel1
committed
9bec68d
Update BARb 1.6.28 (#3153)
rlcevg
authored
de6a435
update changelog
lostsquirrel1
committed
4d06613

Commits on Aug 1, 2026

Rewrite 2026.06 and 2026.07 changelogs (#3143)
sprunk
authored
e52532e

Commits on Aug 3, 2026

fix(LuaVBO): CopyTo() now properly manages cpu-side copies of the data (#3167)
bruno-dasilva
authored
4f036c5

Commits on Aug 4, 2026

Commits on Aug 5, 2026

update changelog
lostsquirrel1
committed
528d1fb

Commits on Aug 6, 2026

Team docs: remove references to Java
sprunk
authored
c934419
DemoTool: fix the build after the alternate replay extension change
tomjn
authored
a863df0

Commits on Aug 9, 2026

Document function aliases for Lua functions (#3188)
rhys-vdw
authored
a96899a

Commits on Aug 11, 2026

Windows: undefine the MemoryBarrier macro
gajop
authored
83bf625
unitsync: release Lua memory pool on shutdown
gajop
authored
d128390
Grass and shaders now respect `Spring.SetSunDirection` calls
gajop
authored
4bb88d5

Commits on Aug 12, 2026

Commits on Aug 16, 2026

Fix #2135, document spGetUnitStates overloads (#3227)
sparr
authored
a1623ce

Commits on Aug 17, 2026

Commits on Aug 18, 2026

Enforce alignment for std::aligned_alloc (#3178)
rlcevg
authored
3d08c67

Commits on Aug 20, 2026

Commits on Aug 21, 2026

Stop per-frame atlas log spam while the window is minimized (#3245)

Ruwetuin
and
claude
authored
bcdca85
docs: spGetIconData can return nil (#3247)
sparr
authored
be25d4b
docs: spGetMouseState returns bools for pressed (#3248)
sparr
authored
0f6b013

Commits on Aug 24, 2026

fix a unit test failing on OpenBSD/aarch64 (#3251)
brad0
authored
fa50380
headless: add the glTexCoord4fv stub (#3273)
tomjn
authored
5f16d64

Commits on Aug 25, 2026

Fix macOS stack overflow when loading a savegame (#3270)
Vandomas
authored
fee8a3e

Commits on Aug 26, 2026