Search found 10816 matches

by Z-Man
Sun Dec 23, 2018 12:51 am
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

Re: And now we have git.

Done with the cleanup; the 0.2.8 bzr branches are unchanged, all others have had half a handful of revisions rewritten. If you do have them in a local copies, try to eliminate them by 'bzr pull --overwrite' resp. 'git pull --force', don't forget to rescue any local modifications first. If you can't ...
by Z-Man
Wed Dec 19, 2018 11:43 pm
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

Re: And now we have git.

OBVIOUS answer: Fix the problems in git-remote-bzr :) A kind soul already seems to have tackled the problem that "bzr->git->different bzr" gives different revision IDs, at least if you use the same git repository for import and export: https://github.com/utopia-repository/git-remote-bzr haven't test...
by Z-Man
Wed Dec 19, 2018 12:35 am
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

Re: And now we have git.

Aha! I poked around a bit. The reason the git->bzr->git roundtrip did not work were the cherry pick merges I did in git. Git knows (at least) two dates for each revision, the Author Date (when it was written) and the Commit Date (when it was added to git). For normal commits, both are identical. If ...
by Z-Man
Mon Dec 17, 2018 11:54 pm
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

Re: And now we have git.

No worries about low end computers, we could never make an IDE mandatory for building anyway, as that would make packaging vastly more complicated. But for development, I am too old to work in an environment with at least some form of auto-completion, refactoring support (renaming at least) and go-t...
by Z-Man
Wed Dec 12, 2018 10:29 pm
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

Re: And now we have git.

Sure, can do. Syncing another repository, especially git-git, isn't going to cause issues anytime soon. Two people not only need to commit concurrently in a one minute time window, their commits also need to be in conflicts with each other. Non-conflicting concurrent commits are auto-merged. That wo...
by Z-Man
Tue Dec 11, 2018 11:21 pm
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

Re: And now we have git.

The main repository is also mirrored on launchpad, I suppose as a read only clone: https://code.launchpad.net/~armagetronad-dev/armagetronad/+git/armagetronad The other helper repositories are not mirrored to launchpad because when I tried, it insisted on also naming them just 'armagetronad', not en...
by Z-Man
Tue Dec 11, 2018 10:16 pm
Forum: Development
Topic: And now we have git.
Replies: 21
Views: 2606

And now we have git.

Surprise! https://gitlab.com/armagetronad Main repository with the game code: https://gitlab.com/armagetronad/armagetronad Using the excellent git-bzr, which makes bzr branches read/writable from git, I set up a bidirectional sync script that runs on a webhook on pushes to either side ( https://code...
by Z-Man
Tue Dec 11, 2018 7:25 pm
Forum: Development
Topic: On Steam
Replies: 3
Views: 1124

Re: On Steam

What I right now find attractive about going to Steam is that it's a quite useful and well known auto-updater for Windows. I would not mind having a mechanism ready that can put new versions onto client computers reliably. I would definitely not hope for an influx of new users from it, that requires...
by Z-Man
Sat Dec 08, 2018 12:33 am
Forum: Development
Topic: New bzr branches for 0.4
Replies: 1
Views: 862

New bzr branches for 0.4

Right, remember this? viewtopic.php?f=4&t=24256&hilit=fastexport&start=0 (tl;dr; using some fastexport hackery, I managed to create bzr branches with the combined history of 0.4 and 0.2.8 ). I tested the procedure there again, and it still worked without a hitch. The resulting hybrid branch could be...
by Z-Man
Mon Nov 26, 2018 10:09 pm
Forum: General
Topic: Should We Rebuild the Wiki?
Replies: 14
Views: 2386

Re: Should We Rebuild the Wiki?

Bah, no worries. Compared to the years of it being broken and months being knowingly broken, what are one or two days? :) I redirected wiki.armagetronad.org to wiki.lightron.org, you probably want to tell your setup about that now to keep the address line intact. The old wiki content is on oldwiki.a...
by Z-Man
Thu Nov 22, 2018 9:11 pm
Forum: Support
Topic: Issues while compiling 0.4 on Haiku
Replies: 3
Views: 730

Re: Issues while compiling 0.4 on Haiku

Mm. Maybe, like Solaris, Haiku requires that you explicitly link a socket library? Try configuring with

./configure LIBS=-lsocket
by Z-Man
Wed Nov 21, 2018 10:54 pm
Forum: Support
Topic: Segfault on Fedora 29
Replies: 2
Views: 818

Re: Segfault on Fedora 29

The line numbers seem off in the stack trace, but we don't dereference many std::auto_ptr<gCycleChatBot>'s :) So I'm pretty sure it's fixed by this: https://bazaar.launchpad.net/~armagetronad-dev/armagetronad/0.2.8-armagetronad-work/revision/1479#src/tron/gCycle.cpp alternative source: https://sourc...
by Z-Man
Sat Nov 17, 2018 10:16 pm
Forum: General
Topic: Should We Rebuild the Wiki?
Replies: 14
Views: 2386

Re: Should We Rebuild the Wiki?

I'd be 100% OK with you just taking over the Wiki. I could give you a database dump and the media files no problem. That is, if anyone objects to their username/password/email getting transferred, I could scrub the user database and we'd be left with the content. At least, I assume that's how it wou...
by Z-Man
Sun Sep 09, 2018 9:19 pm
Forum: General
Topic: A public letter to Z-man.
Replies: 27
Views: 9413

Re: A public letter to Z-man.

Word wrote:
Lucifer wrote:I'm currently caught up in a second divorce
Ugh, I'm sorry about that.
That. I wish I had something uplifting to say.
by Z-Man
Sun Sep 09, 2018 9:15 pm
Forum: Support
Topic: How to build the stand-alone server on ubuntu?
Replies: 2
Views: 591

Re: How to build the stand-alone server on ubuntu?

Yes, when you run 'configure', you need to pass it the '--disable-glout' command line. Since that's badly named, '--enable-dedicated' should also work for non-ancient sources.