Saturday, 2008-05-24

*** tpb has joined #tp00:00
*** ChanServ sets mode: +o tpb00:00
*** bddebian has quit IRC01:08
*** jphr has joined #tp01:17
*** JLafont has quit IRC01:43
*** mithro has joined #tp01:53
mithroheyo people01:54
CIA-56neufelry tpserver-cpp-config * rf7844c8716e1 /AUTHORS:02:18
CIA-56Name: Ryan Neufeld - jphr02:18
CIA-56Email: [email protected]02:18
CIA-56Changes: Added name+nick+email to AUTHORS in risk branch02:18
CIA-56jaffer tpserver-cpp-config * ra61470831d51 / (37 files in 5 dirs): git-pulled main repository onto #risk branch02:18
CIA-56jphr tpserver-cpp-config * r002df20a3d67 /modules/games/Makefile.am: Modified modules/games/Makefile.am to include Risk folder to be commited shortly02:18
CIA-56jphr tpserver-cpp-config * r6a38d603da7d /modules/games/risk/ (Makefile.am risk.cpp risk.h): Added basic shell of risk ruleset.02:18
CIA-56jphr tpserver-cpp-config * r196d2b8c1096 /configure.ac: Accidentally left out changes made to configure.ac02:18
CIA-56jphr tpserver-cpp-config * re480c4ad5081 /configure.ac: Fixed a commented out line in configure.ac02:19
CIA-56jphr tpserver-cpp-config * r3403bc2029d8 /modules/games/risk/ (risk.cpp risk.h): Fixed syntax errors in risk.cpp, risk.h02:19
CIA-56jphr tpserver-cpp-config * rbe5dbecb6b06 /modules/games/risk/risk.cpp: More syntax errors.02:19
CIA-56jphr tpserver-cpp-config * r75bf14f5bddb /modules/games/risk/risk.cpp: included objectmanager.h instead of objectdatamanager.h02:19
CIA-56jphr tpserver-cpp-config * rda88c72dc0d9 /modules/games/risk/ (risk.cpp risk.h): Some discrepencies existed when comparing risk to minisec. Corrected the required extern "C" section in risk.cpp and moved "public:" up in risk.h02:19
CIA-56jphr tpserver-cpp-config * r78aad53179a5 /modules/games/risk/ (risk.cpp risk.h): Renamed namespace from Risk to RiskRuleset. Figured this may be causing me problems (its also more clear)02:19
CIA-56jphr tpserver-cpp-config * r5e1c399b30ef / (configure.ac tpserver/Makefile.am): Merged changes from the main branch to this branch02:19
CIA-56jphr tpserver-cpp-config * r2f0f06e8de09 /modules/games/ (Makefile.am risk/Makefile.am): Removed trailing whitespace in risk/Makefile.am02:19
CIA-56jphr tpserver-cpp-config * r91c3b3cbe414 / (6 files in 4 dirs): Merge with git://git.thousandparsec.net/git/tpserver-cpp.git (to fix mac os x compile issue for jphr)02:19
CIA-56jphr tpserver-cpp-config * rb39b32b35c1c /modules/games/risk/risk.h: small test change to be pushed sideways, not to be pushed to main :p02:19
CIA-56jphr tpserver-cpp-config * r68cd9f9863ae / (4 files in 3 dirs): Merge git://git.thousandparsec.net/git/tpserver-cpp02:19
CIA-56jphr tpserver-cpp-config * re49d14f118f0 /AUTHORS: merged main branch changes, tidied up AUTHORS (by removing myself for the time being)02:19
CIA-56llnz tpserver-cpp-config * rc144c72b0b0f /m4/ (ax_boost_base.m4 ax_boost_signals.m4): New versions of autoconf tests for boost from http://autoconf-archive.cryp.to/02:19
tpbTitle: Autoconf Macro Archive (at autoconf-archive.cryp.to)02:19
CIA-56llnz tpserver-cpp-config * r2cbe6fa33281 /modules/games/minisec/minisec.cpp: Removed old char* handling, use std::string instead in Minisec.02:19
CIA-56jphr tpserver-cpp-config * rea50d2051bb0 / (3 files in 2 dirs): Merge git+ssh://[email protected]/git/tpserver-cpp02:19
CIA-56llnz tpserver-cpp-config * rce1b2af643e9 /tpserver/frame.cpp: Don't support TP01 anymore, removed check for later versions.02:19
CIA-56llnz tpserver-cpp-config * r7aa76d3ce0c9 /tpserver/ (frame.cpp frame.h):02:20
CIA-56TP04 support for fail frames, including references.02:20
CIA-56Woops, guess that means version 0.5.1 will be out as soon as I've sorted02:20
CIA-56the build on OS X.02:20
CIA-56jphr tpserver-cpp-config * r30eaaf6af5d6 /tpserver/ (frame.cpp frame.h): Merge git+ssh://[email protected]/git/tpserver-cpp02:20
CIA-56jphr tpserver-cpp-config * r8fbc8fffba63 /modules/games/risk/risk.cpp: Added comments to risk.cpp modelling what happens in minisec.cpp02:20
CIA-56jphr tpserver-cpp-config * r879c98b9f962 /modules/games/risk/ (risk.cpp risk.h):02:20
CIA-56Added a bit of logic to Risk::onAddPlayer.02:20
CIA-56 -Player cannot join ANYTIME if NumPlayers >= setting risk_max_players02:20
CIA-56 -Player cannot join once game has started if no open spaces exist to be claimed02:20
CIA-56Added private: bool Risk::isBoardClaimed() to run a check to determine if board is fully claimed02:20
CIA-56jphr tpserver-cpp-config * rd755ce135946 /modules/games/risk/ (riskturn.cpp riskturn.h settings):02:20
CIA-56Create riskturn.cpp&.h as well as a "settings" file02:20
CIA-56 -RiskTurn inherits TurnProcess and is only a shell at the moment02:20
CIA-56 -settings records settings i've used and settings in consideration02:20
CIA-56jphr tpserver-cpp-config * rcfe8ffedd74a /modules/games/risk/risk.cpp: Small modification of risk.cpp02:20
CIA-56(11 lines omitted)02:20
tpbaloril has joined on worldforge02:22
mithroezod: you just merge master?02:22
ezodmithro: i did earlier and just pushed now...02:23
mithrothat would explain the jphr patches02:23
ezodmithro: the weird thing is, i had already pushed most of that a few hours ago02:25
* ezod does not yet grok git02:26
mithrothe CIA/email scripts do not know much about merges02:29
ezodah02:30
ezodthe bot isn't going to continue doing this indefinitely i hope?02:30
* ezod goes to bed02:33
*** mithro has quit IRC02:57
*** llnz has joined #tp04:16
*** JLafont has joined #tp05:14
*** peres has joined #tp08:36
*** TBBle has joined #tp09:03
*** TBBle_ has quit IRC09:08
*** Marcel- has joined #tp09:42
*** bddebian has joined #tp10:21
llnzezod: when I catch up with you next, remind me to discuss ListenSocket10:22
bddebianHeya10:22
* llnz wanders off10:22
llnzlater all10:22
*** llnz has quit IRC10:22
*** peres has quit IRC10:40
*** Demitar has quit IRC11:35
*** Iwanowitch has joined #tp11:44
*** Iwanowitch_ has joined #tp11:50
*** Ohm has quit IRC11:59
*** Iwanowitch has quit IRC12:03
tpbaloril_ has joined on worldforge12:03
tpbaloril has quit worldforge (Ping timeout: 378 seconds)12:06
*** bddebian has quit IRC12:11
*** Combat_Wombat has joined #tp13:04
Combat_Wombatanyone developing this played the space empires games at all?13:04
tpbaloril__ has joined on worldforge13:13
*** Epyon_ has quit IRC13:15
tpbaloril_ has quit worldforge (Ping timeout: 378 seconds)13:17
JLPCombat_Wombat: i just tried it, sometime around SE3, i think, never played it more extensively13:18
Combat_Wombatto bad se4 is the pinnacle of 4x space games13:18
Combat_Wombatyou should pick it up, can get it for like $10 these days13:18
JLPCombat_Wombat: i'll take a note about it, and try to get a hold of it13:19
*** Iwanowitch_ is now known as Iwanowitch13:24
tpbaloril_ has joined on worldforge13:32
tpbaloril__ has quit worldforge (Read error: Connection reset by peer)13:34
JLPCombat_Wombat: btw, do you know what is the difference between deluxe and non-deluxe editions?13:36
Combat_Wombatnothing the boxed deluxe is just the game fully patched up13:37
Combat_Wombatyou can buy se4, se4 gold, or deluxe and they can all be patched to the same version13:38
Combat_Wombati doubt youll find any se4 or se4 gold being sold anywhere anymore though13:38
JLPCombat_Wombat: ah cool, thanks, i've found both here, used, but the non-deluxe is 3€ instead of 5€ for deluxe13:39
Combat_Wombatcool13:40
Combat_Wombattheres also an se5 but I like se4 better :D13:41
Combat_Wombatand make sure you don't just play stock, go get some mods like carrier battles or adamant13:42
JLPok, noted that too, thanks for the tips13:43
Combat_Wombatheh, any questions you got about SE I can answer13:44
Iwanowitchgit is confusing :/13:57
ezodIwanowitch++14:04
Iwanowitchgit can only merge committed files?14:04
IwanowitchAs in, git pull doesn't complete properly when I have uncommited changes.14:04
IwanowitchI think.14:04
IwanowitchI have no idea what state this thing is in right now.14:05
ezodim pretty sure you want a clean working directory (i.e. all committed) before a pull14:05
ezoddefinitely before a merge14:05
ezodtry git status14:05
IwanowitchI suppose git wants it. I'm not sure I want it though. :)14:06
*** Combat_Wombat has quit IRC14:21
*** Combat_Wombat has joined #tp14:50
*** Combat_Wombat has quit IRC15:14
*** nuleren has joined #tp15:23
tpbaloril__ has joined on worldforge15:24
tpbaloril_ has quit worldforge (Ping timeout: 378 seconds)15:29
*** JLafont has quit IRC15:38
*** JLafont has joined #tp15:39
*** DTRemenak has quit IRC16:34
*** DTRemenak has joined #tp16:35
tpbaloril__ has quit worldforge (Ping timeout: 378 seconds)16:36
*** JLafont has quit IRC17:02
*** JLafont has joined #tp17:02
*** Iwanowitch has quit IRC17:21
*** JLafont has quit IRC17:23
*** JLafont has joined #tp17:24
*** xdotx has joined #tp18:19
*** mithro has joined #tp18:21
mithromorning people18:27
*** Iwanowitch has joined #tp18:40
mithrohello Iwanowitch18:46
IwanowitchHeya mithro.18:48
mithroIwanowitch: how goes everything?18:51
Iwanowitchmithro: Right now, okay. Last week, hectic.18:53
IwanowitchThough it is going to be okay from now on.18:53
IwanowitchClasses have stopped.18:54
IwanowitchAnd the projects are finished.18:54
mithroGSoC official starts this week18:55
IwanowitchYes. From now on, I can concentrate on SoC.19:01
*** JLP_ has joined #tp19:06
mithroIwanowitch: cool19:13
mithro~seen JLafont19:13
tpbmithro: JLafont was last seen in #tp 3 days, 15 hours, 52 minutes, and 3 seconds ago: <JLafont> later19:13
*** JLP has quit IRC19:20
*** tpb has joined #tp19:20
*** ChanServ sets mode: +o tpb19:20
*** JLafont has quit IRC19:40
*** Demitar has joined #tp19:52
*** llnz has joined #tp20:11
llnzhi all20:12
*** Marcel- has quit IRC20:13
*** nuleren has quit IRC20:46
mithrohey llnz20:51
llnzhi mithro20:51
llnzhow's it going?20:51
mithroit's only Saturday here20:51
xdotxmithro: oo you in US?20:57
mithroxdotx: yeah20:57
mithroI'm in Mountain View20:57
xdotxdoin' the google training thing?20:57
xdotxcooool20:57
mithroyeah20:57
mithrowhere are you located again?20:57
mithroSettle right?20:57
xdotxseattle wa20:57
*** Iwanowitch has quit IRC21:02
mithroxdotx: well, if you make a trip down to SanFran in the next two weeks, please look me up :)21:09
*** JLafont has joined #tp21:14
mithrohey JLafont21:24
mithroyour last blog post didn't work21:24
mithroit only came out as a title21:24
* mithro is also in the states now btw21:24
*** bddebian has joined #tp21:25
bddebianHeya21:28
xdotx best g++ error ever: "declaration does no declare anything."22:44
llnzhehe22:44
* xdotx left out "class" in a forward declaration22:44
*** JLafont has quit IRC22:49
*** JLafont has joined #tp22:50
*** xdotx has quit IRC22:53
*** JLafont has quit IRC23:12
*** JLafont has joined #tp23:13
mithrollnz: did you figure out your git problem?23:26
llnzyes23:27
mithrothe idea was just to leave it there?23:31
llnzyes, basically, then jphr removed it and added back in his branch23:33
mithroahh okay23:34
*** JLafont has quit IRC23:52
*** JLafont has joined #tp23:52
*** JLP_ has quit IRC23:53

Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!