| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| tansell | Greywhind, oh, you may need to give it the full path | 00:00 |
|---|---|---|
| tansell | (rather then ~) | 00:00 |
| tansell | llnz, or maybe the number of production points spent on the order so far? | 00:00 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git push git+ssh://[email protected]/home/users/nathan/tp04testing | 00:01 |
| Greywhind | reverse mapping checking getaddrinfo for 227-14-251-64.serverpronto.com [64.251.14.227] failed - POSSIBLE BREAK-IN ATTEMPT! | 00:01 |
| Greywhind | No refs in common and none specified; doing nothing. | 00:01 |
| Greywhind | Perhaps you should specify a branch such as 'master'. | 00:01 |
| Greywhind | fatal: The remote end hung up unexpectedly | 00:01 |
| Greywhind | error: failed to push some refs to 'git+ssh://[email protected]/home/users/nathan/tp04testing' | 00:01 |
| tansell | Greywhind, so give it a branch like it says :) | 00:02 |
| Greywhind | tansell: ok... so i probably want to push both stable and tp04, so you can test the merge, right? | 00:02 |
| tansell | yeah | 00:03 |
| Greywhind | tansell: does it matter which order i push them in? | 00:03 |
| tansell | not quite sure | 00:03 |
| tansell | Greywhind, no | 00:03 |
| alanp | tansell: is that regarding the build fleet orders? | 00:03 |
| alanp | the percentage? | 00:03 |
| tansell | alanp, yeah | 00:03 |
| alanp | how does an incomplete order work in the server? | 00:03 |
| alanp | does it keep calling doOrder? | 00:03 |
| alanp | or does it just set the amount of turns? | 00:03 |
| tansell | alanp, actually it's probably less error prone to store the number of production points already spent on that order | 00:04 |
| Greywhind | tansell: i gave it --all | 00:04 |
| tansell | but I guess that could lead to "hacks" where you build a really huge ship and then at the last moment change it to a bunch of small ships | 00:04 |
| *** bddebian has quit IRC | 00:05 | |
| alanp | hmmm | 00:05 |
| tansell | Greywhind, okay - I'll clone now | 00:05 |
| Greywhind | tansell: ignore the code_cleaning_tp04 branch | 00:06 |
| tansell | oh you need to run | 00:06 |
| tansell | git-update-server-info | 00:06 |
| tansell | in the remote repository | 00:06 |
| tansell | btw - this won't push the libtpclient-py | 00:07 |
| tansell | llnz, thoughts? | 00:07 |
| Greywhind | tansell: the directory still appears to be empty? | 00:07 |
| tansell | Greywhind, thats fine | 00:07 |
| tansell | Greywhind, and fix the permissions | 00:08 |
| tansell | it should contain a .git directory with the stuff | 00:08 |
| Greywhind | tansell: what permissions does it need? | 00:08 |
| tansell | (you want to do a 'find -type d | chmod a+rw ; find -type f | chmod a+r' | 00:08 |
| Greywhind | tansell: and how do i properly push libtpclient-py? | 00:08 |
| llnz | tansell: on? | 00:09 |
| tansell | llnz, the orders stuff | 00:09 |
| tansell | Greywhind, next time you do a git-init do a | 00:09 |
| Greywhind | nathan@verbal:~/tp04testing$ find -type d | chmod a+rw ; find -type f | chmod a+r | 00:09 |
| Greywhind | chmod: missing operand after `a+rw' | 00:09 |
| Greywhind | Try `chmod --help' for more information. | 00:09 |
| Greywhind | chmod: missing operand after `a+r' | 00:09 |
| Greywhind | Try `chmod --help' for more information. | 00:09 |
| tansell | #git init --shared | 00:09 |
| tansell | Greywhind, oopps | 00:09 |
| tansell | need an xargs in there | 00:09 |
| tansell | find -type d | xargs chmod a+rw ; find -type f | xargs chmod a+r | 00:09 |
| tansell | git init --shared=everyone | 00:10 |
| llnz | well... i'm at work and busy, so i'd have to look when I get home | 00:10 |
| Greywhind | tansell: done | 00:10 |
| Greywhind | tansell: what about libtpclient-py? | 00:10 |
| tansell | Greywhind, I still don't see anything at | 00:10 |
| tansell | http://www.thousandparsec.net/~nathan/ | 00:10 |
| tpb | Title: Index of /~nathan (at www.thousandparsec.net) | 00:10 |
| tansell | oh | 00:10 |
| *** jnengland77 has joined #tp | 00:10 | |
| tansell | you didn't put your directory in public_html | 00:10 |
| Greywhind | tansell: right | 00:11 |
| Greywhind | tansell: i missed where you said to, sorry. | 00:11 |
| tansell | you can just move it | 00:12 |
| Greywhind | tansell: k | 00:13 |
| tansell | Warning: Remote HEAD refers to nonexistent ref, unable to checkout. | 00:13 |
| Greywhind | tansell: try it now? | 00:13 |
| tansell | so I don't see any merge attempt here | 00:16 |
| Greywhind | tansell: i removed all traces of my attempt | 00:16 |
| tansell | okay | 00:18 |
| CIA-22 | alanp tpserver-cpp-mtsec * r0222699a535a /modules/games/mtsec/ (planet.cpp planet.h): - Owned planets increment their Production resource by 1 until they hit 100. | 00:18 |
| alanp | does that look about right for incrementing the resource? | 00:18 |
| tansell | alanp, nfi :) | 00:18 |
| alanp | hehe | 00:18 |
| tansell | Greywhind, so you need to do the same for the libtpclient-py.git | 00:19 |
| alanp | 11 units of Factories on surface, 32 units of Factories minable | 00:20 |
| alanp | uh oh | 00:20 |
| alanp | next turn: 22 units of Factories on surface, 32 units of Factories minable | 00:20 |
| alanp | heh | 00:20 |
| tansell | Greywhind, so a straight git merge origin/stable in libtpclient-py.git worked without any problems | 00:21 |
| alanp | errrr | 00:21 |
| tansell | git checkout -b tp04 --track origin/tp04 | 00:21 |
| tansell | git merge origin/stable | 00:21 |
| tansell | tansell@tansell:~/foss/temp/tp04testing/libtpclient-py$ git merge origin/stable | 00:21 |
| tansell | Auto-merged tp/client/cache.py | 00:21 |
| tansell | Merge made by recursive. | 00:21 |
| * alanp sees issue | 00:22 | |
| tansell | Greywhind, that worked fine for you too? | 00:23 |
| CIA-22 | alanp tpserver-cpp-mtsec * rae6bf0ce3a57 /modules/games/mtsec/planet.cpp: Fixed error in call of addResource | 00:23 |
| tansell | Landon, poke? | 00:23 |
| Landon | yup | 00:24 |
| tansell | Landon, so it's good to see the progress you have made | 00:24 |
| tansell | Landon, but I would have thought you would hit this milestone about a month ago | 00:24 |
| Greywhind | tansell: oh, sorry, got distracted there | 00:24 |
| Greywhind | tansell: so i need to do the git push in libtpclient-py? | 00:24 |
| tansell | Greywhind, the merge succeeded fine for you right? | 00:25 |
| tansell | Landon, what are your thoughts about that? | 00:25 |
| Greywhind | tansell: yes | 00:25 |
| Greywhind | tansell: inside libtpclient-py it idd | 00:25 |
| Greywhind | *did | 00:25 |
| tansell | Greywhind, yeah, it's a good idea to push that | 00:26 |
| Landon | yeah, I would have wanted to be there a month ago as well, but it took me a while to get to understanding the workflow of ogre | 00:26 |
| Greywhind | tansell: to the tp04testing repo? | 00:26 |
| tansell | Landon, I like your console and actually would love to see you keep that working in a useful function | 00:26 |
| Landon | oh | 00:26 |
| Landon | I have some changes to console that I have yet to push | 00:26 |
| tansell | Greywhind, just push it to the main repo (libtpclient-py) if it worked | 00:27 |
| Landon | but right now I think I'm using one of the MS fonts for it | 00:27 |
| CIA-22 | mavrinac libtpclient-py-tp04 * r4fb41623af7d /tp/client/ (SinglePlayer.py launcher.py): | 00:27 |
| CIA-22 | Check for premature subprocess termination and stop the single player | 00:27 |
| CIA-22 | game if it occurs. | 00:27 |
| CIA-22 | mavrinac libtpclient-py-tp04 * r67f883c00761 /tp/client/SinglePlayer.py: Import 'started' element. | 00:27 |
| CIA-22 | mavrinac libtpclient-py-tp04 * r3e96a2870ea9 /tp/client/launcher.py: Proper Epydoc docstrings in launcher.py. | 00:27 |
| CIA-22 | mavrinac libtpclient-py-tp04 * r4c83ca3273d8 /tp/client/ (SinglePlayer.py launcher.py): | 00:27 |
| CIA-22 | Implement onready callback if a 'started' string to match is available | 00:27 |
| CIA-22 | from the server tpconfig XML. | 00:27 |
| CIA-22 | mithro libtpclient-py-tp04 * r808b10cd2dd9 /tp/client/pyscheme/expressions.py: Make pyscheme work with unicode inputs. | 00:27 |
| CIA-22 | mithro libtpclient-py-tp04 * r4bcdb81d4683 /tp/client/cache.py: Only chec the nodes when they actually exist. | 00:27 |
| CIA-22 | Greywhind libtpclient-py-tp04 * r68630c4ab861 /tp/client/ (SinglePlayer.py cache.py launcher.py pyscheme/expressions.py): Merge commit 'origin/stable' into tp04 | 00:27 |
| tansell | Greywhind, okay great | 00:27 |
| tansell | now go up a directory | 00:27 |
| Landon | I need to find a font to use instead | 00:27 |
| Landon | are there any good monospace OS fonts? | 00:28 |
| Greywhind | tansell: k | 00:28 |
| tansell | do a "git submodule update" to reset back to the base state | 00:28 |
| Greywhind | tansell: k | 00:28 |
| tansell | git status should show no changes now right? | 00:28 |
| Greywhind | correct | 00:28 |
| alanp | tansell: "The enhance order uses production points to quickly increase the production capability. For every xx production points spent the enhance order increases the production capability by one. " <---What's xx? | 00:29 |
| alanp | 10? | 00:29 |
| tansell | alanp, to be determined by game play :) | 00:29 |
| alanp | ok | 00:31 |
| tansell | Greywhind, so now if you do a "git merge origin/stable" it will complain about libtpclient-py right? | 00:34 |
| Greywhind | tansell: right | 00:34 |
| tansell | so you go into libtpclient-py and make it the right commit by doing a "git checkout tp04" | 00:34 |
| tansell | (which should be your merge commit right?) | 00:34 |
| Greywhind | tansell: yes | 00:34 |
| tansell | then go up a directory | 00:35 |
| tansell | and do a | 00:35 |
| tansell | git add libtpclient-py | 00:35 |
| tansell | then a git commit | 00:35 |
| tansell | Right? | 00:35 |
| tansell | that make sense? | 00:35 |
| Greywhind | tansell: yes | 00:35 |
| llnz | bbl | 00:36 |
| *** llnz has quit IRC | 00:36 | |
| tansell | Greywhind, so your commit should have a change in libtpclient-py and winDesign.py | 00:36 |
| tansell | #modified: libtpclient-py | 00:36 |
| tansell | #modified: windows/main/winDesign.py | 00:36 |
| Greywhind | tansell: only to winDesign.py | 00:37 |
| tansell | then you have done something wrong | 00:37 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git add libtpclient-py | 00:37 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git commit | 00:37 |
| Greywhind | [tp04 094fb90] Updated libtpclient-py to merge with stable. 1 files changed, 1 insertions(+), 1 deletions(-) | 00:37 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git status | 00:37 |
| Greywhind | # On branch tp04 | 00:37 |
| Greywhind | # Your branch is ahead of 'origin/tp04' by 13 commits. | 00:37 |
| Greywhind | # | 00:37 |
| Greywhind | # Changed but not updated: | 00:37 |
| Greywhind | # (use "git add <file>..." to update what will be committed) | 00:37 |
| Greywhind | # (use "git checkout -- <file>..." to discard changes in working directory) | 00:37 |
| Greywhind | # | 00:38 |
| Greywhind | #modified: windows/main/winDesign.py | 00:38 |
| Greywhind | # | 00:38 |
| Greywhind | no changes added to commit (use "git add" and/or "git commit -a") | 00:38 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ | 00:38 |
| tansell | so what did you do differently? | 00:38 |
| tansell | the steps where | 00:38 |
| tansell | reset your repository so it's clean | 00:38 |
| tansell | git merge origin/stable | 00:38 |
| tansell | cd libtpclient-pywx | 00:38 |
| Greywhind | tansell: you didn't ever tell me to git add windows/main/winDesign.py | 00:38 |
| tansell | git checkout <sha1 of your merge> | 00:38 |
| Greywhind | so it didn't get committed | 00:39 |
| tansell | cd .. | 00:39 |
| tansell | Greywhind, as there are no conflicts in it, it should have been auto-added | 00:39 |
| tansell | by the merge | 00:39 |
| Greywhind | tansell: it wasn't | 00:39 |
| tansell | git add libtpclient-py | 00:39 |
| tansell | git commit | 00:39 |
| Greywhind | tansell: because the merge failed | 00:39 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge origin/stable | 00:40 |
| Greywhind | fatal: cannot read object dbda575604d4192ef11826a11ccf18a22c92d718 'libtpclient-py': It is a submodule! | 00:40 |
| tansell | tansell@tansell:~/foss/temp/tp04testing$ git merge origin/stable | 00:40 |
| tansell | Auto-merged libtpclient-py | 00:40 |
| tansell | CONFLICT (submodule): Merge conflict in libtpclient-py - needs 4bcdb81d4683b93ef323dbfffe76f63d676439e2 | 00:40 |
| tansell | Auto-merged requirements.py | 00:40 |
| tansell | Automatic merge failed; fix conflicts and then commit the result. | 00:40 |
| Greywhind | tansell: so you ran it twice? | 00:40 |
| tansell | no | 00:40 |
| tansell | I ran it once | 00:41 |
| Greywhind | tansell: hm. well, mine just dies instead. | 00:41 |
| tansell | hrm... | 00:42 |
| tansell | Greywhind, reset your tp04 branch back to before the merge | 00:43 |
| Greywhind | tansell: k | 00:43 |
| tansell | make sure you have a clean repo | 00:44 |
| tansell | then do a | 00:44 |
| tansell | git submodule update | 00:44 |
| tansell | it should say | 00:44 |
| tansell | Submodule path 'libtpclient-py': checked out 'dbda575604d4192ef11826a11ccf18a22c92d718' | 00:44 |
| tansell | esactly right? | 00:44 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git submodule update | 00:45 |
| Greywhind | reverse mapping checking getaddrinfo for 227-14-251-64.serverpronto.com [64.251.14.227] failed - POSSIBLE BREAK-IN ATTEMPT! | 00:45 |
| Greywhind | Submodule path 'libtpclient-py': checked out 'dbda575604d4192ef11826a11ccf18a22c92d718' | 00:45 |
| Greywhind | yes | 00:45 |
| tansell | okay | 00:45 |
| Greywhind | tansell: what is your git --version? | 00:45 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git --version | 00:46 |
| Greywhind | git version 1.6.2.5 | 00:46 |
| tansell | $ git --version | 00:46 |
| tansell | git version 1.5.4.3 | 00:46 |
| tansell | what does git status show now? | 00:46 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git status | 00:46 |
| Greywhind | # On branch tp04 | 00:46 |
| Greywhind | # Your branch is ahead of 'origin/tp04' by 12 commits. | 00:46 |
| Greywhind | # | 00:46 |
| Greywhind | nothing to commit (working directory clean) | 00:46 |
| tansell | so why is your branch ahead of origin/tp04 by 12 commits? | 00:47 |
| tansell | * tp04 18bbac1 Removed panelPicture, as it is now redundant with panelInfo. | 00:47 |
| Greywhind | tansell: because i have pushed only to the other repo? | 00:47 |
| Greywhind | tansell: in my home dir | 00:48 |
| tansell | what does your git log display? | 00:48 |
| tansell | or | 00:48 |
| Greywhind | most recent: | 00:48 |
| Greywhind | commit 18bbac1044da28bd35ecedb6dbad3f85a2bdcb54 | 00:48 |
| Greywhind | Author: Greywhind <[email protected]> | 00:48 |
| Greywhind | Date: Sun Jul 5 23:52:31 2009 -0400 | 00:48 |
| Greywhind | Removed panelPicture, as it is now redundant with panelInfo. | 00:48 |
| tansell | so when you do the following | 00:49 |
| tansell | tansell@tansell:~/foss/temp/tp04testing$ git merge origin/stable | 00:49 |
| tansell | Auto-merged libtpclient-py | 00:49 |
| tansell | CONFLICT (submodule): Merge conflict in libtpclient-py - needs 4bcdb81d4683b93ef323dbfffe76f63d676439e2 | 00:49 |
| tansell | Auto-merged requirements.py | 00:49 |
| tansell | Automatic merge failed; fix conflicts and then commit the result. | 00:49 |
| tansell | you don't get that? | 00:49 |
| Greywhind | this is all i get: | 00:50 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge origin/stable | 00:50 |
| Greywhind | fatal: cannot read object dbda575604d4192ef11826a11ccf18a22c92d718 'libtpclient-py': It is a submodule! | 00:50 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ | 00:50 |
| Greywhind | tansell: if my version of git can't do the merge | 00:51 |
| tansell | so my only thought is that your version of git is borked | 00:51 |
| Greywhind | tansell: maybe i could push to the real tp04 | 00:51 |
| Greywhind | tansell: and you could do the merge and commit it in tp04 | 00:51 |
| Greywhind | tansell: then i can pull the result and it'll be fine | 00:51 |
| tansell | I'm just getting a 1.6.x version to see if I can reproduce | 00:51 |
| tansell | tansell@tansell:~/foss/temp/tp04testing$ git merge origin/stable | 00:53 |
| tansell | Auto-merging libtpclient-py | 00:53 |
| tansell | CONFLICT (submodule): Merge conflict in libtpclient-py | 00:53 |
| tansell | Auto-merging requirements.py | 00:53 |
| tansell | Automatic merge failed; fix conflicts and then commit the result. | 00:53 |
| tansell | tansell@tansell:~/foss/temp/tp04testing$ git --version | 00:53 |
| tansell | git version 1.6.3.3 | 00:53 |
| Greywhind | wtf | 00:54 |
| tansell | yay fedora! | 00:54 |
| Greywhind | ^ | 00:54 |
| Greywhind | tansell: maybe i'll try switching to the package of 1.6.2.2 | 00:56 |
| *** alanp has quit IRC | 00:58 | |
| *** alanp has joined #tp | 00:58 | |
| *** jnengland77 has quit IRC | 01:00 | |
| tansell | Greywhind, you'll want to do merging at a later date probably | 01:01 |
| Greywhind | tansell: i can't seem to figure out how to switch to 1.6.2.2, unfortunately | 01:02 |
| tansell | Greywhind, so getting a working git is probably good | 01:02 |
| Greywhind | tansell: are you sure you can't just do the merge for me? | 01:02 |
| tansell | Greywhind, install git from the source? | 01:02 |
| Greywhind | tansell: yeah, i'll try that | 01:02 |
| tansell | Greywhind, I can do a merge for you, but you'll need to merge sometime | 01:02 |
| Greywhind | tansell: yeah | 01:02 |
| Greywhind | tansell: let me try getting the RPM of the newest version | 01:03 |
| shenki | Greywhind: http://koji.fedoraproject.org/koji/buildinfo?buildID=112030 | 01:04 |
| tpb | <http://ln-s.net/3THK> (at koji.fedoraproject.org) | 01:04 |
| Greywhind | shenki: it's for FC12, though? | 01:05 |
| shenki | Greywhind: if i were you, i'd grab ethe source rpm and build it locally | 01:05 |
| Greywhind | shenki: yeah, it doesn't seem to want to install | 01:05 |
| Greywhind | i'll try from source | 01:05 |
| shenki | ah, suck | 01:05 |
| shenki | yeah, source install for git isn't too bad - if you do 'make install' as your normal user, it installs neatly inside ~/bin | 01:06 |
| shenki | so it's easy to get rid of | 01:06 |
| shenki | just make sure ~/bin is in your path | 01:06 |
| Greywhind | k | 01:06 |
| Greywhind | [Greywhind@localhost git-1.6.3.3]$ make install SUBDIR git-gui SUBDIR gitk-git | 01:08 |
| Greywhind | make[1]: Nothing to be done for `all'. SUBDIR perl SUBDIR templates | 01:08 |
| Greywhind | install -d -m 755 '/usr/local/bin' | 01:08 |
| Greywhind | install -d -m 755 '/usr/local/libexec/git-core' | 01:08 |
| Greywhind | install: cannot change permissions of `/usr/local/libexec/git-core': No such file or directory | 01:08 |
| Greywhind | make: *** [install] Error 1 | 01:08 |
| Greywhind | so much for that theory | 01:08 |
| Greywhind | trying ./configure --prefix ~ | 01:08 |
| tansell | Greywhind, seems like you should just need to do a mkdir /usr/local/libexec/ | 01:09 |
| Greywhind | tansell: the dir already exists | 01:09 |
| shenki | err, why is it trying to install in /usr i wonder | 01:09 |
| shenki | perhaps they've changd the way it works :/ | 01:09 |
| Greywhind | s'alright - i just changed the --prefix | 01:10 |
| Greywhind | odd | 01:11 |
| Greywhind | PATH=/usr/lib/qt-3.3/bin:/usr/kerberos/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/real/RealPlayer:/home/Greywhind/bin:/opt/real/RealPlayer | 01:11 |
| Greywhind | and yet | 01:11 |
| Greywhind | [Greywhind@localhost git-1.6.3.3]$ git --version | 01:11 |
| Greywhind | git version 1.6.2.5 | 01:11 |
| Greywhind | [Greywhind@localhost git-1.6.3.3]$ /home/Greywhind/bin/git --version | 01:11 |
| Greywhind | git version 1.6.3.3 | 01:11 |
| Greywhind | shouldn't it check /home/Greywhind/bin first? | 01:11 |
| tansell | Greywhind, it reads left to right | 01:12 |
| Greywhind | tansell: oh. | 01:12 |
| Greywhind | tansell: ok, got that... now to test it | 01:14 |
| Greywhind | [Greywhind@localhost tpclient-pywx]$ git merge origin/stable | 01:14 |
| Greywhind | Auto-merging libtpclient-py | 01:14 |
| Greywhind | CONFLICT (submodule): Merge conflict in libtpclient-py | 01:14 |
| Greywhind | Auto-merging requirements.py | 01:14 |
| Greywhind | Automatic merge failed; fix conflicts and then commit the result. | 01:14 |
| Greywhind | \o/ | 01:14 |
| Greywhind | Fedora's GIT is broken | 01:15 |
| tansell | Greywhind, I guess it could be just the version fedora ships with | 01:15 |
| Greywhind | well, whatever it is, it's still broken | 01:16 |
| Greywhind | tansell: huh. now the end result seems to be the same as when i originally did that merge | 01:19 |
| Greywhind | Traceback (most recent call last): | 01:19 |
| Greywhind | File "libtpclient-py/tp/client/threads.py", line 483, in OnCacheDirty | 01:19 |
| Greywhind | self.application.Post(apply(self.connection, evt, self.application.cache)) | 01:19 |
| Greywhind | File "libtpclient-py/tp/client/cache.py", line 827, in apply | 01:19 |
| Greywhind | raise IOError("Unable to add the design...") | 01:19 |
| Greywhind | IOError: Unable to add the design... | 01:19 |
| Greywhind | OnNetworkFailure libtpclient-py/tp/client/threads.py:38: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6 | 01:19 |
| Greywhind | return unicode(self.message) | 01:19 |
| *** llnz has joined #tp | 01:19 | |
| Greywhind | Unable to add the design... | 01:19 |
| CIA-22 | alanp tpserver-cpp-mtsec * r2e9c6bb224c2 /modules/games/mtsec/ (Makefile.am enhance.cpp enhance.h mtsec.cpp planet.cpp): (Extremely) primitive "Enhance Order" for planets | 01:25 |
| alanp | tansell: ping | 01:25 |
| CIA-22 | alanp tpserver-cpp-mtsec * rd944d448f9b7 /modules/games/mtsec/enhance.cpp: Changed Enhance order to create 1 extra point for every 10 points used. Gameplay will later dictate this number. | 01:48 |
| Greywhind | well, i have to go to sleep | 01:48 |
| Greywhind | i'm back on the east coast, so it's 1:50 AM | 01:49 |
| *** Greywhind has quit IRC | 01:50 | |
| *** llnz2 has joined #tp | 01:54 | |
| *** llnz has quit IRC | 01:54 | |
| *** llnz2 is now known as llnz | 01:54 | |
| tansell | alanp, pong | 01:56 |
| alanp | ugh | 02:00 |
| * alanp forgets | 02:00 | |
| CIA-22 | alanp tpserver-cpp-mtsec * r1443bf128a19 /modules/games/mtsec/enhance.cpp: Removed debugging stream output. | 02:01 |
| alanp | ohg | 02:01 |
| alanp | tansell: you mentioned creating a weapon design, then dropping it as a resource on the planet | 02:01 |
| tansell | alanp, you don't drop a weapon design on a planet | 02:02 |
| alanp | right right | 02:02 |
| alanp | an instance of a weapon i mean | 02:02 |
| alanp | i mean when we build them on a planet | 02:03 |
| alanp | and then we create a unique resource for it | 02:03 |
| tansell | there should be a "Load Munitions" and "Unload Munitions" on fleet which lets you beam up/down torpedoes/missiles into your fleet from a planet | 02:03 |
| alanp | OK | 02:03 |
| tansell | alanp, when a weapon design is created there should be an associated resource created | 02:03 |
| alanp | OK and the resource will reference the design | 02:04 |
| alanp | so that I can read all of the properties | 02:04 |
| tansell | so on a planet you then select the "Build Munitions" order | 02:04 |
| alanp | when loading/firing/etc | 02:04 |
| tansell | which will add the resources to the planet | 02:04 |
| alanp | resourceS? | 02:05 |
| *** llnz2 has joined #tp | 02:07 | |
| *** llnz has quit IRC | 02:07 | |
| *** llnz2 is now known as llnz | 02:07 | |
| alanp | I create the design, create the missile resource on the planet | 02:08 |
| alanp | then load that resource onto my ship | 02:09 |
| alanp | so there only needs to be 1 resource, right? | 02:09 |
| *** llnz has quit IRC | 02:11 | |
| *** llnz has joined #tp | 02:11 | |
| tansell | alanp, I think your confused | 02:15 |
| alanp | ??? | 02:15 |
| tansell | alanp, there is a difference between the "resource definition" and the actual resources | 02:15 |
| alanp | ok | 02:18 |
| alanp | in this case, we will create an actual resource, no? | 02:18 |
| alanp | a resource type on the missile design | 02:19 |
| alanp | on creation we create the resource of the missile | 02:19 |
| tansell | for each design you need to create a resource definition | 02:19 |
| alanp | right | 02:19 |
| alanp | and then when we build that missile, wont we create an actual resource of it on the planet it's built on? | 02:20 |
| tansell | the Build Munitions order is what creates the missiles/torpedos on the planet | 02:20 |
| alanp | nod | 02:20 |
| alanp | so when we save the design we will create the definition then | 02:21 |
| alanp | right? | 02:21 |
| alanp | so we're going to have "Build Munitions" which will in essence drop a missile resource onto the planet and then "Load Armaments" to load that onto a ship | 02:22 |
| tansell | yes | 02:22 |
| tansell | drop is a bad word to use there | 02:22 |
| alanp | unload | 02:22 |
| tansell | no | 02:23 |
| alanp | what then? | 02:23 |
| tansell | not sure | 02:23 |
| alanp | hehe | 02:23 |
| tansell | create is also wrong | 02:23 |
| tansell | it basically adding a 1 to a counter | 02:23 |
| tansell | (or x if you build multiple) | 02:23 |
| alanp | this is going to create a lot of resource definitions | 02:24 |
| tansell | alanp, you have an int32 of IDs | 02:26 |
| alanp | ;-) | 02:26 |
| alanp | alright, it seems i have my work cut out | 02:28 |
| *** llnz has quit IRC | 02:34 | |
| tansell | alanp, it should be pretty simple | 02:35 |
| alanp | my question was how to relate the resource to the actual design | 02:35 |
| alanp | but i guess there are a couple ways to do it | 02:35 |
| tansell | alanp, any way you want - it's only a server side issue | 02:35 |
| alanp | nod | 02:35 |
| alanp | tansell: why is it that when I add a resource to a planet it will show as "On Surface" in the client? | 02:37 |
| tansell | alanp, because that is how it's defined | 02:37 |
| tansell | and that is pretty much what you want | 02:37 |
| alanp | when I add a production point, the ones I add will say "on surface" but the original game startup ones will say "mineable" | 02:38 |
| tansell | alanp, resources can be in 3 states | 02:38 |
| tansell | "On surface, minable and inaccessible" | 02:38 |
| tansell | on surface can be used straight away | 02:39 |
| alanp | hrm | 02:39 |
| alanp | definitely want them on the surface | 02:40 |
| alanp | I see what the difference is | 02:40 |
| alanp | thansk | 02:40 |
| tansell | alanp, you should be use minable for the mineral density stuff | 02:41 |
| alanp | yes, definitely | 02:41 |
| alanp | might be good to clean up the resourcelist with an enum to make it a bit clearer :-) | 02:42 |
| tansell | enum? | 02:45 |
| tansell | oh poke epyon, he is doing clean up stuff :) | 02:45 |
| alanp | hehe | 02:46 |
| alanp | actually enum not needed, i misunderstood the call | 02:52 |
| alanp | i'll push it tomorrow afternoon, it's 3am :-) | 02:54 |
| alanp | have a good... day? | 02:54 |
| alanp | bye | 02:54 |
| cherez | tansell: Ping? | 03:02 |
| tansell | cherez, pong | 03:02 |
| cherez | I'm having problems the check method for DescStructure, since unlike the other Structures it actually needs some state information (what type it is) to know whether an argument is valid. | 03:04 |
| tansell | cherez, that is correct | 03:04 |
| cherez | As written so far the check method doesn't take any state data. | 03:05 |
| tansell | it sounds like you are going down the wrong path | 03:06 |
| cherez | So the solutions I see are either change the api and do a lot of backtracking to clean it up, or just assume the check passes and just let the __set__ method do the testing. | 03:06 |
| tansell | so what is DescStructure? | 03:08 |
| *** greenlion has joined #tp | 03:08 | |
| cherez | It's basically a list structure that changes its internal structure based on its typefield. | 03:09 |
| tansell | cherez, why do you need that? | 03:10 |
| cherez | A group structure, rather.... | 03:11 |
| tansell | still not needed | 03:11 |
| tansell | OrderDesc/ObjectDesc objects generate new classes | 03:11 |
| tansell | one class for each typeid | 03:12 |
| tansell | so the Order/Object as described in the protocol.xml are basically abstract base classes | 03:12 |
| cherez | Right, I know that. | 03:13 |
| cherez | But the description frames still have to be sent and received. | 03:13 |
| cherez | So they need a Structure to describe them. | 03:13 |
| cherez | And if I'm not critically misunderstanding the protocol, the exact structure of a description frame does vary at runtime. | 03:15 |
| tansell | so your talking about the 'x' part in struct="I SS T [ISS[x]]" | 03:16 |
| tansell | ? | 03:16 |
| cherez | Right. | 03:16 |
| cherez | I made a Structure to represent the [x]. | 03:16 |
| cherez | But I can't write a check method for it because the type of the [x] depends on the I. | 03:17 |
| tansell | cherez, why? when the I is set, it changes the X | 03:18 |
| tansell | obviously you can't set X until you have set the I right? | 03:18 |
| cherez | Yes, but the check method doesn't know what the rest of the packet is. | 03:19 |
| cherez | It's class-level rather than instance-level. | 03:19 |
| cherez | So it can't know anything about a specific instance, which it would have to in order to know whether any specific X is legal. | 03:20 |
| tansell | so | 03:24 |
| tansell | the check method is never called directly | 03:24 |
| tansell | it's called by __set__ | 03:24 |
| cherez | It is called directly, though. | 03:25 |
| cherez | In a lot of places. | 03:25 |
| tansell | like? | 03:25 |
| cherez | Packet, List, Group. | 03:25 |
| tansell | welp | 03:26 |
| tansell | not sure what is the best option :P | 03:27 |
| cherez | I could make check take an instance, but it would mean quite a bit of work to change every call and it would just be for this corner case. | 03:27 |
| tansell | you could modify the check method to also take stuff | 03:27 |
| cherez | Yeah, that's one solution. | 03:27 |
| cherez | The other one I see is just make DescStruct's check pass, because it does the checking with __set__ anyway. | 03:28 |
| cherez | And every place that check is called follows with a set not long after. | 03:29 |
| tansell | not quite sure that would work with Group? | 03:29 |
| cherez | Because Group would start writing to other values before it found that it was wrong? | 03:30 |
| cherez | Actually, if the typefield hasn't been written yet the check method won't be right anyway. | 03:30 |
| tansell | you could just make the ISS[X] special | 03:31 |
| cherez | Treat it like a single value? | 03:31 |
| tansell | or a special group | 03:32 |
| cherez | Hmm. | 03:34 |
| *** llnz has joined #tp | 03:39 | |
| cherez | It would be a bit icky building that group, and I hate to think what its check method would look like, but that is an option. | 03:39 |
| tansell | well it would just be a subclass of Group right? | 03:41 |
| cherez | Yeah, the only real difference would the the check method. | 03:42 |
| cherez | Which would have to create an instance of the Group. | 03:42 |
| tansell | bblr | 03:43 |
| CIA-22 | llnz tpserver-cpp-battlexml * rf9993d2d25f7 / (5 files in 2 dirs): | 04:14 |
| CIA-22 | Third reimplementation of RSP Combat for Minisec. | 04:14 |
| CIA-22 | This time, it actually does what the game description says, and | 04:14 |
| CIA-22 | also creates the BattleXML file (not that it gets written anywhere yet). | 04:14 |
| *** JLP has quit IRC | 05:49 | |
| CIA-22 | llnz tpserver-cpp * r4de61a451543 /modules/tpcl/guile/ (tpguile.cpp tpguile.h): | 05:59 |
| CIA-22 | In tpguile, set the property values to zero before starting to eval | 05:59 |
| CIA-22 | the designs. | 05:59 |
| CIA-22 | It shouldn't be necessary in finished designs, but should help incomplete | 05:59 |
| CIA-22 | designs. | 05:59 |
| *** reac has joined #tp | 06:15 | |
| reac | mithro, llnz i'm having problems pushing to the daneel repository.. write permission are not working anymore for some reason, getting this error specfically: http://groups.google.com/group/github/browse_thread/thread/a307d5c44ca7c503/8d64f1ba03d79c32 | 06:20 |
| tpb | <http://ln-s.net/3TQv> (at groups.google.com) | 06:20 |
| mithro | reac: that thread is totally unrelated | 06:23 |
| mithro | give it a try now | 06:23 |
| reac | Yeap thanks that seems to have solved it | 06:24 |
| mithro | daneel-ai doesn't have py in the name so the fixperm script didn't do the right thing | 06:25 |
| reac | mm okay .. thank you | 06:28 |
| *** mithro has quit IRC | 06:39 | |
| CIA-22 | joelboh tpclient-pyweb * r8c0517f7a209 /frontend/scripts/map.js: Frontend: Added a few comments and descriptions. | 06:55 |
| matthewd | tote: You around? | 06:56 |
| tote | matthewd: yep, hi! | 06:57 |
| tote | matthewd: no blog post yet, trying to get back on track atm | 06:58 |
| matthewd | k | 06:59 |
| tote | matthewd: is it okey if we have the meeting tomorrow, then i get the time to finish a few things i started with this weekend? | 07:05 |
| tote | matthewd: ive been sick for a couple of days, if you wonder why im off schedule | 07:05 |
| matthewd | Yep, that's okay. | 07:14 |
| CIA-22 | llnz tpserver-cpp * r116cfa55423a /modules/tpcl/ (guile/tpguile.cpp mzscheme/tpmzscheme.cpp): | 07:16 |
| CIA-22 | Set property value defaults in tpmzscheme, like tpguile. | 07:16 |
| CIA-22 | Also updated tpguile copyright date. | 07:16 |
| * llnz wanders off | 07:31 | |
| llnz | later all | 07:31 |
| *** llnz has quit IRC | 07:31 | |
| *** Guest34184 has joined #tp | 08:09 | |
| *** Guest34184 has left #tp | 08:09 | |
| *** alanp_ has joined #tp | 08:45 | |
| *** peres has joined #tp | 09:01 | |
| alanp_ | CIA-22llnz tpserver-cpp * r4de61a451543 /modules/tpcl/guile/ (tpguile.cpp tpguile.h):05:59 | 09:02 |
| alanp_ | CIA-22In tpguile, set the property values to zero before starting to eval05:59 | 09:02 |
| alanp_ | :-) | 09:02 |
| alanp_ | thanks llnz | 09:02 |
| CIA-22 | joelboh tpclient-pyweb * r54fccace9142 /frontend/ (index.html scripts/map.js): | 09:14 |
| CIA-22 | Frontend: Added a notify component, it displays various things that | 09:14 |
| CIA-22 | happens in the client, for example when its downloading the universe in | 09:14 |
| CIA-22 | the background. | 09:14 |
| *** bddebian has joined #tp | 09:20 | |
| bddebian | Heya | 09:22 |
| CIA-22 | joelboh tpclient-pyweb * rbaf6a0a4c3f8 /frontend/scripts/map.js: Frontend: Fixed a bug where components get double content. | 09:23 |
| *** alanp_ has quit IRC | 09:41 | |
| *** ezod has quit IRC | 10:04 | |
| *** ezod has joined #tp | 10:05 | |
| *** peres has quit IRC | 10:19 | |
| *** mhilmi has joined #tp | 11:58 | |
| *** JLP has joined #tp | 12:08 | |
| *** francisco has joined #tp | 13:18 | |
| francisco | could somebody help me install parsec in my ubuntu jaunty? | 13:18 |
| francisco | I am trying to install GloMoSim but i have no luck | 13:19 |
| francisco | somebody here? | 13:22 |
| *** francisco has quit IRC | 13:37 | |
| *** Greywhind has joined #tp | 13:37 | |
| CIA-22 | joelboh tpclient-pyweb * r8e870c91a047 /frontend/scripts/map.js: Frontend: Fixed a bug where it wasnt possible to logout. | 13:48 |
| *** alanp_ has joined #tp | 14:15 | |
| *** bddebian has quit IRC | 14:34 | |
| *** alanp_ has quit IRC | 15:01 | |
| CIA-22 | joelboh tpclient-pyweb * rbe34eeafb901 /frontend/scripts/map.js: Frontend: Forgot to remove some debug code. | 15:22 |
| CIA-22 | joelboh tpclient-pyweb * rad64fa18b78b /frontend/scripts/map.js: Frontend: wops another bug | 15:27 |
| *** llnz has joined #tp | 16:04 | |
| llnz | morning all | 16:12 |
| CIA-22 | ric daneel-ai-pyconstraint-1.1 * re7fbf0bf1372 /daneel/problem.py: | 16:50 |
| CIA-22 | daneel/problem.py: created a Rule class to hold variable domains, instead of storing them as a dictionary. | 16:50 |
| CIA-22 | Modified set/get functions to represent this change. | 16:50 |
| CIA-22 | ric daneel-ai-pyconstraint-1.1 * r39b9b83c601f /daneel/basic.py: daneel/basic.py: Updated to store variable domains from cache in the KnownRule class. | 16:50 |
| CIA-22 | ric daneel-ai-pyconstraint-1.1 * r49f20a3c1bf7 /daneel/mod-rfts.py: daneel/mod-rfts.py: Added several rules to be solved in startTurn() | 16:50 |
| *** verhoevenv has joined #tp | 17:23 | |
| *** tuna-fish has quit IRC | 19:11 | |
| *** nash has joined #tp | 19:17 | |
| *** greenlion has quit IRC | 19:59 | |
| *** tansell_laptop has joined #tp | 20:22 | |
| *** verhoevenv has quit IRC | 20:31 | |
| *** tansell--laptop has joined #tp | 20:34 | |
| *** tansell_laptop has quit IRC | 20:52 | |
| tansell | morning people | 21:21 |
| llnz | hi tansell | 21:21 |
| Greywhind | hi tansell | 21:25 |
| tansell | hey Greywhind | 21:26 |
| tansell | any luck? | 21:26 |
| Greywhind | did you happen to see my last messages yesterday? | 21:26 |
| Greywhind | also, i just submitted the midterm survey about an hour ago | 21:26 |
| Greywhind | maybe less | 21:26 |
| tansell | Greywhind, did you try tp03 branch and see if you get the same problem? | 21:26 |
| Greywhind | tansell: let me check | 21:26 |
| Greywhind | didn't even think to do that | 21:26 |
| Greywhind | silly me | 21:26 |
| Greywhind | tansell: yes, it still happens with stable | 21:27 |
| tansell | what happens? | 21:28 |
| tansell | and which tpserver-cpp? | 21:28 |
| Greywhind | tansell: http://pastebin.com/d79ee825 | 21:29 |
| tpb | Title: pastebin - collaborative debugging tool (at pastebin.com) | 21:29 |
| Greywhind | tansell: a bit of an older one than the newest tpserver-cpp, because i still can't compile the new one | 21:29 |
| tansell | but which ruleset? | 21:29 |
| Greywhind | tansell: minisec | 21:30 |
| tansell | you can't create designs in minisec | 21:30 |
| llnz | minisec does not allow the creation of designs | 21:30 |
| Greywhind | ah | 21:30 |
| Greywhind | that might be the cause, i guess :P | 21:30 |
| Greywhind | any others you can't? | 21:31 |
| tansell | risk | 21:32 |
| Greywhind | k | 21:32 |
| Greywhind | tansell: in mtsec and rfts i'm getting this: | 21:33 |
| Greywhind | 2009-07-06 21:32:50 < Info > Login ok by greywhind | 21:33 |
| Greywhind | ERROR: In procedure memoization: | 21:33 |
| Greywhind | ERROR: Missing or extra expression in (define New DesignDesignType (make-design-vtable "pwpwpwpwpwpw")). | 21:33 |
| Greywhind | and then the server crashes | 21:33 |
| llnz | i don't think any allow it, except for mtsec which in master doesn't work, and not sure on the mtsec branch currently | 21:33 |
| tansell | blame alanp for that | 21:33 |
| llnz | Greywhind: odd | 21:33 |
| llnz | oh | 21:34 |
| llnz | i think i know what it is | 21:34 |
| llnz | it's because of the space in the name | 21:34 |
| llnz | of the dseign | 21:34 |
| * llnz makes a note to fix it tonight | 21:35 | |
| *** mithro has joined #tp | 21:40 | |
| Greywhind | seems like when i edit a design, then try to save, it also gives me a bad packet | 21:42 |
| Greywhind | http://pastebin.com/d2e03a536 | 21:42 |
| tpb | Title: pastebin - collaborative debugging tool (at pastebin.com) | 21:42 |
| *** tansell--laptop has quit IRC | 21:44 | |
| llnz | Greywhind: which ruleset? | 21:45 |
| Greywhind | llnz: rfts | 21:45 |
| llnz | i need to have another look at how _num-components property is set and used | 21:46 |
| *** bddebian has joined #tp | 21:56 | |
| *** jmtan has quit IRC | 21:56 | |
| tansell | Greywhind, so you might want to fix the ioerror that occurs with trying to add designs to minisec | 22:00 |
| Greywhind | tansell: i'll try to figure out a way to do it | 22:01 |
| Greywhind | i have to go eat dinner first | 22:01 |
| alanp | I haven't had time to debug that issue fully | 22:56 |
| alanp | space in the name of the design? | 22:56 |
| llnz | alanp: yeah, tpguile is wrong there | 23:00 |
| llnz | tpmzscheme should work correctly though | 23:00 |
| alanp | tpmzscheme doesn't work for me :-( | 23:01 |
| alanp | I think mithro also reported a problem on amd64 | 23:04 |
| alanp | i guess i could find another computer do compile on | 23:07 |
| llnz | alanp: i updated both tpcl modules last night to set the default values for properties | 23:11 |
| *** tansell-laptop has joined #tp | 23:11 | |
| alanp | I saw that :-) thanks | 23:11 |
| llnz | and when testing you will just have to avoid space in the design name | 23:11 |
| llnz | until i can fix tpguile | 23:11 |
| *** jmtan has joined #tp | 23:12 | |
| alanp | default new design is called "New Design" heh | 23:13 |
| llnz | yes, that would be a problem | 23:13 |
| Greywhind | heh | 23:13 |
| Greywhind | yeah | 23:13 |
| llnz | maybe you can hack the client (or library) to set it to something easier to now | 23:13 |
| * alanp never tried to change it, here goes nothing | 23:13 | |
| alanp | ? | 23:14 |
| alanp | oops | 23:14 |
| alanp | 2009-07-06 23:15:12 < Debug > Starting design eval | 23:15 |
| alanp | ERROR: In procedure memoization: | 23:15 |
| alanp | ERROR: Missing or extra expression in (define New DesignDesignType (make-design-vtable "pwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpwpw")). | 23:15 |
| alanp | I get it if the design has no space also | 23:15 |
| llnz | but that one does have a space in it | 23:16 |
| llnz | the design name is "New Design" | 23:16 |
| alanp | hm, I changed it | 23:16 |
| llnz | obviously not in the right place | 23:16 |
| alanp | ..in the design window | 23:16 |
| llnz | before it is added to the design window, it is already sent to the server with the default name | 23:16 |
| alanp | that would do it | 23:17 |
| llnz | grep the client source code for New Design and change that line | 23:17 |
| alanp | ok, simple hack then | 23:17 |
| alanp | ok hm | 23:18 |
| alanp | still an error | 23:18 |
| alanp | different though | 23:19 |
| alanp | my design gets saved, but I get a Bad Packet error in the client | 23:19 |
| Greywhind | i got the same thing | 23:19 |
| llnz | how is the packet in error? | 23:20 |
| Greywhind | tansell: ping? | 23:22 |
| alanp | llnz: http://pastebin.com/m67f2a050 | 23:23 |
| tpb | Title: pastebin - collaborative debugging tool (at pastebin.com) | 23:23 |
| *** DTRemenak|RDP is now known as DTRemenak | 23:24 | |
| llnz | odd | 23:24 |
| alanp | yeah, it's just a Design Added packet | 23:24 |
| alanp | from wha ti can tell | 23:24 |
| llnz | was it expecting a design object back? | 23:24 |
| llnz | the server sent OK packet ("Design added") | 23:25 |
| llnz | ahh | 23:26 |
| llnz | it (libtpproto-py) expects a design object in return | 23:27 |
| alanp | should it? | 23:28 |
| llnz | humm... maybe it should | 23:29 |
| llnz | i'll have a look into it tonight | 23:29 |
| * llnz adds it to his list | 23:29 | |
| alanp | hehe thanks | 23:30 |
| llnz | mtsec is the first real use of the design system, so i expect these bugs | 23:34 |
| alanp | nod | 23:34 |
| *** bddebian has quit IRC | 23:34 | |
| *** reac has quit IRC | 23:52 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!