Skip to content

Merge master into multiplayer - #31

Merged
maxis27 merged 9 commits into
multiplayerfrom
master
Oct 1, 2026
Merged

maxis27 merged 9 commits into
multiplayerfrom
master

Conversation

@maxis27

@maxis27 maxis27 commented Oct 1, 2026

Copy link
Copy Markdown
Owner

Requested by Mateusz · project thread

Before: multiplayer was 9 commits behind the fork's master.

After: multiplayer has the latest upstream changes from master (26b7159, same as Try/OpenGothic master).

How: merges master into multiplayer. It merges cleanly (CMakeLists.txt and common/mainwindow.cpp auto-merged). Commits brought in:

🤖 Generated with Claude Code

https://claude.ai/code/session_01B8saeyNHhzeSwDffAyu2Bx


Generated by Claude Code

@maxis27 maxis27 self-assigned this Oct 1, 2026
@maxis27
maxis27 merged commit e88b087 into multiplayer Oct 1, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants