Repository navigation
Merge master into multiplayer - #33
Merged
Merged
Conversation
* Added a basic Android APK build * Addressed Android build integration review * Use the hosted SDK manager path * Applied Android review cleanup * case insensitive path to external files * Update Tempest * Update Tempest * cleanups --------- Co-authored-by: Try <try9998@gmail.com>
Resolve the CMakeLists.txt conflict by keeping both the multiplayer test targets and upstream's Android APK target. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B8saeyNHhzeSwDffAyu2Bx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requested by Mateusz · project thread
Before:
multiplayerwas 11 commits behind the fork'smaster(c23ba0e, same as Try/OpenGothic master).After:
multiplayerhas those upstream changes: basic Android APK integration (Try#1001, with a newandroid-arm64CI job),ai_readyspellonly runs when the npc has the spell (Try#1003), async world loading in the editor, graphics options moved, Tempest updates, AppVeyor removed.This PR comes from a branch instead of straight from
masterbecauseCMakeLists.txtconflicted:multiplayeradded its test targets in the same place upstream added the Android APK target.How: merge commit of
masterintomultiplayer. The conflict is resolved by keeping both blocks: the multiplayer tests block, then theif(ANDROID) add_android_apk(...)block. Everything else merged automatically.🤖 Generated with Claude Code
https://claude.ai/code/session_01B8saeyNHhzeSwDffAyu2Bx
Generated by Claude Code