Monday, 2007-05-28

*** tpb has joined #tp00:00
*** ChanServ sets mode: +o tpb00:00
*** jotham has quit IRC00:22
*** jotham has joined #tp00:28
JLPahoy all01:50
nashheyo JLP01:51
* JLP goes readin a new blog post about galciv and 4x - http://selfdeprecatingjournalism.blogspot.com/2007/05/galactic-civilisation-2-war-report-and.html01:52
tpb<http://ln-s.net/Z2M> (at selfdeprecatingjournalism.blogspot.com)01:52
nashLooks cool - but a long read02:04
CIA-3mithro metaserver-lite * r6c7bbec81813 /index.php: Changed to tp+ format.02:06
mithronash: arg! I can't get the thing to coredump anymore02:07
mithroopps, there is goes02:08
nashmithro: I bet most will go away when either a) I stop it looking beyond the end of messages or b) you send the extra data with objects02:10
*** Demitar has quit IRC02:12
mithronash: well, we should both be doing them :)02:12
mithronash: you have email02:12
nashmithro: Yes02:13
mithronash: I think I know what is causing your problem however02:13
nashmithro: which address?02:13
nashhmm?02:13
mithroit's related to the problems that was occuring with orders02:14
mithroBrett Nash <[email protected]>02:14
mithroopps that probably wasn't a good thing to put on the channel :/02:14
mithroJLP: ping?02:15
JLPmithro: pong02:15
mithroJLP: you going to comment on the blog?02:15
nashmithro: I'll live02:15
JLPmithro: probably02:16
mithroJLP: I like their ideas02:16
mithroprobably something nash's client could do :)02:16
JLPmithro: yeah me too02:16
nashmithro: That's the idea ;-)02:16
JLPmithro: i was also reading some other guys blog a few days ago and his idea was to put some modifier objects into space between planets, which woul effect some ships properties while ship is in the area02:17
* mithro has to head to a tutorial02:18
mithronash: any luck getting my mail?02:18
nashmithro: Yes02:21
mithrosee ya!02:21
nashbye02:21
nashAnd evas CVS now has a direct draw engine...02:22
nashMy client will soon be win32 happy... Any win32 people who care to take a look in a week or two?02:22
*** Demitar has joined #tp02:36
mithroso nash, when will add a theme which doesn't look so horrible!02:41
nashmithro: Feel free ;-)02:41
nashIt's mostly in the edje files, so it can be replaced easily.02:41
nashIf anyone wants to sit down and do it, I'm happy to help with any technical problems02:42
nashPersonally I'm more worried about the core features first.02:42
nashThe system can switch themes at start up (I can fix it to do it run time too)02:42
mithronash: what about Mac?02:45
nashThey can use GL ;-)02:46
nashOr X1102:47
JLPths is the comment i'm about to post at that blog02:50
JLPHi, I'm one of the developers at Thousand Parsec (a free and open source framework for creating 4X games) and I like your idea about fixing the queue issue and also like the videos you have attached at the end about GalCivII. If you don't mind I will add a link to this blog post to our Wiki where we started collecting different ideas so other developers can refer to them.02:50
JLPBTW if you are interested you can also join us on our IRC channel (#tp on freenode.net) or maybe join our mailing lists. Maybe you have some other ideas that would help make 4X better, or maybe you can even help us programming, testing or in some other way. Of course you can just join us and chat with other people who love 4X.02:50
mithronash: to bad galaxie crashs so much )02:50
mithros/)/;)02:50
nashmithro: Works fine for tpserver-cpp02:50
nashToo bad the server I'm talking to does not comply to the published standards.02:50
mithrocrashing on nocompliance is pretty bad :P02:51
* nash wonders if he should get the author of tpserver-py to talk to the authors of TP03 protocol some time...02:51
nashmithro: it will get there... I implemented it for features a lot faster then I would like, whihc means some of the infrastructure wasn't as robust as it shoudl be02:52
nashActually I suspect you are mostly seeing the same issue again and again, rather then multiple issues - mainly searching beyond the end of frames02:53
* nash will note that tpserver-cpp had the same problem until recently ;-)02:53
mithronash: tpserver-cpp has lots of problems ;)02:55
nashmithro: Anyway, I want to fix up the bulk of order types02:55
nashMostly done now.  I'm ignoring the reference paramaters for now.02:55
nashOnce that is done, I shall nail the problem with going of hte end of buffers.02:56
nashAnd then it should be a bit more challenging for you to crash it02:56
nashIronically I only need to fix two functions... unfortunately they are probably the most frequently called functions...02:59
mithronash: couldn't you just assert the frame length equals what you guess?03:02
nashUnfortunatly the callback doesn't knwo the length of the frame in teh callbakc which is the big big issue03:03
*** llnz has joined #tp03:05
mithrohey llnz03:06
*** llnz changes topic to "www.thousandparsec.net | 90,016 lines of code (minus 12k for libltdl) | GSoC started!"03:06
llnzhi mithro03:06
mithrollnz: had a dearth of activity today03:06
llnzi noticed03:09
llnzi guess the metaserver needs updating though03:09
nashSo anyway mithro... you doing the new artwork?03:12
xdotxooo gsoc did just start!03:19
nashxdotx: GET TO WORK YOU LAZY BUM!03:20
nash;-)03:20
xdotxeep!03:20
* xdotx bangs on keyboard03:20
*** dmpayton has quit IRC03:20
xdotxllnz: i got some questions for ya03:20
llnzsure, ask away03:21
nashthat was quick ;-)03:21
*** xdotx has quit IRC03:23
*** xdotx has joined #tp03:23
xdotxack03:24
mithrooff how mone03:24
xdotxllnz: inlining - i didn't notice it used/requested anywhere. are we just going to let gcc do how it wants?03:25
llnzxdotx: yes03:25
xdotxllnz: k. and what about namespaces? are we not using them?03:26
*** tuna-fish has quit IRC03:26
llnzthe server doesn't exactly need speed optomisations at this time03:26
llnznamespaces..... welll.....03:26
llnzIf you want, you can put your ruleset code in a namespace03:26
llnztpserver-cpp does not currently use one for it's code though03:26
* nash notes inlineng is often a sign that you need to rethink your algorithms and data structures...03:27
xdotxnash: how do you figure? just because it's a small improvement where usually your algorithms and types are likely a better source of optimization?03:28
nashxdotx: Exactly that.03:31
*** xdotx has quit IRC03:31
*** xdotx has joined #tp03:31
nashxdotx: Also any decent compiler generally does a better job of inlining then humans...03:31
xdotxnash: yeah, that was my understanding03:32
llnzeasier to maintain too03:32
nashIndeed - and less code bloat03:32
xdotxfair enough. but there's not really any reason for not using namespaces?03:33
nashI'd agree with that... But I'm also a C programmer, so moist of my namespaces involve <libname>_ ;-)03:34
llnzxdotx: the lack of a namespace is something i had thought about changing03:34
xdotxllnz: i'd be happy to help change it :)03:35
*** nash has left #tp03:35
* llnz might not be around consistently for a bit, S/O here03:36
*** pschulz01 has quit IRC03:38
*** jotham has quit IRC03:41
llnzbut i am here03:43
xdotxllnz: got another minor coding question :)03:43
llnzok03:44
*** mithro has quit IRC03:44
xdotxllnz: sometimes i see virtual restated in a derived class, sometimes i don't. is there a preference?03:45
llnzumm....03:45
llnzgenerally like restated03:47
xdotxeasy enough :)03:48
llnzcool03:55
*** Demitar has quit IRC03:58
xdotxllnz: ah, last question! how does the conf file for the server load the ruleset?04:02
xdotxllnz: i noticed the ruleset param in the conf file and was played around getting it to load either minisec or mtsec, but obviously i'd like to load my own ;)04:03
xdotxwas played... i know english, i swear.04:03
llnzhehe04:04
llnzthe ruleset param gives the name of the ruleset, or slightly more precisely, the bit between "lib" and ".la" in the rulesetlib_LTLIBRARIES line of Makefile.am04:05
xdotxah, that's what i suspected!04:06
llnzor...04:06
llnzthe path, including the lib<name> to the module04:07
llnzfor example: ../modules/games/rfts/.libs/librfts04:07
xdotxi tried throwing in "rfts" there but it didn't load the ruleset. can i assume it's because my ruleset is effectly empty?04:08
llnzyes04:08
xdotxi can't remember if i tried it with a full path04:08
xdotxwhat all needs to be implemented just to get it loading?04:08
*** jotham has joined #tp04:11
jothamDebian Etch was a really plesant install04:12
xdotxoo good! i was considering installing it on my little PPC04:13
llnzxdotx: you will need something like the extern 'C' block04:14
*** Demitar has joined #tp04:14
llnzas in minisec.cpp and mtsec.cpp04:14
xdotxllnz: ah. i see04:15
xdotxtricky04:15
llnzabout that is probably the next bit i add to the ruleset dev book04:16
xdotxsounds good04:16
*** mithro has joined #tp04:17
xdotxalright. i'll probably have to do that in the morning. i should get to bed.04:20
xdotxthanks llnz04:20
llnzno prob04:22
* llnz is afk04:22
*** xdotx has quit IRC04:23
llnzback04:44
mithrohey llnz05:31
mithrohow goes everything?05:31
llnznot too ba05:47
llnzd]05:47
mithro~seen nash06:01
tpbmithro: nash was last seen in #tp 2 hours, 27 minutes, and 9 seconds ago: <nash> I'd agree with that... But I'm also a C programmer, so moist of my namespaces involve <libname>_ ;-)06:01
*** brx has joined #tp06:43
mithrowb brx06:45
brxhappy SoC06:46
llnzhi brx06:47
mithrobrx: thanks, how goes your project?06:52
brxI just got up!06:53
mithroexcuses excuses :P06:57
jothamsleep is the worst excuse07:06
*** nash has joined #tp07:11
* nash waves07:13
llnzwb nash07:13
*** pschulz01 has joined #tp07:13
nashhow is life?07:14
mithrohey nash07:14
nashheyo mithro07:14
mithromy theory didn't seem to pan out07:14
nashWhich one was that?07:15
mithrothat I wasn't sending the extra data07:16
nashYou are sending it?07:16
mithroas far as I can see I'm actually sending it07:16
nashHmm... strange07:16
nashI'll look into it a bit more shortly07:17
mithro<class 'tp.netlib.objects.ObjectExtra.Fleet.Fleet'> (0, [(1, 3)], 0)07:17
mithroSending: <Fleet @ 0x85f294c (seq: 10 length: 152)>07:17
mithroSending: 0x54(T) 0x50(P) 0x30(0) 0x33(3) 0x0 0x0 0x0 0xa 0x0 0x0 0x0 0x7 0x0 0x0 0x0 0x98 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x4 0x0 0x0 0x0 0x10 0x6e(n) 0x61(a) 0x73(s) 0x68(h) 0x20( ) 0x46(F) 0x69(i) 0x72(r) 0x73(s) 0x74(t) 0x20( ) 0x46(F) 0x6c(l) 0x65(e) 0x65(e) 0x74(t) 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x0 0x85 0xef 0x4 0x90 0x0 0x0 0x0 0x0 0x1c 0xab 0x4f(O) 0x48(H) 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x07:17
mithro0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x5 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x1 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x4 0x0 0x0 0x0 0x5 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x46(F) 0x5a(Z) 0x2e 0xa 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x1 0x0 0x0 0x0 0x1 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x007:17
nashNot fleets, seems to be occuring on planets and the galaxy object07:18
nashs/galxy/universe/07:18
CIA-3llnz ruleset-book * rf43d1ff69b02 /.gitignore: Added *.backup files to .gitignore07:19
mithronash: it seems okay on Planets too07:20
nashhmm.. okay07:20
nashAs I said - give me a little while07:20
mithrookay07:21
nashSorry - in the middle of other things07:22
nashBut I do want to fix the bug...07:22
mithronash: but I do think i've found a bug07:25
nashcool07:25
nashAnything major?07:26
* nash needs a faster web connection...07:34
mithronash: not sending enough data in a planet07:40
mithro4*4=16 != 1207:41
nashAhh....07:43
nashSo that coudl be it07:43
nashllnz: If only all RCS systems used the smae ignore system...07:51
llnzhehe, ruleset-book has been in git from about the fourth commit07:52
CIA-3mithro libtpproto-py * r8fb1b7291fe4 /tp/netlib/objects/ObjectExtra/Planet.py:07:55
CIA-3Fixed the length of the packet.07:55
CIA-3Also added a simple error check.07:55
CIA-3mithro libtpproto-py * rb778516881cc /tp/netlib/objects/ (Description.py ObjectDesc.py Order.py OrderDesc.py): Make orders and objects closer.07:55
CIA-3mithro tpserver-py * r8ae565638e55 /tp/server/bases/Resource.py: Fixed up Resource to use the names in the table.07:55
CIA-3mithro tpserver-py * r894130c5912e /tp/server/rules/minisec/__init__.py: Add a bunch of resources for testing.07:55
CIA-3mithro tpserver-py * r380c95b831f0 /tp/server/rules/base/objects/Planet.py: Random "crazy" resources on a planet.07:55
CIA-3mithro tpclient-pywx * r22898ae2e633 /windows/winInfo.py: Make the resource output a little bit nicer.07:55
*** nash has quit IRC07:55
*** TBBle has quit IRC07:55
*** nash has joined #tp07:59
nashDamn useless piece of crap machine07:59
nashlocks up from temp half the damn time07:59
nashDid I miss anything?08:00
llnznash: did you see my reply?08:00
nashnope08:00
mithronash: still getting segfault08:01
nashmithro: d'oh08:01
llnz[23:56] <llnz> hehe, ruleset-book has been in git from about the fourth commit08:01
llnzthen a whole lot of commits from mithro08:01
nashokay08:01
nashdid my push go through?08:02
mithrono08:03
CIA-3nash galaxie * rb47da0ae4b7d /tpe_orders.c: Orders: Most of order types are now supported.08:03
nashsecond time roung...08:03
mithronash: you should have two emails08:06
nashmithro: Okay08:06
mithromore valgrind traces08:07
nashmithro: I have one08:07
mithro==32673== LEAK SUMMARY:08:07
mithro==32673==    definitely lost: 1,053 bytes in 44 blocks.08:07
nashouch08:07
nashActually - I bet a reasoanable % is in fontcache08:07
mithrolots is fontconfig08:08
nashGood08:08
nashI suppress them normally08:08
nashSome is shared, some is X.08:08
mithroList Arg (6) has 3 options08:08
mithro        Option 0: Scout (-1)08:08
mithro        Option 1: Frigate (-1)08:08
mithro        Option 2: Battleship (-1)08:08
mithro:/08:08
nashLooks good there08:09
mithrooh!08:09
mithro-1 == maximum08:09
mithroNode text is BuildFleet08:10
mithroNode is (null)08:10
mithroPos is  708:10
mithro?08:10
nashYep08:11
nashI saw the -1 go in the other day08:11
mithro==32083== 527 bytes in 32 blocks are definitely lost in loss record 167 of 23508:11
mithro==32083==    at 0x4021620: malloc (vg_replace_malloc.c:149)08:11
mithro==32083==    by 0x8050675: tpe_util_string_extract (tpe_util.c:30)08:11
nashI don't recall that being in the standard before08:11
llnzme neither08:12
mithronash: it appears not to be08:12
nashmithro: Hence why I don;t support it08:12
mithroalthough -1 == the largest possible number too :P08:12
nashPersonally I thought a limit of 0 would be a better no limit08:12
mithro    *  a SInt32, the id of the player who owns this fleet or -1 if not owned or unknown08:12
mithro    * a list of,08:12
mithro          o a UInt32, the type of the ship08:12
mithro          o a Uint32, the number of the ships in the fleet08:12
mithro    * a UInt32, the amount of damage the fleet currently has08:12
nashThat's fleets however08:13
mithrooh?08:13
nashWhat you pasted.08:14
nashNot build orders08:14
pschulz01What exactly is the libtprl library used for?08:15
* mithro thinks I may need to go to bed :P08:15
llnzpschulz01: it's a readline interface for C++08:15
llnztpserver-cpp uses it08:15
pschulz01llnz: Ta.. that's what I'll put in the description then :-)08:16
llnz(tpclient-cpptext might one day too)08:16
nashmithro: I'll bbs08:17
mithronash: okay08:17
nashif you go to bed - make sure you push  your latewst stuff08:17
mithronash: okay08:24
mithronash: so any ideas on the latest segfaults?08:25
jothami need a sollution for accessing smb shares from my debian box, i have been using mount -t smbfs but if the remote pc goes down it causes all sorts of ungoodness on my local machine, is there a more elegant sollution? i'd even be happy if there was a script or something that kept track of smb mounts and if the remote end fell off, called a umount on the path, as it stands after a few months i can end up with a number of hung mount points08:25
llnzjotham: you could use smbclient (interface like console ftp), or either kde or gnome's network share browser08:26
mithrojotham: you can use mount with a soft timeout08:27
jothamproblem is i'm accessing these shares (once they are mounted) with scp08:27
jothammithro: oh? i'll go look in the man page08:27
jothamoh man08:27
jothamrtfm wins again08:27
jothamcheers mithro08:27
jothamwonder if it's relevent to smb though08:28
mithrocifs is more tollerante08:28
nashmithro: No idea yet... looking in a moment08:29
jothamhum i'll look at cifs tomorrow, looks interesting08:29
nashis tpserver-py and libtpproto up to date08:29
mithronash: I push a bunch of changes when you discoed08:29
nashcool08:29
mithrohttp://www.die.net/doc/linux/man/man8/mount.cifs.8.html08:30
tpb<http://ln-s.net/Z2v> (at www.die.net)08:30
mithronash: check logs ;)08:30
mithrojotham: cifs is pretty much a drop in replacement for smbfs08:31
mithronash: the segfault only seems to occur every couple of runs08:33
nashmithro: Okay - so started okay  - what do you do next?08:34
nashRestart galaxie?  generate a turn?08:36
mithrono, every couple of start ups it just segfaults on connecting08:36
nashmithro: boom - just got it then ;-)08:38
mithrohttp://www.thousandparsec.net/~tim/Screenshot-2.png08:38
tpb<http://ln-s.net/Z2x> (at www.thousandparsec.net)08:38
nashThey are some weird arse fruit trees08:38
llnzhehehehe08:39
nashThat crash is so amazingly weird08:41
jothamhaha08:44
CIA-3nash galaxie * ra1b35925f427 / (galaxie.c tpe_comm.c tpe_gui.c): Fix some leaks and add an assert.08:44
CIA-3nash galaxie * rd471d80b41fb / (galaxie.c tpe_comm.c tpe_gui.c): Merge with git+ssh://baboon/home/nash/work/tranquillity/galaxie08:44
pschulz01llnz: Hazzah! Just ran lintian on the libtprl deb's and all the errors have gone away :-)08:46
llnzpschulz01: cool08:46
mithropschulz01: cool08:46
pschulz01Uploading to REVU.. (Ubuntu package review website)08:47
pschulz01See what people have to say about my packaging :-)08:47
llnzcool08:48
nashmithro: Seems to be fixed.08:49
nashNFI how however08:49
nashI can't get it anymore08:50
mithrooh?08:50
nashTry that last update08:50
nashI jsut tried 20 odd times in a row08:50
mithroyou try rebuilding the tpserver-py database?08:50
nashNot yet08:50
mithroi'll send you a little script08:50
nashBut I could get the crash reliably.  I merged those chagnes, and no more08:50
mithrogalaxie: tpe_gui.c:483: star_update: Assertion `object->gui' failed.08:53
mithro==3863==08:53
mithroI'm regularly getting08:54
mithrogalaxie: tpe_gui.c:483: star_update: Assertion `object->gui' failed.08:54
nashThat's the assert...08:54
mithroAborted (core dumped)08:54
nashstrange08:54
nashI can't get the damn thing08:54
* nash puts in easy fix then08:54
nashWait... I know08:55
nashIt's the screwy object order you have.08:55
mithro?08:55
mithrowhat screwy object order?08:56
nashYou get it when you start up?08:56
mithroyeah08:56
mithrocan I get something from the core file?08:58
nashIf you can deref *object it would be fantastic08:58
nashI never can08:58
mithrowhats the command?09:00
nashprint *object09:00
mithroNo symbol "object" in current context.09:00
nashTry going up a frame, and print *obj09:01
nashmithro: f 109:03
mithrohow?09:03
nashprint *obj09:03
* nash needs to go to bed shortly09:03
mithro(gdb) f 409:03
mithro#4  0x08052844 in star_update (tpe=0x8060cd8, object=0x80a1698) at tpe_gui.c:48309:03
mithro483             assert(object->gui);09:03
mithro(gdb) print *object09:03
mithro$1 = {magic = 0x80575fc "ObjectMagic", tpe = 0x8060cd8, oid = 31, type = OBJTYPE_SYSTEM, name = 0x80a1738 "System 9",09:03
mithro  owner = 0, size = 1677787, pos = {x = 2602947000, y = 6901552000, z = 0}, vel = {x = 0, y = 0, z = 0}, parent = 0,09:03
mithro  nchildren = 2, children = 0x80a1748, nordertypes = 0, ordertypes = 0x80a1758, norders = 0, orders = 0x0,09:04
mithro  updated = 1180322924, fleet = 0x0, planet = 0x0, gui = 0x0, ai = 0x0, ref = 0}09:04
mithro(gdb)09:04
nashRight - very strange... gui == 0x0...09:04
mithroany ideas?09:05
nashAnyway - I have a proper check for it, and another check for something else weird that happened before...09:05
nashI must have an ordering requirement.09:05
mithrogalaxy is always aborting now09:05
nashYeah.09:05
CIA-3nash galaxie * r55e7a1aa61a0 /gui_window.c: Sparse warning supress.09:06
CIA-3nash galaxie * r49701e432e0a /tpe_gui.c: Check for weird universe in star_update, don't call as often either.09:06
nashmithro: Shouldn't crash now...09:06
nashActually there is a case it can still assert09:07
mithronash: well we are about to find out if that is my case09:07
mithroruns09:07
mithrowhat are the 3*null ?09:08
CIA-3nash galaxie * rd347a22c6388 /tpe_gui.c: Fix other path to check for gui.09:08
nashmithro: Where?09:08
mithroon my homeplanet09:08
nashprobably haven't got the resource types yet09:09
nashBasically racec condition.09:09
CIA-3llnz ruleset-book * r01216aa3aad7 /ruleset-dev.tex: Wrote the Writing the Ruleset chapter.09:09
CIA-3llnz ruleset-book * r39a891dc8a15 /ruleset-dev.tex: Added chapter heading for Licensing chapter, yet to be written.09:09
nashDebug prints it, normally doesn't matter09:09
mithrohttp://www.thousandparsec.net/~tim/Screenshot.png09:10
tpb<http://ln-s.net/Z2z> (at www.thousandparsec.net)09:10
mithroarg, the pop-up went away09:10
nashAhh - over a planet?09:11
nashs/planet/star/09:11
CIA-3nash galaxie * rccc29a63ab40 /galaxie.c: Fix leak... small one.09:11
mithroyes09:12
nashmithro: Seen it before, not sure... I've seen it before, and I will nail it at some point :-/09:12
* llnz wanders off09:12
llnzlater all09:12
nashBasically hasn't got planet names09:12
mithrosee ya llnz09:12
nashllnz: night09:12
nashAnd fleet names09:12
*** llnz has quit IRC09:12
nashNot sure why09:12
mithrotpe_gui.c: In function ‘star_update’:09:13
mithrotpe_gui.c:485: error: ‘reutrn’ undeclared (first use in this function)09:13
Epyonwow, nice interface :)09:13
mithronash: you should ship with at least 1 planet graphic09:13
nashmithro: I thought I did actually09:13
nashhmm..09:13
mithroreutrn?09:14
CIA-3nash galaxie * r8c6d0989035f /edje/images/planet.png: Add planet image.09:16
CIA-3nash galaxie * r30cf4f991dd1 /tpe_gui.c: set planet to correct location, and fix reutrn.09:16
nashmithro: The 3x(null) means for some reason I don't have the design type.09:17
mithroahh, that would be okay09:17
nashIs that because tpserver-py isn';t sending it?09:18
mithrobecause Minisec doesn't have any designs09:18
nashIt has 309:18
nashscout, frigate, battleship...09:18
mithrono, tpserver-cpp extended Minisec to have 3 :P09:18
nashhmm...09:19
nashso how do you know what a fleet contains then?09:19
mithrohard coded :P09:19
mithroMinisec was designed long before design support existed09:20
mithroI will add support in the future09:20
nashhmm...09:20
nashokay...09:20
nashuntil then... (null) it is...09:20
mithro(infact tpserver-py had design support before tpserver-cpp :)09:20
nashwhich means don't expect the AI to work too well...09:20
nashAnyway, with the crash out of the way... I'm off to bed.09:21
nashTalk to you tomorrow09:21
mithrookay09:22
mithrosee ya!09:22
* mithro heads to bed too09:22
nashnight09:22
mithrognight everyone09:22
*** nash has quit IRC09:23
pschulz01nash: goodnight.09:23
*** mithro has left #tp09:23
* pschulz01 look to the door as well.09:23
*** mithro has joined #tp09:23
* pschulz01 looks to the door as well.09:23
pschulz01mithro: !! The package is up there.... http://revu.tauware.de/index.py.. search for libtprl09:24
jothammithro: i'm not sure how to commit now i've edited battleviewer09:27
jothambandcamp:27379$ cg-fetch09:27
jothamFetching pack (head and objects)...09:27
jothamFetching tags...09:27
jothamUp to date.09:27
jothambandcamp:11024$ cg-push09:27
jothamerror: remote 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'. maybe you are not up-to-date and need to pull first?09:27
jothami made a cg-commit before09:28
jothamahh here we go, needed a cg-update apparently09:29
*** Demitar has quit IRC09:29
jothamhow do i resolve conflicts09:29
*** Demitar has joined #tp09:29
jothamoh damn i didn't see mithro go to bed, oh well, night guys09:31
*** JLP has quit IRC10:00
*** JLP has joined #tp10:01
*** TBBle has joined #tp10:02
*** dmpayton has joined #tp12:37
dmpaytonAnd thus, it begins.12:38
*** dmpayton has quit IRC14:20
*** tuna-fish has joined #tp14:36
*** xdotx has joined #tp15:23
*** pschulz01 has quit IRC16:18
*** jotham has quit IRC16:18
*** jotham_ has joined #tp17:13
*** nash has joined #tp19:13
mithromorning nash19:32
nashheyo mithro19:33
*** mithro has quit IRC19:42
*** mithro has joined #tp20:00
mithromorning people20:06
*** xdotx has quit IRC20:07
* brx rubs his eyes20:13
mithrohey brx20:15
mithroif I didn't have this stupid assignment I think I would do a bit of scheme coding today20:15
*** xdotx has joined #tp20:18
mithrowb xdotx20:19
xdotxmithro: danka20:24
xdotxmihro: er, danke*20:26
mithroxdotx: how goes your project?20:26
xdotxmithro: well! i was just about to play some more rfts ;)20:29
xdotxmithro: i mean "research"20:29
mithrodon't get to addictited :)20:30
xdotxheh. i've still got a lot to learn about it20:31
* xdotx has the manual printed out sitting below the monitor20:33
brxI named my decompiler after the girl that has broken my heart and continues to destroy my life.20:34
brxyay! :)20:34
xdotxmeaningful20:35
brxI prepended a "de"20:35
brxmentor insisted.20:35
mithronash: ping?21:46
nashpong21:59
*** mithro has quit IRC22:15
*** mithro has joined #tp22:15
*** xdotx has quit IRC22:33
nashlunch shortly22:49
*** mithro has quit IRC22:55
*** mithro has joined #tp23:04
mithrobblr23:04
*** dmpayton has joined #tp23:12
* dmpayton cracks his knuckles and opens komodo23:14
*** mithro has quit IRC23:26
*** mithro has joined #tp23:26
mithrodmpayton: ping?23:27
dmpaytonmithro: pong23:28
dmpaytonGoogle bought me a new suit for my wedding.23:28
mithrodmpayton: yay!23:31
mithrodmpayton: so payment stuff went fine?23:31
mithroarg! I don't want to work on this assignment :/23:32
jotham_hey mithro, i got a question/problem23:32
mithrojotham_: shoot!23:32
jotham_i tried to commit my changes last night, haven't tried since we changed to git23:33
jotham_and it all went wrong23:33
jotham_let me load up the box23:33
jotham_ok23:34
mithrojotham_: okay23:34
mithroI saw it in the logs this morning23:34
mithrodmpayton: so where are we at?23:34
dmpaytonmithro: Yes, payment stuff went fine.23:34
jotham_ok, so how do i resolve the problem23:35
dmpaytonmithro: I'm going to commit what I have, then go afk for a little while, then come back and code some more.23:35
mithrodmpayton: okay that would be great!23:36
CIA-3jotham battleviewer * reb1585e0fb98 / (4 files in 2 dirs):23:37
CIA-3jotham battleviewer * r7c196fae76ee / (8 files in 2 dirs): Merge with git+ssh://[email protected]/git/battleviewer.git23:37
mithrojotham_: I don't think you posted the actual error?23:37
jotham_wierd23:37
jotham_it said there were unmet conflicts23:37
jotham_but now it works23:37
jotham_bandcamp:03660$ cg-push23:37
jotham_updating 'refs/heads/master' from 86a9d299aacf37ded4a5679dde231d51a5e0104b to   7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:37
mithrooh?23:37
jotham_Packing 10 objects23:37
jotham_Unpacking 10 objects23:37
jotham_hooks/update: line 11: /tmp/git-update-hook: Permission denied23:37
jotham_hooks/update: line 22: /tmp/git-update-hook: Permission denied23:37
jotham_hooks/update: line 22: /tmp/git-update-hook: Permission denied23:37
jotham_refs/heads/master: 86a9d299aacf37ded4a5679dde231d51a5e0104b -> 7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:37
mithrodoh!23:37
jotham_does that look healthy?23:37
mithroapart from the permission denied23:38
jotham_what's that all about23:38
mithrohrm... I wonder how that push even worked...23:38
jotham_did it work?23:38
jotham_i guess it did23:38
mithrojotham_: you wearn't in the codemonkey group23:39
*** jotham_ is now known as jotham23:39
*** drdevice has joined #tp23:39
jothamok mithro i want to do a brand-fresh checkout23:40
mithrojotham: I've added you to the group, so next push it should all be okay23:40
jothamwhat do i do23:40
mithrojotham: what does cg-status show?23:40
jothami am writing myself some cg notes23:40
mithrocg-clone git+ssh://[email protected]......23:41
jothambandcamp:21117$ cg-status23:41
jothamHeads: >master      7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:41
jotham  R origin      86a9d299aacf37ded4a5679dde231d51a5e0104b23:41
jotham? actions.pyc23:41
jotham? battlecontroller.pyc23:41
jotham? battleparser-new.py23:41
jotham? battleparser.pyc23:41
jotham? battleview.pyc23:41
jotham? constants.pyc23:41
jotham? element_test.py23:41
jotham? entities/__init__.pyc23:41
jotham? entities/basicentity.pyc23:41
jotham? entities/damageanimation.pyc23:41
jotham? entities/laserblast.pyc23:41
jotham? entities/message.pyc23:41
jotham? out.xml23:41
jotham? states.pyc23:41
jotham? utility.pyc23:42
jotham? weapons.pyc23:42
jotham? xml_validator.pyc23:42
mithrookay you need to create a .gitignore file and tell it to ignore *.pyc :)23:44
jothamok23:44
jothambandcamp:23495$ cg-status23:44
jothamHeads:23:44
jotham   >master      7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:44
jotham  R origin      7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:44
jotham? .gitignore23:44
jothamthat's better eh23:44
jothamuh23:45
jothamthis is odd23:46
mithroneed to add the .gitignore and push it23:46
jothamhttp://git.thousandparsec.net/gitweb/gitweb.cgi?p=battleviewer.git;a=commitdiff;h=7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:46
tpb<http://ln-s.net/Z7w> (at git.thousandparsec.net)23:47
jothamcheck out:23:47
jotham+<<<<<<< master23:47
jothamand23:47
jotham+>>>>>>> origin23:47
jothamwhat's that all about?23:47
jothamdid i just push over your push somehow23:48
jothamand mess it all up23:48
jothamyeah that's no good23:49
jothami don't get why it didn't prompt me about the xml files?23:50
mithrojotham: hrm....23:50
jothamthat's really messy23:51
jothamit's merged the files togeather23:51
jothami can't even sanely diff them23:51
jothamwithout manually splitting them out23:51
mithrookay23:51
mithrohold on23:51
mithrojotham: okay do a "cg-admin-uncommit"23:51
mithrothen a cg-reset23:51
jothamwhat did that do23:52
mithronow what does cg-status show?23:53
mithrocg-admin-uncommit uncommits the last change23:53
mithrocg-reset restores the repository to the currently committed state23:53
jothambandcamp:27652$ cg-status23:53
jothamHeads:23:53
jotham   >master      eb1585e0fb9895c99ef3e3ad7b84ca7634aa362d23:53
jotham  R origin      7c196fae76eeb1eb1b333d0ec4bc330ecc76100123:53
jothamheres the problem23:54
jothami've changed battleparser23:54
jothamand so have you23:54
jothamshall i just edit your current commit?23:54
jothamand readd the code23:54
jothami thought git was better than darcs/svn, is there not some conflict resolution tool?23:55
jothamor did i just screw everything up23:55
dmpaytonmithro: how do I add commit notes?23:57
dmpaytoncg-commit -m notes go here, yes?23:58

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