[aquaria] SDL2 patches...

False.Genesis false.genesis at googlemail.com
Fri Jul 19 18:14:07 EDT 2013


> Also, I mostly consider my work done at this point, so we should
> probably talk about moving the official source repository somewhere more
> active, or at least have the icculus.org repo pull once a day from
> someone else's. Is False.Genesis's repo the defacto repository now, or
> is it someone else?

Well, I tried hard to achieve actually this. :)
I'm not aware of any other active repo.
Partial success indicated by e.g. 
https://aur.archlinux.org/packages/aquaria-git/

So now that this is on the horizon, I'll restructure the repo a bit - 
rename to something less awkward, turn into a github organization, etc. 
to make it more open-sourcey.

> I think between you and Andrew Church, we've probably got 90% of the GPL work. Andrew, are you interested in this?

For the other changes I've gone through my repo and collected all 
commits not done by me.
Some are not relevant (russian datafiles).
For everyone else I hope they will reply and give their okay.

Some data from the russian version:
https://github.com/fgenesis/Aquaria_clean/commit/c7d7e6126fa42a91d9868cb9fee625c41de20345
https://github.com/fgenesis/Aquaria_clean/commit/500355019da028662517da403d2ecaf53db6b966

These were done by KS-10 on the #bitblot IRC
https://github.com/fgenesis/Aquaria_clean/commit/4a02a4185a84946f290211bf3d6c8d367c09d68a
https://github.com/fgenesis/Aquaria_clean/commit/86bcecf5d26354867079d4ec115f1d3c64027297


Then, we might want to use other mod menu icons instead of the ones I 
used, as they are not license compatible (GPL, LGPL, Mozilla Public 1.1, 
CC-BY-NA).
Added in 
https://github.com/fgenesis/Aquaria_clean/commit/a420aa4f7011c40653ae15b0dfcfac7e0ab1dac2
(See references.txt for source info)
Either someone could poke Derek about it, or I can ask Frances Fawcett 
(the artist I'm working together with on our sequel mod) if she wants to 
make new ones. Thoughts on this?


Unknown authors (russian language support patch), Modified by me
(Original mention in articles linked via 
http://www.bit-blot.com/forum/index.php?topic=4229.0, but some links are 
dead)
https://github.com/fgenesis/Aquaria_clean/commit/283fc0086e33044e5de0fa5a72eaf335d94281ef


By Henrik Holst:
https://github.com/fgenesis/Aquaria_clean/commit/a6fc88d88521fed947967ed85b2e05e936a2c296
https://github.com/fgenesis/Aquaria_clean/commit/2278e55d0cc659ccca22575e9b116a76a6311484
https://github.com/fgenesis/Aquaria_clean/commit/b5518c28cdb2b217a83d28706d7ade02ef87cd2e


By Matt Bierner
(Parts of) 
https://bitbucket.org/mattbierner/ios-aquaria/commits/72d6460d9e60

By Pascal Lingnau:
https://github.com/fgenesis/Aquaria_clean/commit/10c8d53e365aaa788b41a35f86de7f57cb2797fd
https://github.com/fgenesis/Aquaria_clean/commit/e23a881bda504fd107eea267ba164a6060c0ecb7


... and some changes already in the icculus repo by Mathias Panzenböck, 
Yukai Li/GMMman, Pontos, James Le Cuirot, David Gow, Andrew/andrews05, 
and programmer2;
ordered by appearance in the commit log going backwards.

Unless I didn't overlook someone that should be all.

If not all reply, how is this generally handled? Many of the patches 
depending on earlier changes wouldn't apply, so does someone else have 
to re-do them bit by bit, or will those commits simply be left out if 
possible? Never actually thought of this...


> I'll check with Alec to see if he'll let me update the Windows Steam build too.

That would be nice.
Everything above being said, there's a few more things to discuss:

First, the mod downloader I added pulls a mod list from my server, 
http://fg.wzff.de/aqmods/ by default, unless a different URL is in the 
config. I think it *should* be able to handle the traffic, but for the 
sake of control someone else might want to host the root XML. The 
downloader supports chaining, so it's actually possible to link to other 
servers, and it will incrementally build up a mod list from what it can 
find.
If everyone is fine with that I'd continue managing & hosting the mod 
list and most of the mods.

<shameless plug>
Second, I'll continue doing changes to the C++ code if I need them for 
our sequel mod, if doing something in Lua is impossible.
So if this code goes live before we are done, which is very likely 
considering we'll need at least another year, it'd be great to get 
another update out then. It's so hard to get aquaria mods popular, 
especially if a non-steam version is required to play.
</shameless plug>

-- Max


More information about the aquaria mailing list