Collectible Card Game Headquarters

Although now I have vikings marching through my head while other random Pythons are lowered from the top of my skull to place their spam orders...

LOL... I was thinking the same thing when I read Braids' comment!

Great screenshot Dennis.

It really does look great Dennis.
Looking forward to the next play test version!

Braids wrote:

DennisBergkamp wrote:Thanks for the link rares, I will check it out!

As for a test version, I will release one once I've merged the latest Forge code with my stuff. I'm not sure what the best way of doing this would be, by the way, since everything got moved over to Git as I understand it.

what revision control have you been using? a subversion branch? have you been using git locally, perhaps? do you have or can you get a copy of the official code before you started? merging will be much less painful if you can find a common ancestor.

The last thing I've used was the old google SVN (I think the last update was around rev 9800), it would be nice to be able to just do a checkout on my latest code, but it's not really that a big of a deal to manually merge, since only a handful (maybe around ~15?) files will be different on my local version. Unless major overhauls have happened in the last few months.

DennisBergkamp wrote:

Braids wrote:. . . As for a test version, I will release one once I've merged the latest Forge code with my stuff. I'm not sure what the best way of doing this would be, by the way, since everything got moved over to Git as I understand it.

what revision control have you been using? a subversion branch? have you been using git locally, perhaps? do you have or can you get a copy of the official code before you started? merging will be much less painful if you can find a common ancestor.

The last thing I've used was the old google SVN (I think the last update was around rev 9800), it would be nice to be able to just do a checkout on my latest code, but it's not really that a big of a deal to manually merge, since only a handful (maybe around ~15?) files will be different on my local version.[/quote]

i would try to narrow down the exact google SVN rev from which you forked, and check that out into a new working directory called "ancestor". then checkout the latest from the slightlymagic SVN trunk and call it "head". then find a 3-way merge tool that will take ancestor, head, and your working directory, to create a fourth source tree, which contains the merged output. the only tool i know of to do this is diff3 from the command line. KDiff3 is a graphical version, but i don't know if it supports operating recursively on directory trees.

edit: then again, that may be overkill for 15 files.

DennisBergkamp wrote:Unless major overhauls have happened in the last few months.

major overhauls did happen in the last few months. static methods on Card moved to CardUtil. CardFactory is now PreloadingCardFactory, which now supports neither the getAllCards nor the getCards methods. every static field in AllZone {and some other classes} must now be accessed through a get method. some initialization that happened in forge.Gui_NewGame is now in forge.model.FModel, and some of it is now in forge.view.swing.ApplicationView. forge.Gui_NewGame.main is now a simple delegate for the real main, forge.view.swing.Main.main. and those are just the changes that I made.

Any news of this project? Hope it is still on...

I'm very interested in this project too! Only noticed few days ago that was being worked on a sequel to Shandalar, but i've been searching for it for a long time!!
I'm not really skilled in anything specific surely i can't program) but maybe i could give an hand in my very limited free time... I'd really love to se this project fully working and finished!