| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** bddebian has quit IRC | 01:08 | |
| *** jphr has joined #tp | 01:17 | |
| *** JLafont has quit IRC | 01:43 | |
| *** mithro has joined #tp | 01:53 | |
| mithro | heyo people | 01:54 |
|---|---|---|
| CIA-56 | neufelry tpserver-cpp-config * rf7844c8716e1 /AUTHORS: | 02:18 |
| CIA-56 | Name: Ryan Neufeld - jphr | 02:18 |
| CIA-56 | Email: [email protected] | 02:18 |
| CIA-56 | Changes: Added name+nick+email to AUTHORS in risk branch | 02:18 |
| CIA-56 | jaffer tpserver-cpp-config * ra61470831d51 / (37 files in 5 dirs): git-pulled main repository onto #risk branch | 02:18 |
| CIA-56 | jphr tpserver-cpp-config * r002df20a3d67 /modules/games/Makefile.am: Modified modules/games/Makefile.am to include Risk folder to be commited shortly | 02:18 |
| CIA-56 | jphr tpserver-cpp-config * r6a38d603da7d /modules/games/risk/ (Makefile.am risk.cpp risk.h): Added basic shell of risk ruleset. | 02:18 |
| CIA-56 | jphr tpserver-cpp-config * r196d2b8c1096 /configure.ac: Accidentally left out changes made to configure.ac | 02:18 |
| CIA-56 | jphr tpserver-cpp-config * re480c4ad5081 /configure.ac: Fixed a commented out line in configure.ac | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * r3403bc2029d8 /modules/games/risk/ (risk.cpp risk.h): Fixed syntax errors in risk.cpp, risk.h | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * rbe5dbecb6b06 /modules/games/risk/risk.cpp: More syntax errors. | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * r75bf14f5bddb /modules/games/risk/risk.cpp: included objectmanager.h instead of objectdatamanager.h | 02:19 |
| CIA-56 | jphr 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.h | 02:19 |
| CIA-56 | jphr 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-56 | jphr tpserver-cpp-config * r5e1c399b30ef / (configure.ac tpserver/Makefile.am): Merged changes from the main branch to this branch | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * r2f0f06e8de09 /modules/games/ (Makefile.am risk/Makefile.am): Removed trailing whitespace in risk/Makefile.am | 02:19 |
| CIA-56 | jphr 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-56 | jphr tpserver-cpp-config * rb39b32b35c1c /modules/games/risk/risk.h: small test change to be pushed sideways, not to be pushed to main :p | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * r68cd9f9863ae / (4 files in 3 dirs): Merge git://git.thousandparsec.net/git/tpserver-cpp | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * re49d14f118f0 /AUTHORS: merged main branch changes, tidied up AUTHORS (by removing myself for the time being) | 02:19 |
| CIA-56 | llnz 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 |
| tpb | Title: Autoconf Macro Archive (at autoconf-archive.cryp.to) | 02:19 |
| CIA-56 | llnz tpserver-cpp-config * r2cbe6fa33281 /modules/games/minisec/minisec.cpp: Removed old char* handling, use std::string instead in Minisec. | 02:19 |
| CIA-56 | jphr tpserver-cpp-config * rea50d2051bb0 / (3 files in 2 dirs): Merge git+ssh://[email protected]/git/tpserver-cpp | 02:19 |
| CIA-56 | llnz tpserver-cpp-config * rce1b2af643e9 /tpserver/frame.cpp: Don't support TP01 anymore, removed check for later versions. | 02:19 |
| CIA-56 | llnz tpserver-cpp-config * r7aa76d3ce0c9 /tpserver/ (frame.cpp frame.h): | 02:20 |
| CIA-56 | TP04 support for fail frames, including references. | 02:20 |
| CIA-56 | Woops, guess that means version 0.5.1 will be out as soon as I've sorted | 02:20 |
| CIA-56 | the build on OS X. | 02:20 |
| CIA-56 | jphr tpserver-cpp-config * r30eaaf6af5d6 /tpserver/ (frame.cpp frame.h): Merge git+ssh://[email protected]/git/tpserver-cpp | 02:20 |
| CIA-56 | jphr tpserver-cpp-config * r8fbc8fffba63 /modules/games/risk/risk.cpp: Added comments to risk.cpp modelling what happens in minisec.cpp | 02:20 |
| CIA-56 | jphr tpserver-cpp-config * r879c98b9f962 /modules/games/risk/ (risk.cpp risk.h): | 02:20 |
| CIA-56 | Added a bit of logic to Risk::onAddPlayer. | 02:20 |
| CIA-56 | -Player cannot join ANYTIME if NumPlayers >= setting risk_max_players | 02:20 |
| CIA-56 | -Player cannot join once game has started if no open spaces exist to be claimed | 02:20 |
| CIA-56 | Added private: bool Risk::isBoardClaimed() to run a check to determine if board is fully claimed | 02:20 |
| CIA-56 | jphr tpserver-cpp-config * rd755ce135946 /modules/games/risk/ (riskturn.cpp riskturn.h settings): | 02:20 |
| CIA-56 | Create riskturn.cpp&.h as well as a "settings" file | 02:20 |
| CIA-56 | -RiskTurn inherits TurnProcess and is only a shell at the moment | 02:20 |
| CIA-56 | -settings records settings i've used and settings in consideration | 02:20 |
| CIA-56 | jphr tpserver-cpp-config * rcfe8ffedd74a /modules/games/risk/risk.cpp: Small modification of risk.cpp | 02:20 |
| CIA-56 | (11 lines omitted) | 02:20 |
| tpb | aloril has joined on worldforge | 02:22 |
| mithro | ezod: you just merge master? | 02:22 |
| ezod | mithro: i did earlier and just pushed now... | 02:23 |
| mithro | that would explain the jphr patches | 02:23 |
| ezod | mithro: the weird thing is, i had already pushed most of that a few hours ago | 02:25 |
| * ezod does not yet grok git | 02:26 | |
| mithro | the CIA/email scripts do not know much about merges | 02:29 |
| ezod | ah | 02:30 |
| ezod | the bot isn't going to continue doing this indefinitely i hope? | 02:30 |
| * ezod goes to bed | 02:33 | |
| *** mithro has quit IRC | 02:57 | |
| *** llnz has joined #tp | 04:16 | |
| *** JLafont has joined #tp | 05:14 | |
| *** peres has joined #tp | 08:36 | |
| *** TBBle has joined #tp | 09:03 | |
| *** TBBle_ has quit IRC | 09:08 | |
| *** Marcel- has joined #tp | 09:42 | |
| *** bddebian has joined #tp | 10:21 | |
| llnz | ezod: when I catch up with you next, remind me to discuss ListenSocket | 10:22 |
| bddebian | Heya | 10:22 |
| * llnz wanders off | 10:22 | |
| llnz | later all | 10:22 |
| *** llnz has quit IRC | 10:22 | |
| *** peres has quit IRC | 10:40 | |
| *** Demitar has quit IRC | 11:35 | |
| *** Iwanowitch has joined #tp | 11:44 | |
| *** Iwanowitch_ has joined #tp | 11:50 | |
| *** Ohm has quit IRC | 11:59 | |
| *** Iwanowitch has quit IRC | 12:03 | |
| tpb | aloril_ has joined on worldforge | 12:03 |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 12:06 |
| *** bddebian has quit IRC | 12:11 | |
| *** Combat_Wombat has joined #tp | 13:04 | |
| Combat_Wombat | anyone developing this played the space empires games at all? | 13:04 |
| tpb | aloril__ has joined on worldforge | 13:13 |
| *** Epyon_ has quit IRC | 13:15 | |
| tpb | aloril_ has quit worldforge (Ping timeout: 378 seconds) | 13:17 |
| JLP | Combat_Wombat: i just tried it, sometime around SE3, i think, never played it more extensively | 13:18 |
| Combat_Wombat | to bad se4 is the pinnacle of 4x space games | 13:18 |
| Combat_Wombat | you should pick it up, can get it for like $10 these days | 13:18 |
| JLP | Combat_Wombat: i'll take a note about it, and try to get a hold of it | 13:19 |
| *** Iwanowitch_ is now known as Iwanowitch | 13:24 | |
| tpb | aloril_ has joined on worldforge | 13:32 |
| tpb | aloril__ has quit worldforge (Read error: Connection reset by peer) | 13:34 |
| JLP | Combat_Wombat: btw, do you know what is the difference between deluxe and non-deluxe editions? | 13:36 |
| Combat_Wombat | nothing the boxed deluxe is just the game fully patched up | 13:37 |
| Combat_Wombat | you can buy se4, se4 gold, or deluxe and they can all be patched to the same version | 13:38 |
| Combat_Wombat | i doubt youll find any se4 or se4 gold being sold anywhere anymore though | 13:38 |
| JLP | Combat_Wombat: ah cool, thanks, i've found both here, used, but the non-deluxe is 3€ instead of 5€ for deluxe | 13:39 |
| Combat_Wombat | cool | 13:40 |
| Combat_Wombat | theres also an se5 but I like se4 better :D | 13:41 |
| Combat_Wombat | and make sure you don't just play stock, go get some mods like carrier battles or adamant | 13:42 |
| JLP | ok, noted that too, thanks for the tips | 13:43 |
| Combat_Wombat | heh, any questions you got about SE I can answer | 13:44 |
| Iwanowitch | git is confusing :/ | 13:57 |
| ezod | Iwanowitch++ | 14:04 |
| Iwanowitch | git can only merge committed files? | 14:04 |
| Iwanowitch | As in, git pull doesn't complete properly when I have uncommited changes. | 14:04 |
| Iwanowitch | I think. | 14:04 |
| Iwanowitch | I have no idea what state this thing is in right now. | 14:05 |
| ezod | im pretty sure you want a clean working directory (i.e. all committed) before a pull | 14:05 |
| ezod | definitely before a merge | 14:05 |
| ezod | try git status | 14:05 |
| Iwanowitch | I suppose git wants it. I'm not sure I want it though. :) | 14:06 |
| *** Combat_Wombat has quit IRC | 14:21 | |
| *** Combat_Wombat has joined #tp | 14:50 | |
| *** Combat_Wombat has quit IRC | 15:14 | |
| *** nuleren has joined #tp | 15:23 | |
| tpb | aloril__ has joined on worldforge | 15:24 |
| tpb | aloril_ has quit worldforge (Ping timeout: 378 seconds) | 15:29 |
| *** JLafont has quit IRC | 15:38 | |
| *** JLafont has joined #tp | 15:39 | |
| *** DTRemenak has quit IRC | 16:34 | |
| *** DTRemenak has joined #tp | 16:35 | |
| tpb | aloril__ has quit worldforge (Ping timeout: 378 seconds) | 16:36 |
| *** JLafont has quit IRC | 17:02 | |
| *** JLafont has joined #tp | 17:02 | |
| *** Iwanowitch has quit IRC | 17:21 | |
| *** JLafont has quit IRC | 17:23 | |
| *** JLafont has joined #tp | 17:24 | |
| *** xdotx has joined #tp | 18:19 | |
| *** mithro has joined #tp | 18:21 | |
| mithro | morning people | 18:27 |
| *** Iwanowitch has joined #tp | 18:40 | |
| mithro | hello Iwanowitch | 18:46 |
| Iwanowitch | Heya mithro. | 18:48 |
| mithro | Iwanowitch: how goes everything? | 18:51 |
| Iwanowitch | mithro: Right now, okay. Last week, hectic. | 18:53 |
| Iwanowitch | Though it is going to be okay from now on. | 18:53 |
| Iwanowitch | Classes have stopped. | 18:54 |
| Iwanowitch | And the projects are finished. | 18:54 |
| mithro | GSoC official starts this week | 18:55 |
| Iwanowitch | Yes. From now on, I can concentrate on SoC. | 19:01 |
| *** JLP_ has joined #tp | 19:06 | |
| mithro | Iwanowitch: cool | 19:13 |
| mithro | ~seen JLafont | 19:13 |
| tpb | mithro: JLafont was last seen in #tp 3 days, 15 hours, 52 minutes, and 3 seconds ago: <JLafont> later | 19:13 |
| *** JLP has quit IRC | 19:20 | |
| *** tpb has joined #tp | 19:20 | |
| *** ChanServ sets mode: +o tpb | 19:20 | |
| *** JLafont has quit IRC | 19:40 | |
| *** Demitar has joined #tp | 19:52 | |
| *** llnz has joined #tp | 20:11 | |
| llnz | hi all | 20:12 |
| *** Marcel- has quit IRC | 20:13 | |
| *** nuleren has quit IRC | 20:46 | |
| mithro | hey llnz | 20:51 |
| llnz | hi mithro | 20:51 |
| llnz | how's it going? | 20:51 |
| mithro | it's only Saturday here | 20:51 |
| xdotx | mithro: oo you in US? | 20:57 |
| mithro | xdotx: yeah | 20:57 |
| mithro | I'm in Mountain View | 20:57 |
| xdotx | doin' the google training thing? | 20:57 |
| xdotx | cooool | 20:57 |
| mithro | yeah | 20:57 |
| mithro | where are you located again? | 20:57 |
| mithro | Settle right? | 20:57 |
| xdotx | seattle wa | 20:57 |
| *** Iwanowitch has quit IRC | 21:02 | |
| mithro | xdotx: well, if you make a trip down to SanFran in the next two weeks, please look me up :) | 21:09 |
| *** JLafont has joined #tp | 21:14 | |
| mithro | hey JLafont | 21:24 |
| mithro | your last blog post didn't work | 21:24 |
| mithro | it only came out as a title | 21:24 |
| * mithro is also in the states now btw | 21:24 | |
| *** bddebian has joined #tp | 21:25 | |
| bddebian | Heya | 21:28 |
| xdotx | best g++ error ever: "declaration does no declare anything." | 22:44 |
| llnz | hehe | 22:44 |
| * xdotx left out "class" in a forward declaration | 22:44 | |
| *** JLafont has quit IRC | 22:49 | |
| *** JLafont has joined #tp | 22:50 | |
| *** xdotx has quit IRC | 22:53 | |
| *** JLafont has quit IRC | 23:12 | |
| *** JLafont has joined #tp | 23:13 | |
| mithro | llnz: did you figure out your git problem? | 23:26 |
| llnz | yes | 23:27 |
| mithro | the idea was just to leave it there? | 23:31 |
| llnz | yes, basically, then jphr removed it and added back in his branch | 23:33 |
| mithro | ahh okay | 23:34 |
| *** JLafont has quit IRC | 23:52 | |
| *** JLafont has joined #tp | 23:52 | |
| *** JLP_ has quit IRC | 23:53 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!