| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| mithro | sorry guys, I'm rather lagged | 00:00 |
|---|---|---|
| mithro | dmpayton: if you type "cg-commit" it'll bring up a text editor | 00:01 |
| mithro | jotham: okay, you can get it to run a conflict resolution tool | 00:02 |
| mithro | when you did an update it should have informed you that there is a conflict | 00:03 |
| jotham | yeah it did, but unlike darcs it didn't let me just reject and accept chunks | 00:05 |
| jotham | ok so what's teh best answer to my situation? | 00:06 |
| jotham | just work off your last commit and re-add my code and hope it doesn't happen again? | 00:06 |
| nash | jotham: What's the issue? | 00:07 |
| jotham | i don't know how to use git | 00:07 |
| jotham | i made a bunch of changes and in the meantime mithro made some changes | 00:08 |
| jotham | then i tried to commit | 00:08 |
| nash | You can commit hunks using git-commit --interactive (or git-add interactive) | 00:08 |
| nash | Commit to where? | 00:08 |
| nash | It's best to commit locally before you commit | 00:08 |
| jotham | and "something happend" (it was 2am and now i regret it ahppend then since now i don't know what i did then) | 00:08 |
| jotham | yeah | 00:08 |
| jotham | ok so what has happend is there is now a mess | 00:08 |
| jotham | so i think i'll go to mithros last version, readd my code ontop of it manually, then if it happens again seek your guys help before making am ess | 00:08 |
| nash | okay | 00:09 |
| mithro | jotham: what you should have gotten was this | 00:13 |
| mithro | Applying changes... | 00:13 |
| mithro | Merging 38cbba307de3bc5c7c821639117c9774397e7668 -> a8c6d72ac3f24b80c581e5a413fdbd4d4ad89ce1 | 00:13 |
| mithro | to 1d743d8558431afc331e17cfe9a93d90a6f9b626 ... | 00:13 |
| mithro | ... Auto-merging temp | 00:13 |
| mithro | CONFLICTS during merge. | 00:13 |
| mithro | Conflicts during merge. Do cg-commit after resolving them. | 00:13 |
| mithro | cg-reset will cancel the merge. | 00:13 |
| jotham | and how do you resolve them? | 00:14 |
| mithro | cg-status will then display | 00:15 |
| mithro | tim@ultraslim:~/oss/git/temp2/2$ cg-status | 00:15 |
| mithro | Heads: | 00:15 |
| mithro | >master 1d743d855843~ Testing... | 00:15 |
| mithro | R origin a8c6d72ac3f2~ A conflicting commit. | 00:15 |
| mithro | Merging: a8c6d72ac3f24b80c581e5a413fdbd4d4ad89ce1 (origin) | 00:15 |
| mithro | Merge base: 38cbba307de3bc5c7c821639117c9774397e7668 | 00:15 |
| mithro | M temp | 00:15 |
| mithro | if it's a simple merge, just go and edit temp file | 00:15 |
| mithro | and then do a cg-commit | 00:15 |
| mithro | if you want an interactive tool, then do the following | 00:15 |
| mithro | cg-reset | 00:15 |
| mithro | (which will cancel the merge) | 00:15 |
| mithro | then run | 00:18 |
| mithro | git merge origin | 00:18 |
| mithro | git mergetool | 00:18 |
| jotham | ok written that all down | 00:20 |
| CIA-3 | derek tpclient-pyweb * r11c29b67f782 / (8 files in 3 dirs): First concept/prototype for the starmap | 00:20 |
| nash | jotham: You resolve using your editor.. the <<< branchname etc | 00:20 |
| jotham | well emailed it tomyself :p | 00:20 |
| *** dmpayton is now known as dmpayton_ | 00:21 | |
| dmpayton_ | bbiab | 00:21 |
| jotham | nash: it got screwed up because i converted mithros tabs to spaces | 00:21 |
| jotham | nash: making the actual code changes hard to see | 00:21 |
| mithro | most of the time git will merge sucessfully without your help | 00:22 |
| mithro | jotham: make sense? | 00:23 |
| jotham | i'll see next time i get a conflict | 00:23 |
| nash | right... don't let your edittor do that sort of thing ;-) | 00:25 |
| *** mithro has quit IRC | 00:26 | |
| *** mithro has joined #tp | 00:26 | |
| mithro | jotham: what did you get? | 00:26 |
| jotham | mithro: get when? | 00:27 |
| jotham | mithro: i didn't do anything yet, i am at work, i'm just going to re-add my code manually when i get home | 00:27 |
| jotham | like i said: jotham | so i think i'll go to mithros last version, readd my code ontop of it manually, then if it happens again seek your guys help before making a mess | 00:27 |
| mithro | jotham: I said a bunch of stuff about what you are suppose to do | 00:29 |
| jotham | 04:23 jotham | ok written that all down | 00:30 |
| jotham | 04:26 mithro | jotham: make sense? | 00:30 |
| mithro | jotham: okay cool | 00:30 |
| jotham | 04:26 jotham | i'll see next time i get a conflict | 00:30 |
| jotham | conversations take two people :p | 00:30 |
| nash | jotham: Was it you who pasted the link to CVG GalCiv story? | 00:34 |
| mithro | nash: JLP probably | 00:36 |
| nash | Okay... I was just going to say... it was very cool then JLP... thanks ;-) | 00:36 |
| *** TBBle has quit IRC | 00:56 | |
| mithro | bblr | 01:30 |
| *** mithro has quit IRC | 01:42 | |
| *** mithro has joined #tp | 01:42 | |
| *** nash has quit IRC | 03:29 | |
| *** llnz has joined #tp | 03:34 | |
| llnz | hi all | 03:36 |
| *** mithro has quit IRC | 03:38 | |
| llnz | hi all | 03:45 |
| *** mithro has joined #tp | 04:26 | |
| mithro | dmpayton_: oooh, I see commits | 04:28 |
| mithro | ~seen dmpayton | 04:30 |
| tpb | mithro: dmpayton was last seen in #tp 4 hours, 31 minutes, and 13 seconds ago: <dmpayton> cg-commit -m notes go here, yes? | 04:30 |
| mithro | ~seen dmpayton_ | 04:30 |
| tpb | mithro: dmpayton_ was last seen in #tp 4 hours, 8 minutes, and 39 seconds ago: <dmpayton_> bbiab | 04:30 |
| mithro | hey llnz | 04:31 |
| CIA-3 | mithro tpserver-py * r808855aca7bc / (tp/server/rules/__init__.py tpserver-py-tool): Ability to print out the avaliable rulesets. | 04:32 |
| CIA-3 | mithro tpserver-py * r0376e8192ba7 /tp/server/bases/Object.py: Add ability to get objects by their type. | 04:32 |
| CIA-3 | mithro tpserver-py * r0109997d63bc /tp/server/rules/base/objects/Planet.py: Ability to actually store resources on a planet. | 04:32 |
| CIA-3 | mithro tpserver-py * r364eb67a0005 /tp/server/rules/ (minisec/__init__.py minisecplus/__init__.py): Make Minisec+ have resources. Remove them from basic Minisec. | 04:32 |
| mithro | dmpayton_: ping? | 04:34 |
| llnz | hi mithro | 04:36 |
| *** Demitar has quit IRC | 04:53 | |
| JLP | hi all | 05:33 |
| llnz | hi JLP | 05:33 |
| JLP | llnz: i've read the ruleset development book yesterday and it is very nice so far | 05:37 |
| JLP | llnz: do you think it would be good to also put it on wiki | 05:38 |
| *** TBBle has joined #tp | 05:38 | |
| JLP | brb have to take the dog out | 05:39 |
| CIA-3 | jotham battleviewer * rb3741d4ef9e3 / (.gitignore run_battleviewer.py xml_validator.py): | 05:48 |
| jotham | ok | 05:49 |
| jotham | finding and reading a proper cogito tutorial helped :p | 05:49 |
| CIA-3 | jotham battleviewer * r6868914ff85d /battleparser.py: Finished cleaning up mess made while learning cogito | 05:51 |
| JLP | back | 05:54 |
| jotham | hey JLP | 05:55 |
| jotham | mithro: when you are around ping me, i'm gonna go have a bath | 05:55 |
| *** zipola has quit IRC | 06:33 | |
| llnz | JLP: thanks | 06:38 |
| llnz | i will think about putting it on the wiki | 06:38 |
| mithro | jotham: ping | 06:42 |
| mithro | jotham: which tutorial did you find? | 06:43 |
| JLP | mithro: this cogito guide helped me quite a bit - http://wiki.sourcemage.org/Cogito_Guide | 06:46 |
| tpb | Title: Cogito Guide - SourceMage Wiki (at wiki.sourcemage.org) | 06:46 |
| mithro | JLP: did you see how to do an interactive merge? | 06:47 |
| mithro | cg-reset <- revert the failed merge | 06:48 |
| mithro | git merge origin | 06:48 |
| JLP | mithro: nope not yet | 06:48 |
| mithro | git mergetool | 06:48 |
| mithro | there are a bunch of good merge tools out there | 06:49 |
| mithro | Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff | 06:49 |
| mithro | i'm pretty sure any tool which takes 3 arguments would work fine too | 06:50 |
| JLP | ah nice, i already used kdiff3 a couple of times | 06:50 |
| JLP | i've also found qgit which is quite nice to visualise the branches and stuff - http://digilander.libero.it/mcostalba/ | 06:52 |
| tpb | Title: QGit (at digilander.libero.it) | 06:52 |
| mithro | i quite like gitk | 06:52 |
| mithro | anyway have to run | 06:53 |
| mithro | bblr | 06:54 |
| *** pschulz01 has joined #tp | 07:05 | |
| llnz | hi pschulz01 | 07:05 |
| pschulz01 | howdy.. | 07:06 |
| llnz | i'm having a little trouble pulling your libtprl patch | 07:07 |
| jotham | mithro: hi | 07:32 |
| pschulz01 | llnz: Ok.. 'server-update' error.. or something else? | 07:36 |
| llnz | error: Unable to find 7d50a954a1617df589250e7364ea21af7f93e8bf under http://git.mawsonlakes.org/git/tp/libtprl | 07:37 |
| llnz | Cannot obtain needed object 7d50a954a1617df589250e7364ea21af7f93e8bf | 07:37 |
| tpb | Title: Index of /git/tp/libtprl (at git.mawsonlakes.org) | 07:37 |
| pschulz01 | llnz: I did have to 're-clone it'.. hoping that fixed a problem. | 07:37 |
| llnz | ok | 07:38 |
| llnz | should i try now? | 07:38 |
| pschulz01 | um.. hold up.. | 07:38 |
| *** nash has joined #tp | 07:44 | |
| pschulz01 | llnz: Try now | 07:44 |
| llnz | ok | 07:44 |
| llnz | cool | 07:45 |
| pschulz01 | work? | 07:45 |
| CIA-3 | paul libtprl * r7d50a954a161 /debian/ (8 files): Removed lintian errors from Debian packaging | 07:45 |
| * nash waves | 07:45 | |
| llnz | pschulz01: yes | 07:45 |
| llnz | hi ba | 07:45 |
| pschulz01 | Yeah.. I'm amazed at my ability to surprise myself sometimes. | 07:45 |
| llnz | hi nash | 07:45 |
| nash | tpb: seen DysticFro | 07:45 |
| tpb | nash: I have not seen DysticFro. | 07:45 |
| nash | tpb: seen DystopicFro | 07:46 |
| tpb | nash: DystopicFro was last seen in #tp 4 weeks, 0 days, 6 hours, 7 minutes, and 9 seconds ago: <DystopicFro> nash: I'll email you the location that you can clone from when I get it up | 07:46 |
| nash | So anything interesting happening? | 07:46 |
| nash | mithro: You there? | 07:46 |
| jotham | 55 mithro | anyway have to run | 07:46 |
| jotham | 56 mithro | bblr | 07:46 |
| jotham | hum there is something screwed up with my paste buffer | 07:47 |
| pschulz01 | llnz: The REVU upload requires a revision of '-0ubuntu1'.. is that a problem for the packaging at this stage? Debian wouldn't require this. | 07:47 |
| llnz | pschulz01: i don't mind | 07:47 |
| nash | jotham: thanks | 07:47 |
| jotham | hey llnz you know how to write .dtd files right? | 07:48 |
| jotham | i have a problem with battle.dtd and the sollution hasn't been immediately obvious | 07:48 |
| jotham | and i want to be sure of myself before i tell mithro to fix something ;) | 07:48 |
| llnz | jotham: yes | 07:48 |
| jotham | this line here:<!ELEMENT round (log*, move*, (fire | damage | death)* ) > | 07:48 |
| jotham | the validator is complaining because the xml looks like this: http://rafb.net/p/0tqw6T40.html | 07:49 |
| tpb | Title: Nopaste - No description (at rafb.net) | 07:49 |
| jotham | specifically that line 14 'log' is comming after (fire | damage | death)* | 07:49 |
| jotham | is there a way to say 'any order is fine'? | 07:50 |
| pschulz01 | jotham: why dtd, rather tha (the other format) | 07:50 |
| nash | jotham: yes | 07:50 |
| pschulz01 | than | 07:50 |
| jotham | pschulz01: i didn't choose the format | 07:50 |
| llnz | jotham: if all the parameters can be in any format, the you can use: | 07:50 |
| jotham | pschulz01: also, as i understand dtd is perfect for simple structures | 07:50 |
| nash | <!ELEMENT round (log | move | fire | damage | death) * | 07:50 |
| nash | > | 07:50 |
| llnz | what nash said :-) | 07:50 |
| pschulz01 | ta. | 07:51 |
| jotham | hum, but, the way it's written at the moment is a bit different logically isn't it | 07:51 |
| nash | Yes... adter a number of fire, damage, deaths you can non longer have logs | 07:52 |
| nash | Also logs must occur before all movements | 07:52 |
| jotham | oh true, because the * is on the outside of the subgroup | 07:53 |
| jotham | ok | 07:53 |
| jotham | well then, all is well in the hundred acre wood | 07:54 |
| jotham | now all i need to do is get mithro's part to spit out valid xml | 07:54 |
| * nash giggles | 07:55 | |
| nash | jotham: Does the battleviewer download the battles or just use the ones on hte local system? | 07:55 |
| jotham | i wasn't allowed another dependancy, and really wanted xml validation, since randomly formatted xml screwed me over, so the compromise between my wishes and mithros wishes is a python module that validates a document if pyxml is installed, otherwise silently passes | 07:56 |
| jotham | nash: not at the moment, but i'm more than happy to learn the how and what of doing that | 07:56 |
| mithro | jotham: hello! | 07:57 |
| jotham | hey | 07:57 |
| jotham | mithro: so i changed the .dtd a bit and now the battle?.xml files in test/ validate and parse - but - whatever generates tehm needs to be modified a little bit | 07:58 |
| mithro | pschulz01: if you want http clone working you need to run a command after each commit/pack | 07:59 |
| nash | JLP: cool | 07:59 |
| pschulz01 | mithro: Yes.. I know. | 08:00 |
| pschulz01 | mithro: I had a merge problem.. and forgot to do that. | 08:00 |
| mithro | jotham: what do I need to change? | 08:03 |
| jotham | mithro: first 2 lines of the files need to be: | 08:03 |
| jotham | <?xml version="1.0"?> | 08:03 |
| jotham | <!DOCTYPE battle SYSTEM "battle.dtd"> | 08:03 |
| jotham | should be sweet as after that | 08:03 |
| mithro | hrm, any idea how to get elementtree to output that? | 08:04 |
| pschulz01 | mithro: it should be accessable via git daemon. | 08:05 |
| jotham | i thought elementtree was a generic tree parser | 08:05 |
| jotham | rather than xml specific | 08:05 |
| mithro | jotham: possibly | 08:06 |
| jotham | anyone know, if i get ? symbols whenever my friend types, where i can change my encoding or whatever for irc | 08:07 |
| jotham | can irc even handle it | 08:07 |
| jotham | example: | 08:07 |
| jotham | 12:06 etorix | ???? ?? ? ???? | 08:07 |
| mithro | jotham: have no idea :/ | 08:09 |
| nash | irc is pretty encoding agnostic | 08:09 |
| jotham | i assume it's an encoding issue somewhere along the line | 08:09 |
| jotham | but i don't know what needs reconfiguring | 08:09 |
| nash | Just make sure you are both on utf-8 and things shoudl generally work | 08:10 |
| jotham | yeah i don't know where to define my usage of utf-8 | 08:10 |
| nash | jotham: What is your system encoding? | 08:10 |
| jotham | the system running hte irc client or the system running the terminal client? | 08:10 |
| nash | Eek.. both really. The irc client should have a locale set to something with utf8, and the terminal needs to handle that | 08:12 |
| jotham | system running the client is configured to use en_NZ.UTF-8 UTF-8 | 08:13 |
| jotham | same with the box running the terminal client | 08:13 |
| jotham | is there a command to set/test the active encoding format? | 08:13 |
| jotham | i don't know a lot about this at all | 08:14 |
| nash | I shoudl be in utf | 08:15 |
| nash | So do you a bullet: • | 08:15 |
| jotham | utf? | 08:15 |
| jotham | yes i see a bullet | 08:15 |
| nash | utf8 | 08:15 |
| nash | 你好 | 08:16 |
| nash | A bit of chinese? | 08:16 |
| jotham | yep i see the characters | 08:16 |
| nash | Then it's not your end that has the problem ;-) | 08:16 |
| jotham | ok on this client i don't (connected to screen twice) | 08:16 |
| jotham | this is a winxp client running putty.exe | 08:17 |
| nash | Probably using a ms specific encoding, not utf8 | 08:17 |
| jotham | i see japanese and chinese characters fine on web pages, wonder if i can fix it here | 08:17 |
| nash | jotham: Issue is detecting and handling of encoding, not if you can see other websites | 08:18 |
| jotham | i mean, i know the OS is capable of it because i installed the right fonts | 08:18 |
| nash | Basically you have data coming in on the irc channel which either your client of putty aren't handling correctly. They think it is a different character set | 08:18 |
| jotham | just gotta get putty to give up the love | 08:19 |
| jotham | woo, brb | 08:19 |
| nash | jotham: Not quite... MS uses UCS2 for unicode encodings, not utf8... | 08:19 |
| jotham | woo! | 08:19 |
| jotham | i see the chars in putty | 08:19 |
| jotham | =) | 08:19 |
| llnz | JLP: awesome blog post you pointed out on the wiki, loved the video | 08:20 |
| jotham | nash: it was set to ISO-8859-1:1998 (Latin-1, West Europe) | 08:20 |
| nash | mithro: Looks like Dystopic will be back online tomorrow BTW ;-) | 08:20 |
| jotham | putty's encoding | 08:20 |
| nash | That would break it | 08:20 |
| nash | Can you set it utf8? | 08:21 |
| jotham | yeah i did just before | 08:21 |
| jotham | 12:22 jotham | i see the chars in putty | 08:21 |
| nash | 我是大江 | 08:22 |
| jotham | mithro: i can't see how to add that stuff with elementtree | 08:22 |
| nash | That work? | 08:22 |
| jotham | yes sir | 08:22 |
| nash | All good | 08:22 |
| mithro | i just append a string | 08:22 |
| mithro | nash: cool! | 08:22 |
| jotham | =\ | 08:22 |
| nash | mithro: ? | 08:22 |
| mithro | s/append/preappend | 08:22 |
| nash | Dystopic you mean? | 08:22 |
| mithro | [21:54] <nash> mithro: Looks like Dystopic will be back online tomorrow BTW ;-) | 08:22 |
| nash | Yeah... | 08:22 |
| mithro | jotham: which git tutorial did you find in the end | 08:24 |
| jotham | heh...well i should be smacked =) it wasn't, it was the bundled README file | 08:25 |
| jotham | well it was the cogito readme | 08:25 |
| jotham | http://www.kernel.org/pub/software/scm/cogito/README | 08:25 |
| tpb | <http://ln-s.net/ZA6> (at www.kernel.org) | 08:25 |
| CIA-3 | mithro battleviewer * rc32f320876e3 /tests/ (6 files): Fixed doctype and xml header. | 08:26 |
| mithro | jotham: does it validate now? | 08:41 |
| jotham | uh, i don't have a copy of your program | 08:42 |
| jotham | oh i see heh i ignored CIA-3 :\ | 08:43 |
| jotham | i should sleep | 08:43 |
| jotham | let me check that | 08:43 |
| mithro | okay | 08:43 |
| * llnz wanders off | 08:47 | |
| llnz | later all | 08:47 |
| *** llnz has quit IRC | 08:47 | |
| jotham | mithro: awesome =) | 08:49 |
| mithro | jotham: yay! | 08:49 |
| jotham | mithro: i'll get those working with the viewer now, they validate fine | 08:49 |
| jotham | nash said something about having the viewer browse/download them from the wild? | 08:49 |
| mithro | okay, it'll be cool to watch them | 08:49 |
| mithro | jotham: currently there is no way to download them | 08:49 |
| nash | jotham: I was curious if it could.. not saying there was anything that could ;-) | 08:50 |
| jotham | nash: sounds like a good idea to me :p | 08:50 |
| mithro | the client (ie tpclient-pywx) will probably download them and then parse them to your program | 08:50 |
| jotham | so when do they get generated | 08:50 |
| jotham | ok | 08:50 |
| nash | Yeah - once they get generated is one key here ;-) | 08:51 |
| jotham | heh | 08:51 |
| jotham | so i'm waiting on pygame 1.8 | 08:51 |
| jotham | it has a ton of improvements | 08:51 |
| jotham | i see them talking about it every day (the developers) | 08:51 |
| mithro | 1.8 has been a long time coming | 08:51 |
| jotham | they are really doing a lot now | 08:51 |
| jotham | _raz_ has been a great help | 08:52 |
| mithro | it would be good to see a release | 08:54 |
| nash | Anywya - I'm off to bed | 08:55 |
| nash | night all | 08:55 |
| jotham | later | 08:55 |
| jotham | me too | 08:55 |
| CIA-3 | nash galaxie * r1f7515901bf2 /tpe_obj.c: Fix a sparse warning; NULL and 0 dangerous | 08:55 |
| CIA-3 | nash galaxie * r45516becdd24 / (12 files): Add extra arg to tpe_util_parse_packet to handle 'end' | 08:55 |
| mithro | see ya | 08:57 |
| pschulz01 | mithro: Found my problem.. :-) git pull doesn't work on a 'bare' .git directory, for what are now obvious reasons. | 08:59 |
| pschulz01 | it helps if I read the man page. | 09:00 |
| *** Epyon_ has joined #tp | 09:00 | |
| mithro | pschulz01: okay | 09:02 |
| pschulz01 | mithro: That's what git-fetch is for. | 09:02 |
| jotham | mithro: everything on google says just prepend those tags to the start of the write :\ | 09:16 |
| jotham | like you did | 09:16 |
| jotham | that's lame sauce | 09:16 |
| jotham | i guess it keeps elementtree pure | 09:16 |
| jotham | http://mail.python.org/pipermail/python-list/2004-December/297066.html | 09:17 |
| tpb | <http://ln-s.net/ZAl> (at mail.python.org) | 09:17 |
| jotham | yeah look at line 652 of ElementTree.py | 09:18 |
| jotham | elif encoding != "utf-8" and encoding != "us-ascii": | 09:18 |
| jotham | file.write("<?xml version='1.0' encoding='%s'?>\n" % encoding) | 09:18 |
| jotham | but | 09:19 |
| jotham | elif tag is ProcessingInstruction: | 09:19 |
| jotham | file.write("<?%s?>" % _escape_cdata(node.text, encoding)) | 09:19 |
| jotham | so you could i assume insert processing instructions | 09:19 |
| jotham | ElementTree.ProcessingInstruction | 09:19 |
| jotham | into your output tree | 09:19 |
| jotham | it wouldn't work for <!DOCTYPE though, so i guess it'd just make more of a mess | 09:19 |
| jotham | ok i'm going to bed, night | 09:20 |
| brx | mithro: you there? :) | 09:25 |
| *** pschulz01 has quit IRC | 09:51 | |
| *** Demitar has joined #tp | 10:54 | |
| *** zipola has joined #tp | 11:07 | |
| *** Demitar_ has joined #tp | 11:15 | |
| *** Demitar has quit IRC | 11:16 | |
| *** JLP has quit IRC | 11:39 | |
| *** JLP has joined #tp | 11:42 | |
| *** dmpayton_ has quit IRC | 12:28 | |
| *** Demitar has joined #tp | 14:43 | |
| *** _JLP_ has joined #tp | 15:40 | |
| *** JLP has quit IRC | 15:45 | |
| *** _JLP_ is now known as JLP | 16:13 | |
| *** drdevice has quit IRC | 17:47 | |
| *** nash_ has joined #tp | 18:08 | |
| CIA-3 | paul libtprl * r1897d1a16053 /debian/changelog: Changed back from Ubuntu package numbering. | 18:37 |
| mithro | brx: i'm here now | 18:52 |
| mithro | have to run | 18:55 |
| mithro | bblr | 18:55 |
| mithro | ~seen dmpayton | 18:56 |
| tpb | mithro: dmpayton was last seen in #tp 18 hours, 57 minutes, and 14 seconds ago: <dmpayton> cg-commit -m notes go here, yes? | 18:56 |
| *** mithro has quit IRC | 19:16 | |
| *** mithro has joined #tp | 20:07 | |
| *** pschulz01 has joined #tp | 20:09 | |
| mithro | morning pschulz01 | 20:16 |
| pschulz01 | morning.. I might be practicing my newly honed packaging skills on some internal software here a work :-) | 20:21 |
| mithro | pschulz01: good luck :P | 20:23 |
| pschulz01 | mithro: It was good to have a 'friendly' project to practice on. | 20:24 |
| mithro | pschulz01: glad we could help | 20:25 |
| mithro | brb | 20:25 |
| mithro | ~seen niphree | 21:59 |
| tpb | mithro: niphree was last seen in #tp 3 days, 13 hours, 17 minutes, and 4 seconds ago: <niphree> ok | 21:59 |
| mithro | :/ | 21:59 |
| *** xdotx has joined #tp | 22:06 | |
| *** nash has quit IRC | 22:24 | |
| *** mithro has quit IRC | 22:29 | |
| *** nash has joined #tp | 22:32 | |
| *** nash has quit IRC | 22:43 | |
| *** nash has joined #tp | 22:43 | |
| *** nash has quit IRC | 22:50 | |
| *** nash has joined #tp | 22:53 | |
| *** mithro has joined #tp | 22:53 | |
| mithro | afternoon people | 22:54 |
| mithro | what is with all the duplicates? | 22:54 |
| xdotx | popular names of course ;) | 22:58 |
| xdotx | and 'afternoon to you, mithro | 23:02 |
| mithro | xdotx: so, I haven't seen any more commits from you yet :P | 23:02 |
| xdotx | mithro: er.. uh... there's one over there- look! | 23:04 |
| * xdotx runs | 23:05 | |
| mithro | xdotx: RFTS stealing all your time, eh? :) | 23:05 |
| xdotx | actually I've not got a really good idea of the next steps i need to take to get my "game" loading, atm | 23:06 |
| mithro | xdotx: can I help at all? | 23:06 |
| xdotx | mithro: more like school and a short, sudden burst of social life | 23:06 |
| mithro | I'm not an expert on tpserver-cpp, but I have played with it | 23:06 |
| xdotx | mithro: not sure. llnz said that was the next area he was adding to ruleset dev manual | 23:07 |
| xdotx | but i'm not entirely sure when that was gonna be done.. although i did get the impression, quite soon | 23:08 |
| mithro | xdotx: i'm checking out your branch to have a look at it :) | 23:11 |
| xdotx | mithro: sec, i'll commit what i'm playing with | 23:12 |
| *** jotham- has joined #tp | 23:13 | |
| jotham- | jaja | 23:13 |
| jotham | just to help out | 23:13 |
| mithro | hey jotham | 23:13 |
| xdotx | mithro: committed | 23:17 |
| mithro | hrm.... | 23:18 |
| mithro | xdotx: did you push it? | 23:18 |
| CIA-3 | fr33.em4il tpserver-cpp-rfts * rd70d52e89a8e /modules/games/rfts/ (rfts.cpp rfts.h): Playing around trying to get an empty ruleset to load. | 23:18 |
| xdotx | ~ maybe not :P | 23:18 |
| mithro | xdotx: what timezone are you in? | 23:19 |
| xdotx | pacific | 23:19 |
| mithro | okay | 23:19 |
| mithro | currently about 8:30pm? | 23:19 |
| xdotx | yep | 23:20 |
| xdotx | although i'm probably going to need a nap soon | 23:20 |
| mithro | xdotx: so it's not currently loading? | 23:20 |
| xdotx | mithro: not so far as i can tell | 23:21 |
| mithro | okay | 23:21 |
| mithro | compiling now | 23:21 |
| xdotx | btw, did you want to give it a different name (other than RFTS or RFTS clone)? | 23:22 |
| mithro | xdotx: your project, feel free to decide :) | 23:23 |
| mithro | FSCK! | 23:25 |
| xdotx | what's up? | 23:28 |
| mithro | i just did a rm -rf tpserver-py rather then tpserver-cpp | 23:29 |
| xdotx | ouch | 23:29 |
Generated by irclog2html.py 2.5 by Marius Gedminas - find it at mg.pov.lt!