Crossfire: fix python breakage, update server and client, add jxclient and editor #400098
Conversation
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
ToxicFrog
force-pushed
the
crossfire
branch
2 times, most recently
from
6292f4b to
39c7cb3
Compare
github-actions
bot
added
10.rebuild-darwin: 0
mweinelt
reviewed
Apr 30, 2025
ofborg
bot
added
the
2.status: merge conflict
This updates the server, maps, and archetypes in lockstep, since changes to the server means it needs updated data files and changes to the data need the new server to load them. It also updates the build configuration to use the new git repo, and drops the no longer needed cstdint patch.
Latest stable is last year, and there have been some significant fixes and features since. There's also a gtk3 branch now, but it's not ready for general use, so this just updates the gtk2 version.
This covers the server, maps, arch, and client packages. It also gets rid of the whole hashes-and-versions-in-a-separate-file thing which made sense when I first wrote it but is kind of clunky now.
This is an alternate, fullscreen, Java-based client for Crossfire, usable on the same servers as the "main" GTK client. As with many things Crossfire, it hasn't had an official release in a long time but is still under active development, so I identify it by date of commit.
This is the editor for Crossfire map and archetype data.
ofborg
bot
removed
the
2.status: merge conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This PR:
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)