Well I’m back on track now after being consumed by GTA IV for 2 days. No no, I’m not finished it yet, but I needed to get the focussed play out of my system.
With the release of tpserver-cpp 0.5.0 I needed to find out how to get my risk branch, version 0.4.~ up to 0.5.0. For anyone else needing help on doing this, you just need to “git pull” from the main branch (without your #branchname) onto your local branch. I hadn’t made many changes to my branch, so the merge was relatively painless, but from what I read in the man pages you need to manually resolve individual conflicts.
I also spent a bunch of time customizing my quickstart configs, as well as my vmware network configuration. I have things set up now so I can run tpserver in a VM and have tpclient on my desktop connect to the server. I now need to get an AI set up and shorten up my turn lengths so I can get myself familiar with some existing rulesets.
Next week promises to have me looking through far more code than this week, which was a lot of set up and configuration. I’ll be poring over the rulesets, most likely minisec to start with, and getting more familiar with how they work. Don’t ask me why I picked minisec, I think it might have been mentioned to me by a mentor or something. I finally sold one of my junker cars so I can pick up my Macbook soon, then I will have to rush to install everything again. I have tested git/cogito on another mac, and I think I can actually compile too, so not that bad. Strange as it is I’m really looking forward to using textmate… Weird huh? I don’t know what it is, I’ve seen some friends do some crazy stuff with it, and I’m just hyped about using it.
Enjoy your weekend everyone, see Ironman if you haven’t already; I know I am going to be watching it today.
xdotx | 03-May-08 at 9:41 pm | Permalink
good to see you’re still alive, and that the git/branch stuff was a non-issue (if that hadn’t worked i’d have had no clue :P). btw, there should be no possibility of conflicts unless you make changes to the server code on your local branch.
oh, and remember to let me know if you’re gonna disappear for more than a couple days. s’not a big deal; just gotta keep track.
enjoy your ironman, GTA, and textmate
jphr | 03-May-08 at 10:46 pm | Permalink
I definitely will keep in touch about disappearances
I think once things get moving it will be pretty hard to just disappear. I will be taking one short trip to visit friends and family back in my home city, but you will have plenty of notice about that.
BTW, ironman was AWESOME