mirror of
https://github.com/Cesarus85/ringfall-mjolnir-vr.git
synced 2026-10-17 18:00:25 +02:00
Conflicts: - rasterizer.h: upstream raised the transparent geometry groups to 2048 as we had (halo_port_capacity.h); theirs. - d3d8_gl.c: the ES capabilities' log with upstream's base vertex and our multiview. - p2p.c, p2p_internal.h, p2p_signal.c: upstream's several joins and reconnect, with our join codes' state and the codes' and public list's updates each pass. - network_server_manager.c: a machine downloading the map is not refused, and the bots' room logic stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>