| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** alanp_ has joined #tp | 00:03 | |
| *** alanp has quit IRC | 00:11 | |
| *** mithro has quit IRC | 00:40 | |
| *** mithro has joined #tp | 01:48 | |
| cherez | Whew, that was an icky bug. | 02:10 |
|---|---|---|
| *** mithro has quit IRC | 02:13 | |
| *** mithro has joined #tp | 02:26 | |
| *** alanp_ has quit IRC | 02:45 | |
| *** ezod has quit IRC | 02:47 | |
| *** llnz has joined #tp | 03:19 | |
| llnz | hi all | 03:20 |
| *** alanp_ has joined #tp | 03:30 | |
| *** greenlion has joined #tp | 03:50 | |
| *** mithro has quit IRC | 04:40 | |
| *** reac has joined #tp | 04:54 | |
| *** verhoevenv has joined #tp | 05:50 | |
| *** mithro has joined #tp | 05:58 | |
| *** ezod has joined #tp | 06:09 | |
| *** verhoevenv has quit IRC | 06:40 | |
| *** verhoevenv has joined #tp | 06:40 | |
| * llnz wanders off | 07:31 | |
| llnz | later all | 07:31 |
| *** llnz has quit IRC | 07:31 | |
| *** bejayay has joined #tp | 07:42 | |
| *** greenlion has quit IRC | 08:00 | |
| *** greenlion has joined #tp | 08:03 | |
| *** greenlion has quit IRC | 08:38 | |
| *** bejayay has quit IRC | 09:06 | |
| *** jmtan has joined #tp | 09:17 | |
| *** gau_veld1 has left #tp | 09:17 | |
| *** greenlion has joined #tp | 09:23 | |
| *** greenlion has quit IRC | 09:27 | |
| *** reac has quit IRC | 09:27 | |
| *** gau_veldt has joined #tp | 09:36 | |
| *** gau_veldt has quit IRC | 09:52 | |
| *** gau_veldt has joined #tp | 09:53 | |
| *** verhoevenv has quit IRC | 10:28 | |
| *** epyon has joined #tp | 11:25 | |
| epyon | wtf is ObjectView isGone? | 12:00 |
| *** gau_veldt has quit IRC | 12:24 | |
| *** gau_veldt has joined #tp | 12:24 | |
| *** gau_veldt has left #tp | 12:25 | |
| *** gau_veldt has joined #tp | 12:25 | |
| CIA-22 | epyon tpserver-cpp-refactor * rc5c6c9f5467a /tpserver/ (4 files): PlayerView EntityInfo addActable stub, ComponentView alternative constructor | 12:40 |
| CIA-22 | epyon tpserver-cpp-refactor * re3e992fafc83 /tpserver/playerview.cpp: | 12:40 |
| CIA-22 | More duplicate code removal | 12:40 |
| CIA-22 | * if someone can explaim me the reason for the existace of isGone, itd | 12:40 |
| CIA-22 | be gladly appriciated... | 12:40 |
| *** alanp_ has quit IRC | 12:42 | |
| *** jmtan has quit IRC | 12:42 | |
| *** alanp_ has joined #tp | 12:44 | |
| *** alanp_ is now known as alanp | 12:48 | |
| epyon | why isn't mysql lock and unlock implemented? | 13:18 |
| *** Greywhind has joined #tp | 13:20 | |
| CIA-22 | epyon tpserver-cpp-refactor * r58cfdd24b774 /tpserver/playerview.h: TODO added | 14:26 |
| CIA-22 | epyon tpserver-cpp-refactor * r7bc1b301b2e7 / (3 files in 2 dirs): | 14:26 |
| CIA-22 | Preparation for MysqlPersistence refactoring | 14:26 |
| CIA-22 | * created MysqlException | 14:26 |
| CIA-22 | * created helper functions | 14:26 |
| CIA-22 | * modified sets to IdSets | 14:26 |
| CIA-22 | * added a IdSet to query string converter | 14:26 |
| CIA-22 | epyon tpserver-cpp-refactor * ra68738195a14 /modules/persistence/mysql/mysqlpersistence.cpp: New exception handling test | 14:33 |
| Landon | mithro: belated pingaling | 14:55 |
| CIA-22 | epyon tpserver-cpp-refactor * r620db5098c50 /modules/persistence/mysql/ (mysqlpersistence.cpp mysqlpersistence.h): | 15:03 |
| CIA-22 | MysqlQuery class | 15:03 |
| CIA-22 | * later probably should be moved to a separate file | 15:03 |
| CIA-22 | * allows single or multirow fetching | 15:03 |
| CIA-22 | * lock and error safe | 15:03 |
| *** tuna-fish has joined #tp | 15:39 | |
| *** llnz has joined #tp | 16:16 | |
| epyon | llnz: how can I compile the mysql module? | 16:29 |
| llnz | hi epyon | 16:29 |
| epyon | hi :) | 16:29 |
| llnz | you will need the development libraries of mysql (client library) installed | 16:30 |
| llnz | configure should pick it up automatically and build it | 16:30 |
| llnz | it being the tpmysql module | 16:30 |
| alanp | llnz: how do we determine how many production points a planet has? | 17:04 |
| llnz | alanp: any way the ruleset wants | 17:05 |
| alanp | when does the build order get used in minisec? | 17:07 |
| llnz | it gets one per turn (for a given planet) | 17:10 |
| llnz | in minisec | 17:10 |
| alanp | ah | 17:11 |
| alanp | should i be doing the same? | 17:11 |
| * alanp guessing no | 17:11 | |
| llnz | probably now | 17:16 |
| llnz | s/now/not/ | 17:16 |
| alanp | hrm | 17:21 |
| alanp | llnz: did we set all property values to 0 now? | 17:23 |
| llnz | no, sorry | 17:23 |
| llnz | i will look at it tonight | 17:24 |
| * llnz writes himself a note | 17:24 | |
| alanp | ok, np | 17:24 |
| alanp | so basically i added a production points resource | 17:27 |
| alanp | and will use that throughout my orders | 17:27 |
| alanp | sound about right? | 17:27 |
| alanp | i'm going to move the star systems to XML as well but that's not really high priority | 17:28 |
| *** Greywhind_ has joined #tp | 17:31 | |
| *** Greywhind has quit IRC | 17:32 | |
| llnz | alanp: for planets and build orders, yes | 17:33 |
| alanp | where has xml been all my life :-) | 17:33 |
| llnz | though i don't know if you want production points accumulating as resources would | 17:34 |
| alanp | when do the resources accumulate? | 17:34 |
| alanp | i don't think i noticed that | 17:34 |
| llnz | well... i depends how you use them | 17:35 |
| alanp | what do you mean? | 17:35 |
| *** Greywhind_ is now known as Greywhind | 17:35 | |
| llnz | if you give a planet a certain amount of production point resources each turn by adding them to the resources param, and the planet doesn't use them, then they will accumulate | 17:36 |
| alanp | you have to use all of them every turn | 17:36 |
| llnz | they may not need to be explicit resources | 17:36 |
| alanp | how else could they be implemented? | 17:36 |
| llnz | a number of ways | 17:37 |
| alanp | is there a recommended way? | 17:38 |
| llnz | in minisec, only the first order is processed (as order queue susgests) and all the (one) points are either used or not | 17:39 |
| llnz | no, not recommended ways yet | 17:39 |
| llnz | there are no recommended ways yet | 17:39 |
| alanp | hehe | 17:39 |
| alanp | crap, i did it as a resource | 17:39 |
| llnz | resource could work | 17:40 |
| alanp | but if the planet doesn't use all of them in a turn, they will gain points? | 17:44 |
| llnz | well, during the doOnceATurn phase, you could remove all the points | 17:44 |
| llnz | or set it to the number of the next turn | 17:45 |
| alanp | where are the resources modified elsewhere? | 17:46 |
| alanp | aye i was looking in the wrong place | 17:46 |
| llnz | not unless you let them be | 17:46 |
| * alanp d'oh | 17:46 | |
| alanp | if a planet has a "Build Fleet" allowed in it's ortder types, why can't i ever see it? | 17:48 |
| alanp | errr | 17:54 |
| * alanp answers many of his own questions | 17:55 | |
| llnz | bbs, meeting | 17:55 |
| *** Greywhind has quit IRC | 18:33 | |
| llnz | back | 18:43 |
| *** alanp has quit IRC | 18:44 | |
| *** alanp has joined #tp | 18:52 | |
| CIA-22 | epyon tpserver-cpp-refactor * r9d919fc6aeae /modules/persistence/mysql/ (mysqlpersistence.cpp mysqlpersistence.h): MysqlQuery in action and corrected | 18:52 |
| llnz | epyon: did you get tpmysql to build? | 19:08 |
| alanp | what enables the player to create orders for a planet? | 19:20 |
| * alanp completely missing it | 19:20 | |
| alanp | IE in rfts I can create an order on my planet | 19:20 |
| alanp | IE Build Fleet order | 19:20 |
| alanp | looking through the code it looks like the player's planet is created the same | 19:21 |
| llnz | rfts is special, it changes what orders are available each turn | 19:28 |
| alanp | right, but i still need to be able to create orders on planets | 19:34 |
| llnz | ok, there are a few conditions | 19:43 |
| llnz | the player must own the orderqueue (and to see the order queue, own the planet) | 19:43 |
| llnz | the order type must be in the allowed orders for the order queue | 19:43 |
| mithro | alanp: the answer to these questions are in the mtsec rules | 19:44 |
| alanp | mithro: which? | 19:45 |
| mithro | how many production points are created/used | 19:45 |
| alanp | start at 0? | 19:46 |
| alanp | increment by capability until you hit 100? | 19:46 |
| alanp | er | 19:48 |
| alanp | i guess start at 0, increase production capability by one for a maximum of 100 | 19:48 |
| alanp | and each turn set points = cap | 19:48 |
| alanp | well i guess that makes my once a turn easier | 19:49 |
| mithro | For each turn you control a planet it gains one point of production capability, each planet can have a maximum of 100 points of production capability. Each turn a planet will produce productions points equal to it's production capability. | 19:50 |
| alanp | right | 19:50 |
| alanp | does it "Start" with any? It's not really clear | 19:50 |
| mithro | so you could make production capability a resource which is called factories | 19:50 |
| alanp | ok, similar to what i've done | 19:51 |
| alanp | so i don't need a second resource for "points", right? | 19:51 |
| mithro | All production points must be used every turn. | 19:51 |
| mithro | so there is no accumulation of production points | 19:52 |
| alanp | nod | 19:52 |
| mithro | hence you don't really need a resource for it | 19:52 |
| alanp | "Factories" was a lot better than "Production Points" :-) | 19:52 |
| alanp | mithro: no arguments with having an order queue for your home planet? | 19:55 |
| alanp | I don't think you can really progress without it | 19:55 |
| mithro | be back in 20 | 19:57 |
| alanp | unless the first ship has a colonisation module | 19:57 |
| *** Greywhind has joined #tp | 19:57 | |
| alanp | because the way it was now the owner was set to 0 for the Queue of the player's home planet | 19:57 |
| *** mithro has quit IRC | 20:15 | |
| tansell | alanp, I would suggest that the first planet a person has is fully decked out | 20:20 |
| alanp | yeah, i bumped the resources for the home planet a bit :-) | 20:21 |
| alanp | figting with build fleet order right now | 20:21 |
| alanp | 2009-07-05 20:21:49 < Debug > Got single orders, returning one object | 20:21 |
| alanp | Segmentation fault | 20:22 |
| alanp | dying like that :-( | 20:22 |
| * alanp tracking down | 20:23 | |
| alanp | std::map<uint32_t, std::pair<uint32_t, uint32_t> > presources = static_cast<Planet*>(planet->getObjectBehaviour())->getResources(); | 20:27 |
| alanp | doesn't like | 20:27 |
| tansell | epyon, poke? | 20:29 |
| tansell | alanp, well your not checking that planet->getObjectBehaviour() returns a non-null pointer? | 20:36 |
| alanp | seg faulting elsewhere now | 20:36 |
| epyon | more or less here | 20:37 |
| *** mithro has joined #tp | 20:42 | |
| tansell | epyon, thoughts on std::map<uint32_t, std::pair<uint32_t, uint32_t> > presources = static_cast<Planet*>(planet->getObjectBehaviour())->getResources(); | 20:45 |
| epyon | will die. | 20:45 |
| CIA-22 | joelboh tpclient-pyweb * ra2ff884d5cb8 / (3 files in 3 dirs): Frontend: Go through messages with next and prev buttons. | 20:45 |
| epyon | My suggestion is go with what works, I'll refactor it later. | 20:46 |
| epyon | just add a // TODO: mark | 20:46 |
| llnz | humm... | 20:47 |
| tansell | llnz, humm? | 20:51 |
| llnz | just looking back over the discussion | 20:52 |
| tansell | static_casts are unsafe right? | 20:52 |
| tansell | it's been a long time since I did C++ | 20:52 |
| llnz | they are ok, if you know it's correct | 20:53 |
| llnz | better to dynamic_cast and check the return value | 20:53 |
| alanp | some weird incosistency in the client between rfts and mtsec | 21:02 |
| alanp | wait | 21:02 |
| alanp | no, i just broke it | 21:03 |
| alanp | it's like the frame it gets is different | 21:09 |
| CIA-22 | joelboh tpclient-pyweb * ra436aaa5b865 /frontend/ (index.html scripts/map.js): Frontend: Fixed a bug with components adding a scroll to the main window. | 21:15 |
| Greywhind | tansell: ping? | 21:16 |
| tansell | Greywhind, pong | 21:16 |
| Greywhind | tansell: hey - question about the designs window | 21:16 |
| Greywhind | it's using cache dirty events to add/remove/change designs | 21:17 |
| tansell | Greywhind, yeah? | 21:17 |
| Greywhind | but they are for DesignsTree, which the cache doesn't seem to understand | 21:17 |
| Greywhind | so it causes errors | 21:17 |
| Greywhind | example | 21:18 |
| Greywhind | self.application.Post(self.application.cache.CacheDirtyEvent("DesignsTree", "remove", design.id, design), source=self) | 21:18 |
| tansell | Greywhind, you have an old version | 21:18 |
| alanp | Replace with "designs", there was a patch for this | 21:18 |
| Greywhind | tansell: oh... right. i have to update | 21:18 |
| tansell | Greywhind, which means you have not merged the recent changes I submitted | 21:18 |
| Greywhind | tansell: i didn't realize you fixed that :P | 21:19 |
| Greywhind | i'll do that now | 21:19 |
| alanp | Game* game = Game::getGame(); | 21:20 |
| alanp | IGObject *selectedObj = game->getObjectManager()->getObject( | 21:20 |
| alanp | game->getOrderManager()->getOrderQueue(orderqueueid)->getObjectId()); | 21:20 |
| alanp | Planet* planetData = dynamic_cast<Planet*>(selectedObj->getObjectBehaviour()); | 21:20 |
| alanp | failing for me :-( | 21:20 |
| Greywhind | tansell: hmm... how do i merge with submodules again? | 21:24 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge origin/stable | 21:24 |
| Greywhind | fatal: cannot read object dbda575604d4192ef11826a11ccf18a22c92d718 'libtpclient-py': It is a submodule! | 21:24 |
| tansell | Greywhind, you need to merge the libtpclient-py first | 21:24 |
| Greywhind | tansell: still said it couldn't read it - should i just ignore that? | 21:27 |
| tansell | Greywhind, so you have merged libtpclient-py? | 21:27 |
| Greywhind | tansell: yes | 21:27 |
| Greywhind | although i didn't commit it in tpclient-pywx | 21:27 |
| llnz | alanp: failing how? | 21:28 |
| tansell | Greywhind, so you should be able to do a "git-cat-file -p dbda575604d4192ef11826a11ccf18a22c92d718" | 21:29 |
| alanp | llnz: creating segfault. It looks like if I do the same thing in rfts the frame is different... | 21:29 |
| tansell | Greywhind, in the libtpclient-py directory | 21:29 |
| alanp | it's confusing the hell out of me | 21:29 |
| llnz | alanp: have you set up the orderqueue correctly? | 21:30 |
| Greywhind | tansell: that's not a command | 21:30 |
| tansell | Greywhind, what do you mean? | 21:30 |
| alanp | llnz: i believe so... | 21:30 |
| llnz | does it actually exist, has the objectid been set, etc | 21:30 |
| Greywhind | tansell: bash: git-cat-file: command not found | 21:30 |
| alanp | let me verify everything | 21:30 |
| tansell | tansell@tansell:~/superprobe/review$ dpkg --listfiles git-core | grep git-cat-file | 21:31 |
| tansell | /usr/bin/git-cat-file | 21:31 |
| alanp | hrm | 21:31 |
| Greywhind | tansell: i don't have dpkg either :P | 21:32 |
| alanp | llnz: =D | 21:32 |
| * alanp forgot something obvious | 21:32 | |
| tansell | Greywhind, well I don't know about fedora | 21:32 |
| Greywhind | tansell: oh, found it | 21:32 |
| Greywhind | [Greywhind@localhost libtpclient-py]$ locate git-cat-file | 21:32 |
| Greywhind | /usr/libexec/git-core/git-cat-file | 21:32 |
| Greywhind | yes, the git-cat-file works | 21:33 |
| tansell | Greywhind, so is that the complete error message? | 21:33 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge origin/stable | 21:33 |
| Greywhind | fatal: cannot read object dbda575604d4192ef11826a11ccf18a22c92d718 'libtpclient-py': It is a submodule! | 21:33 |
| Greywhind | that's all | 21:33 |
| Greywhind | happened even after i committed the change | 21:34 |
| tansell | I would recommend asking in #git | 21:34 |
| Greywhind | it does seem to modify winDesign | 21:34 |
| Greywhind | just doesn't finish committing it | 21:34 |
| Greywhind | tansell: maybe it's because i have a commit in libtpclient that i haven't pushed? | 21:35 |
| tansell | I would recommend asking in #git | 21:37 |
| Greywhind | k | 21:37 |
| Greywhind | online, i found this solution: | 21:39 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge -s resolve origin/stable | 21:39 |
| Greywhind | Trying really trivial in-index merge... | 21:39 |
| Greywhind | error: Merge requires file-level merging | 21:39 |
| Greywhind | Nope. | 21:39 |
| Greywhind | Trying simple merge. | 21:39 |
| Greywhind | Simple merge failed, trying Automatic merge. | 21:40 |
| Greywhind | ERROR: libtpclient-py: Not merging conflicting submodule changes. | 21:40 |
| Greywhind | Auto-merging requirements.py | 21:40 |
| Greywhind | fatal: merge program failed | 21:40 |
| Greywhind | Automatic merge failed; fix conflicts and then commit the result. | 21:40 |
| * alanp can't believe that took so long to figure out | 21:40 | |
| Greywhind | that seems to work as long as the submodule is already merged, even though it complains at me | 21:40 |
| tansell | well, you obviously need to make sure the submodule is pointing to the right commit | 21:41 |
| Greywhind | tansell: right | 21:41 |
| Greywhind | but it didn't actually change the submodule in any way | 21:42 |
| Greywhind | when i did a git add libtpclient-py, it disappeared rather than being added to the list of changes to commit | 21:42 |
| Greywhind | so it must be exactly the same as it was | 21:42 |
| alanp | tansell: rand number between 1-15 for starting factories sound feasible? | 21:43 |
| tansell | alanp, not at all | 21:43 |
| tansell | Greywhind, so then you are doing something wrong | 21:44 |
| epyon | DONE IT! | 21:44 |
| tansell | Greywhind, because the libtpclient-py commit must have changed | 21:44 |
| Greywhind | tansell: no, because i'd already committed the merged libtpclient-py | 21:44 |
| tansell | (as you merged it) | 21:44 |
| Greywhind | so it should remain the same | 21:44 |
| tansell | Greywhind, no | 21:44 |
| epyon | can someone give me the size and linecount of modules/persistence/mysql/mysqlpersistence.cpp? | 21:44 |
| tansell | Greywhind, the merge commit ID is different from both parents | 21:45 |
| Greywhind | [Greywhind@localhost libtpclient-py]$ git merge origin/stable | 21:45 |
| Greywhind | Already up-to-date. | 21:45 |
| Greywhind | it's merged. | 21:45 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge origin/stable | 21:45 |
| Greywhind | Already up-to-date. | 21:45 |
| Greywhind | and that's merged | 21:45 |
| tansell | Greywhind, what does git status show? | 21:45 |
| epyon | alanp, could you> | 21:45 |
| epyon | ? | 21:45 |
| llnz | i will epyon | 21:46 |
| llnz | just a second | 21:46 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git status | 21:46 |
| Greywhind | # On branch tp04 | 21:46 |
| Greywhind | # Your branch is ahead of 'origin/tp04' by 20 commits. | 21:46 |
| Greywhind | # | 21:46 |
| Greywhind | nothing to commit (working directory clean) | 21:46 |
| llnz | epyon: 4160 lines | 21:46 |
| tansell | 20 commits!? | 21:46 |
| alanp | -rw-r--r-- 1 alanp alanp 176761 2009-06-29 22:24 modules/persistence/mysql/mysqlpersistence.cpp | 21:46 |
| Greywhind | tansell: i have some un-pushed stuff | 21:46 |
| Greywhind | i'll push it by the end of the night | 21:46 |
| Greywhind | so it's all in for the midterm | 21:46 |
| epyon | down to 2352 lines and 100kb :> | 21:46 |
| alanp | nice | 21:46 |
| epyon | coulb be even less, but I'll do that after compilation checking. | 21:47 |
| CIA-22 | epyon tpserver-cpp-refactor * ra1dca1fef42c / (4 files in 2 dirs): MysqlPersistence is now 50% less fat! (don't compile yet) | 21:48 |
| tansell | epyon, if your dead you don't really worry about your weight :P | 21:48 |
| epyon | MysqlPersistence was like the cardinal example of copy-paste code O.o | 21:49 |
| epyon | Yeah, but I'll make it work ;) | 21:49 |
| llnz | it was a temporary solution.. that just works | 21:49 |
| llnz | epyon: there is a ticket in our google code project for the it (playerview in particular, iirc) | 21:50 |
| epyon | Although I'd ask for permission to redesign the database. | 21:51 |
| llnz | epyon: i think the database is basically as good as it gets (allowing for some future functionality) | 21:52 |
| Greywhind | tansell: hmm... there seem to be some issues inside cache.py that i had run across before as well when i tried to change the design events myself | 21:52 |
| epyon | llnz: changing the name of all the xyzid to id would allow better genericness of the queries | 21:53 |
| Greywhind | if i run, unmodified, the newest code, on trying to save the changes to "New Design" i get the following: | 21:53 |
| llnz | yes, but makes it harder to understand the relationships between the different tables | 21:53 |
| Greywhind | Traceback (most recent call last): | 21:53 |
| Greywhind | File "./windows/main/winDesign.py", line 391, in OnSave | 21:53 |
| Greywhind | self.application.Post(self.application.cache.CacheDirtyEvent("designs", "create", -1, design), source=self) | 21:53 |
| epyon | also there are a lot of suggestions related to architecture changes | 21:53 |
| Greywhind | File "libtpclient-py/tp/client/cache.py", line 94, in __init__ | 21:53 |
| Greywhind | for node in self.nodes: | 21:53 |
| epyon | also it'd be soo more readable to use underscores in names ... -_- | 21:54 |
| Greywhind | tansell: now, that code seems wrong to me, since it's not a guarantee that the event will have a .nodes there | 21:54 |
| alanp | Greywhind: i think that was fixed as well | 21:54 |
| tansell | Greywhind, so you didn't merge correctly | 21:54 |
| Greywhind | tansell: :-/ | 21:54 |
| tansell | Greywhind, as that was what was fixed in libtpclient-py | 21:54 |
| Greywhind | tansell: oh... i think i know what happened | 21:55 |
| Greywhind | tansell: i probably didn't pull libtpclient separately, assuming it would be updated when i pulled the parent moduel | 21:55 |
| Greywhind | *module | 21:55 |
| Greywhind | tansell: ok, fixed that | 21:58 |
| Greywhind | tansell: on to the next problem - please don't tell me this one's already fixed too :P | 21:58 |
| Greywhind | Traceback (most recent call last): | 21:58 |
| Greywhind | File "libtpclient-py/tp/client/threads.py", line 483, in OnCacheDirty | 21:58 |
| Greywhind | self.application.Post(apply(self.connection, evt, self.application.cache)) | 21:58 |
| Greywhind | File "libtpclient-py/tp/client/cache.py", line 827, in apply | 21:58 |
| Greywhind | raise IOError("Unable to add the design...") | 21:58 |
| Greywhind | IOError: Unable to add the design... | 21:58 |
| tansell | Greywhind, likely - it's a -1 error right? | 21:58 |
| tansell | I can successfully save a new design here | 21:59 |
| Greywhind | TypeError: 3 argument was the cause ('2sBBIII' 'TP', 4, 0, -1, 48, 159) | 22:00 |
| Greywhind | Argument must be positive (to pack to I) not -1 | 22:00 |
| Greywhind | OnNetworkFailure libtpclient-py/tp/client/threads.py:38: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6 | 22:00 |
| Greywhind | return unicode(self.message) | 22:00 |
| Greywhind | 3 argument was the cause ('2sBBIII' 'TP', 4, 0, -1, 48, 159) | 22:00 |
| Greywhind | Argument must be positive (to pack to I) not -1 | 22:00 |
| Greywhind | yeah, seems so | 22:00 |
| tansell | Greywhind, yeah - you need to update libtproto-py | 22:00 |
| Greywhind | tansell: oh | 22:00 |
| tansell | which means that your merge didn't work | 22:00 |
| Greywhind | tansell: uh... libtpproto-py says it's up to date | 22:01 |
| Greywhind | tansell: even after a git pull | 22:01 |
| tansell | Greywhind, oh osrry | 22:02 |
| tansell | the change is in ./windows/main/winDesign.py | 22:02 |
| Greywhind | tansell: git claims i'm up to date with origin/stable | 22:03 |
| tansell | Greywhind, 48412c3ab5a3b9006dd4a8518e80cc946a34d218 | 22:03 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ /usr/libexec/git-core/git-cat-file -p 48412c3ab5a3b9006dd4a8518e80cc946a34d218 | 22:04 |
| Greywhind | tree 6063a327fcedc27fecde30056853aec74468b549 | 22:04 |
| Greywhind | parent 1d7e9c6c1a0d3e8674dc7e99f6652204af8bb9cd | 22:04 |
| Greywhind | author Tim Ansell <[email protected]> 1246503528 +1000 | 22:04 |
| Greywhind | committer Tim Ansell <[email protected]> 1246503528 +1000 | 22:04 |
| Greywhind | Design modification time must be positive. | 22:04 |
| Greywhind | it's in my git log | 22:05 |
| tansell | Greywhind, so you must not have merged it correctly | 22:05 |
| Greywhind | tansell: huh. strange. | 22:06 |
| Greywhind | tansell: how can i fix it? | 22:06 |
| tansell | Greywhind, look at the diff got that commit | 22:07 |
| Greywhind | i did a git diff origin/stable | 22:07 |
| Greywhind | and it gave me quite a large diff | 22:07 |
| tansell | that is not what you want to do | 22:07 |
| tansell | fire up gitk | 22:07 |
| Greywhind | tansell: k | 22:07 |
| tansell | with a --all | 22:07 |
| tansell | then you can browse individual commits | 22:07 |
| tansell | and see what happened with your merge | 22:07 |
| tansell | lunch now | 22:08 |
| tansell | bblr | 22:08 |
| alanp | tansell: i'm going to get rid of the ship parts resource, i don't think it is needed | 22:11 |
| llnz | alanp: how are you going to handle partly built ships? | 22:18 |
| alanp | should that be handled as "ship parts"? | 22:20 |
| alanp | uint32_t usedshipres = resources[1]; | 22:23 |
| alanp | if(usedshipres == 0) | 22:23 |
| alanp | return true; | 22:23 |
| alanp | resources[1] is "ship parts" | 22:24 |
| alanp | so it looks for ship parts to create a ship, no? | 22:24 |
| CIA-22 | epyon tpserver-cpp-refactor * r119b47d15d85 /tpserver/ (frame.cpp frame.h player.cpp player.h playeragent.cpp): Frame.unpackMap added, used in playeragent | 22:56 |
| CIA-22 | epyon tpserver-cpp-refactor * r04bdaf64be3c /tpserver/ (36 files): Basic Typedefs everywhere + Frame pack/unpack support | 22:56 |
| *** jmtan has joined #tp | 22:59 | |
| * Landon is back | 23:07 | |
| Landon | tansell: did you see the recording? | 23:07 |
| alanp | tansell: any comments on this ship parts resource? | 23:12 |
| Greywhind | think he's still at lunch | 23:13 |
| CIA-22 | epyon tpserver-cpp-refactor * rc55faca2533e /tpserver/ (6 files): IdStringMap typedef and frame pack support | 23:13 |
| alanp | ah | 23:13 |
| CIA-22 | alanp tpserver-cpp * re08a8d65a7f0 /modules/games/mtsec/ (build.cpp mtsec.cpp planet.cpp): | 23:23 |
| CIA-22 | - Fixed some problems with Building a Fleet, still some more to go over but it works in simple cases now | 23:23 |
| CIA-22 | - Added the resource for Factories | 23:23 |
| alanp | crap | 23:23 |
| CIA-22 | alanp tpserver-cpp * r79ad838523f2 /modules/games/mtsec/ (build.cpp mtsec.cpp planet.cpp): | 23:25 |
| CIA-22 | Revert "- Fixed some problems with Building a Fleet, still some more to go over but it works in simple cases now" | 23:25 |
| CIA-22 | This reverts commit e08a8d65a7f044da3ce189958e2b43fbb2ea261a. | 23:25 |
| CIA-22 | alanp tpserver-cpp-mtsec * r060fe18a2b12 /modules/games/mtsec/ (build.cpp mtsec.cpp planet.cpp): | 23:30 |
| CIA-22 | - Fixed some problems with Building a Fleet, still some more to go over but it works in simple cases now | 23:30 |
| CIA-22 | - Added the resource for Factories | 23:30 |
| CIA-22 | - Added Factory resource to different star systems, home planet gets largest distribution of Production Points to make the game flow at the beginning. | 23:30 |
| alanp | now for some meat | 23:36 |
| CIA-22 | Greywhind libtpclient-py-tp04 * rdbda575604d4 /tp/client/cache.py: Cleaned up _getOrders() in cache. | 23:44 |
| CIA-22 | Greywhind libtpproto-py-tp04 * red6b4bc43672 /tp/netlib/client.py: Fixed small protocol update in client.py, where orders no longer return ok or fail, but instead return the queue. | 23:46 |
| tansell | Landon, you still about? | 23:46 |
| Greywhind | tansell: hey - i'm still working on trying to do this merge... been talking with someone from #git | 23:46 |
| CIA-22 | epyon tpserver-cpp-refactor * r971fc0900d2f /tpserver/ (Makefile.am manager.h): Adding Manager template | 23:47 |
| CIA-22 | epyon tpserver-cpp-refactor * r5ec518009bf2 /tpserver/ (manager.h playermanager.cpp playermanager.h): PlayerManager now a Manager | 23:47 |
| Greywhind | tansell: maybe... i could try pushing all my local changes, then you could try to merge into tp04 after updating? | 23:49 |
| tansell | alanp, poke? | 23:50 |
| Landon | tansell: yes | 23:52 |
| tansell | alanp, so I think that getting rid of ship parts is probably a good idea, they where a neat hack for minisec but don't quite work well with the production system | 23:52 |
| tansell | Landon, so I watched your movie | 23:52 |
| tansell | Greywhind, so might I suggest pushing to your home directory or something? | 23:53 |
| Greywhind | tansell: ? | 23:53 |
| tansell | Greywhind, you can push the git repository to your home directory (rather then /git/xxxx.git) and I can then look at it | 23:54 |
| tansell | Greywhind, or anywhere that is public accessible (say github) | 23:54 |
| Greywhind | tansell: how would i do that? | 23:54 |
| tansell | Greywhind, what happens if you ssh to git.thousandparsec.net? | 23:55 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ ssh git.thousandparsec.net | 23:55 |
| Greywhind | reverse mapping checking getaddrinfo for 227-14-251-64.serverpronto.com [64.251.14.227] failed - POSSIBLE BREAK-IN ATTEMPT! | 23:55 |
| Greywhind | Permission denied (publickey,gssapi-keyex,gssapi-with-mic). | 23:55 |
| tansell | Greywhind, so you are doing something wrong there | 23:55 |
| tansell | Greywhind, as you wouldn't be able to push if that was the case | 23:56 |
| Greywhind | tansell: oh. need nathan@ | 23:56 |
| Greywhind | that works | 23:56 |
| tansell | what happens? | 23:56 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ ssh [email protected] | 23:56 |
| Greywhind | reverse mapping checking getaddrinfo for 227-14-251-64.serverpronto.com [64.251.14.227] failed - POSSIBLE BREAK-IN ATTEMPT! | 23:56 |
| Greywhind | Last login: Wed Sep 26 22:30:13 2007 from ip68-106-63-237.ph.ph.cox.net | 23:56 |
| Greywhind | nathan@verbal:~$ | 23:56 |
| tansell | okay | 23:57 |
| tansell | cd into the public_html directory | 23:57 |
| tansell | create a new directory | 23:57 |
| tansell | then do a git init | 23:57 |
| alanp | tansell: ok | 23:58 |
| alanp | i thought so too | 23:58 |
| Greywhind | tansell: done | 23:58 |
| tansell | then you can push to git+ssh://git.thousandparsec.net/~nathan/public_html/newdirectory | 23:58 |
| tansell | alanp, llnz probably disagrees with me :) | 23:58 |
| alanp | hehe | 23:58 |
| llnz | well... whatever works | 23:58 |
| alanp | for what reason? | 23:58 |
| Greywhind | tansell: just do: git push git+ssh://git.thousandparsec.net/~nathan/public_html/tp04testing | 23:59 |
| Greywhind | that right? | 23:59 |
| llnz | and works correctly, both with and without persistence | 23:59 |
| tansell | Greywhind, yeah - it might complain there are no common ref heads | 23:59 |
| tansell | llnz, I don't know enough about tpserver-cpp, but each order would need to store a float which describes how much of that order is completed | 23:59 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!