Emperor of the Fading Suns Forum

oh no, I made a mistake, I just looked at your rsw1 Then I forked your repo, cloned the fork, made a new branch (rsw1) off the master, checking out that branch at the same time, copied my saved src folder over the project's src folder, committed everything, and pushed branch rsw1 to my fork without ...

OK. I've just made a fresh start, deleting all my repos at Github and my Phoenix project (after saving the src folder). Then I forked your repo, cloned the fork, made a new branch (rsw1) off the master, checking out that branch at the same time, copied my saved src folder over the project's src fol...

Ugh, I just finished a hairy merge. Structure.java, Unit.java, Faction.java, Game.java, Gui.java, PlanetWindow.java, State.java, C.java, Comp.java, Util.java and WindowSize.java all conflicted and some had big and complex conflicts. :shock: Some of that was due to my unit_building branching of at 0....

Well, if you had pushed to joulupunikki/Phoenix the repository would be in a state where my netbeans could not operate on it. And I would probably have had to re-initialize the repository again. Note that I don't mean this is your fault, I suspect netbeans git integration may be at fault. I wouldn'...

3. Netbeans seems to have problem with data fetched from https://github.com/tichtich/Phoenix-RSW2.git . After I switch to the master branch from your repository I can no longer switch back to other branches or even checkout a revision from the current branch. Netbeans claims I have modified files i...

Hi. Since last posting, I've merged with your master, split most of my work off from Game, and uploaded a revision to my Github page. It's at https://github.com/tichtich/Phoenix-RSW2.git I took a quick look at your revision. Couple of issues: 1. Game.deleteUnit() use carrier.disembark(unit) instead...

P.S. Sorry to be negative, but I doubt that sorting into an ordered sequence is the best strategy. Don't worry about mentioning weak points, I'd rather learn about my mistakes before I do them. Note that I don't think Java will let you have an array of lists, but you can certainly have a list of li...

I made a commit to master which you can fetch. This commit has the disappearing own cargo pods fixed. Also: For example it tries to consume resources on planets before consuming any in space, which means you don't often see resources disappearing from pods in space. If I consumed resources in unit l...

Something went quite not the right way. On github git blame now reports tichtich as the author of most of the source files. Funny since I checked diffs with git and it reported only 5 files modified and 1 file added, apart from the source distribution compile files. Did you say you merged two repos...

Repository replaced. You can now delete your forked Phoenix and fork the replaced repository again. All authorship info, including yours, is up to date. Well we would have avoided this little diversion altogether if I had provided instructions on contributing in the first place. And I should have my...

What do you want to do now? Can you revert to 0.8.3? Or have I irreparably infected your system with my merged version? Sorry! Don't worry ! Rest assured that if I didn't have multiple up to date backups on this computer and on flashdrives I would be a fool :) edit I suspect that means that now you...

I've finally managed to create a repository, merge it with your version 0.8.3, and push it to my own page at git: https://github.com/tichtich From what you've said, you may not have done a merge yet, so I'll tell you a little about how it went. After a couple of failed attempts, I created a new rep...

Well, having said what I said, I have looked at various sources around the net and some say that passing this in constructor is ok if you are cognizant of the fact that your object is not yet constructed and you don't for example call any non-static functions using that reference. From what I've re...

Edit aargh I overwrote my own post.
edit Removed duplicate.

Ah, I didn't think of that. But now I'm surprised the compiler doesn't object to Game's "new HexProc(this)", since it can see perfectly well that this is a case of passing a self-reference in a constructor. Well, I was reminded of passing this when I noticed that Netbeans underlined and p...