| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 00:24 |
|---|---|---|
| tpb | aloril has joined on worldforge | 00:42 |
| *** mithro has quit IRC | 01:08 | |
| CIA-54 | alklomion /tmp/qJoni1WnMZ/6H9C9doq4W-midp * rcd60bff22d9e /src/net/thousandparsec/util/URI.java: | 01:50 |
| CIA-54 | Added support for picking up scheme, authority and path | 01:50 |
| CIA-54 | via git-CVS emulator | 01:50 |
| CIA-54 | alklomion /tmp/iXY8Wl2KSE/kTXc1lreMy-midp * r8e8d5b03d972 /src/net/thousandparsec/util/URISyntaxException.java: | 01:51 |
| CIA-54 | a urisyntaxexception is thrown when the URI is bogus. | 01:51 |
| CIA-54 | via git-CVS emulator | 01:51 |
| CIA-54 | alklomion /tmp/mFzyJXBbZd/8NZnNkifH8-midp * r2d4f1f355df2 /src/net/thousandparsec/util/URI.java: | 01:53 |
| CIA-54 | Implemented code for getting the Query part | 01:53 |
| CIA-54 | via git-CVS emulator | 01:53 |
| CIA-54 | alklomion /tmp/firkUWqV9H/6xj0tzRMir-midp * ra0f047c4f641 /src/net/thousandparsec/util/URI.java: | 02:10 |
| CIA-54 | added exception handling to the parser | 02:10 |
| CIA-54 | via git-CVS emulator | 02:10 |
| *** nash has quit IRC | 02:49 | |
| CIA-54 | jmingtan tpclient-pyogre * r52c637fd83ad /src/ (Scene.py helpers.py): Extract module-level methods into a separate module | 02:52 |
| CIA-54 | jmingtan tpclient-pyogre * r1ab9f72d7c3d / (14 files in 3 dirs): Added ship mesh and planet mesh together with textures | 02:52 |
| CIA-54 | jmingtan tpclient-pyogre * r950ae08e1570 /src/ (Scene.py starmap.py): Changed selection boundary to use billboards | 02:52 |
| CIA-54 | jmingtan tpclient-pyogre * r081b7e816272 /src/starmap.py: Star glow using billboards | 02:52 |
| CIA-54 | jmingtan tpclient-pyogre * r285266ca7677 /src/starmap.py: Rotate planets every frame | 02:52 |
| CIA-54 | alklomion /tmp/nF8RSO9ljN/mDyT2pmSgF-midp * r31f249279afb /src/net/thousandparsec/util/URI.java: | 03:02 |
| CIA-54 | added rawSchemeSpecificPart support | 03:02 |
| CIA-54 | via git-CVS emulator | 03:02 |
| CIA-54 | alklomion /tmp/CWpnAOYHxn/WSiID9Pgak-midp * rab828cb78fc0 /src/net/thousandparsec/util/URI.java: | 03:16 |
| CIA-54 | added support for rawUserInfo and hopefully userInfo in the process | 03:16 |
| CIA-54 | via git-CVS emulator | 03:16 |
| *** CIA-54 has quit IRC | 04:08 | |
| *** CIA-15 has joined #tp | 04:09 | |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 04:28 |
| *** zzorn_laptop has joined #tp | 04:46 | |
| tpb | aloril has joined on worldforge | 04:47 |
| *** tuna has quit IRC | 04:53 | |
| *** Epyon has quit IRC | 05:18 | |
| *** Iwanowitch has joined #tp | 05:43 | |
| *** JLafont has quit IRC | 06:21 | |
| *** JLP has joined #tp | 06:35 | |
| *** tuna-fish has joined #tp | 07:21 | |
| *** tuna-fish is now known as tuna | 07:22 | |
| * JLP has just seen the cool news about mithro's talk at google | 07:59 | |
| *** peres has joined #tp | 08:04 | |
| *** zzorn_laptop has quit IRC | 08:26 | |
| JLP | yay, The Stars FAQ! author has put a link to TP on the front page - http://www.starsfaq.com/ | 09:19 |
| tpb | Title: The Stars! FAQ (at www.starsfaq.com) | 09:19 |
| *** CIA-15 has quit IRC | 09:52 | |
| *** CIA-24 has joined #tp | 09:53 | |
| *** mithro has joined #tp | 10:24 | |
| *** bddebian has joined #tp | 10:29 | |
| bddebian | Howdy | 10:32 |
| JLP | ahoy bddebian, mithro | 10:34 |
| mithro | hey JLP | 10:34 |
| mithro | JLP: got a moment? | 10:34 |
| bddebian | Hi JLP | 10:34 |
| JLP | mithro: yup | 10:35 |
| mithro | JLP: you have mail | 10:35 |
| * JLP fetches his laptop | 10:35 | |
| *** jphr has joined #tp | 10:36 | |
| JLP | ahoy jphr | 10:39 |
| jphr | JLP: ahoy | 10:49 |
| jphr | since you msg'ed me, i have to tell you something stupid I just did. I spent like 30 minutes trying to figure out why my change from adjacency_matrix to adjacency_list wouldn't compile. Then I looked at my includes and saw I was still including matrix instead of list... | 10:51 |
| *** vi1985 has joined #tp | 10:53 | |
| vi1985 | hey ppl, haven't been here in a while ;) | 10:53 |
| jphr | heyo | 10:54 |
| vi1985 | jphr: hey! | 10:54 |
| jphr | vi1985: sorry i forgot, what was your project again? | 10:54 |
| jphr | (and how is it going?) | 10:54 |
| vi1985 | jphr: try to take over the world :) | 10:55 |
| jphr | sweet | 10:55 |
| vi1985 | (and it's going nicely ;) ) | 10:55 |
| jphr | thats good, while your at it stop canada from passing ACTA | 10:55 |
| vi1985 | it's an ai client for rfts in java :) | 10:55 |
| vi1985 | what's that? :-? | 10:55 |
| vi1985 | (i live in a cave. news like that doesn't reach me) | 10:56 |
| jphr | vi1985: copyright legislation that is atrocious. would give police and ISP's the right to just use any information about your web usage as they please, border checks, minimum 500 fines for any infringment, etc. | 10:57 |
| jphr | ah yes, ai client, that has absolutely nothing in common with risk ruleset, so I guess we don't really have any pointers to share :P | 10:57 |
| vi1985 | hm, maybe there's a way to modify the ai client to tackle that... *quiet evil laughter* | 10:57 |
| vi1985 | ah well :) how's yours coming along? | 10:58 |
| jphr | lol, well it would be in your best interest, risk IS a game of global domination | 10:58 |
| vi1985 | i was talking about ACTA, but risk is also an option ;) | 10:58 |
| jphr | haha | 10:58 |
| vi1985 | jphr: btw, since you're into ruleset dev, here's a question that I meant to shoot off to the devel list, but you might have an answer: how does a client know which ruleset the server is running on? couldn't find anything in the protocol, nor in the irc or devel logs | 11:00 |
| jphr | hmm, i would assume it would be something like game->getRuleset()? | 11:01 |
| vi1985 | let me check against the protocol for a sec.. | 11:01 |
| jphr | afaik its a property of Game, like started | 11:01 |
| vi1985 | hm, is that a new tp04 feature? or was it in tp03 as well? don't remember coming across it in the protocol description | 11:03 |
| vi1985 | (I do see something like this now!) | 11:03 |
| jphr | I don't really know :( just throwing a thought out there | 11:03 |
| vi1985 | thanks! that actually helped! now I have a thread to pull on ;) | 11:04 |
| jphr | :P | 11:04 |
| vi1985 | ah, back to work for me. take it easy! | 11:04 |
| jphr | you too, just holler if you need anything (i'm working as well) | 11:05 |
| vi1985 | sure! thx | 11:05 |
| *** mithro has quit IRC | 11:12 | |
| *** peres has quit IRC | 11:20 | |
| CIA-24 | jmingtan tpclient-pyogre * re6fefabf419c / (3 files in 3 dirs): Add point lighting to individual stars | 11:35 |
| CIA-24 | jmingtan tpclient-pyogre * r1efdc95ea5f7 / (4 files in 2 dirs): Added several planet and star types | 11:35 |
| CIA-24 | jmingtan tpclient-pyogre * rc88aa434472f / (3 files in 2 dirs): Add an additional layer of stars to the background | 11:35 |
| CIA-24 | aaron tpserver-cpp-config * raad5b4660f21 /tpserver/ (command.cpp commandmanager.cpp): Passing std::strings directly to packString calls. | 11:48 |
| CIA-24 | aaron tpserver-cpp-config * r5c99555bbd1f /tpserver/ (4 files): Removed AsyncLogMessage, now built into AdminLogger. | 11:48 |
| CIA-24 | pluskid schemepy * r9ae52997a0fa /doc/ (16 files in 3 dirs): Use a simpler style for doc. | 11:48 |
| CIA-24 | pluskid schemepy * r0a8be50cd0f5 / (6 files in 6 dirs): Added uniformed API doc for different backend. | 11:48 |
| *** pluskid has joined #tp | 11:49 | |
| jphr | anyone able to tell me how to get a pointer to my ruleset main class inside of another class? | 12:28 |
| *** DTRemenak|RDP has joined #tp | 12:29 | |
| jphr | vi1985: did you ever figure it out? | 12:29 |
| *** DTRemenak|RDP is now known as Erroneous | 12:29 | |
| vi1985 | jphr: partially. Now I'm busy choosing my courses for the next semester! If I don't figure it out by mid-afternoon, i'll just spam the devel list ;) | 12:30 |
| jphr | what is your partially? as I need to get access to a ruleset pointer outside of the actuall class | 12:31 |
| *** jphr has quit IRC | 12:46 | |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 12:55 |
| *** jphr has joined #tp | 13:12 | |
| *** mithro has joined #tp | 13:15 | |
| mithro | heyo people | 13:21 |
| mithro | hi vi1985 | 13:21 |
| mithro | vi1985: there is a "Game" frame which gives the ruleset | 13:24 |
| *** jphr has joined #tp | 13:41 | |
| Asmm | hello | 13:43 |
| jphr | hi | 13:44 |
| Asmm | mithro: oh, which one is that? I haven't seen it in the tp03 description? | 13:44 |
| Asmm | hi jphr | 13:45 |
| vi1985 | mithro: hi! thanks. | 13:48 |
| *** Erroneous has quit IRC | 13:49 | |
| *** mithro has quit IRC | 13:54 | |
| jphr | anyone help me with this. Why can't I just add a normal number onto a uint32_t? say like uint32_t + 1? | 14:09 |
| *** nuleren has joined #tp | 14:11 | |
| jphr | oh, nvm, typo | 14:11 |
| tpb | aloril has joined on worldforge | 14:29 |
| *** zzorn has joined #tp | 14:32 | |
| *** Erroneous has joined #tp | 15:33 | |
| *** jphr has quit IRC | 15:42 | |
| *** jphr has joined #tp | 15:42 | |
| *** mithro has joined #tp | 15:54 | |
| CIA-24 | jphr tpserver-cpp-risk * r980e93503567 /modules/games/risk/risk.cpp: removed planetOrders->addOwner(0) from Risk::createPlanet as I was informed by llnz it wasn't required. | 15:54 |
| CIA-24 | jphr tpserver-cpp-risk * rf34a7ed76c46 /modules/games/risk/ (colonize.cpp move.cpp reinforce.cpp risk.cpp risk.h): Removed statically setting IDs for objects. Converted adjacency_matrix to list. Removed setting turns for orders as they are not necessary. | 15:54 |
| CIA-24 | jphr tpserver-cpp-risk * r90fe065207ce /modules/games/risk/ (8 files): Mass find and replace of galaxy to constellation. Was informed type did not NEED to be named galaxy. | 15:54 |
| CIA-24 | jphr tpserver-cpp-risk * rc74a79d4abf5 /modules/games/risk/ (6 files): Added methods/variable for holding reinforcements. Various little tweaks. Added logic for updated availible reinforcements display on planets. | 15:54 |
| CIA-24 | jphr tpserver-cpp-risk * rc6d42a905e81 /modules/games/risk/ (risk.cpp riskturn.cpp riskturn.h): Implemented what should be proper turn processing order in RiskTurn. Switched some static casts to dynamic casts at mentors request. | 15:54 |
| CIA-24 | jphr tpserver-cpp-risk * r622fb1fc76e2 /modules/games/risk/ (risk.cpp risk.h riskturn.cpp): Changed a few ints I had created to uint32_t's | 15:54 |
| mithro | heyo people | 15:55 |
| mithro | jphr: how goes things? | 15:56 |
| jphr | pretty good today | 15:56 |
| jphr | i'm actually looking a bit more into graphviz atm, because it seems to be a pretty daunting task to spend 2-3 hours statically adding all the edges for my default map | 15:57 |
| jphr | and I needed to know, can I somehow get a reference to my Risk class in the other classes? | 15:57 |
| *** JLafont has joined #tp | 15:57 | |
| CIA-24 | jphr tpserver-cpp-risk * r498134ab771e /modules/games/risk/risk.cpp: Removed a function I created but never used | 15:59 |
| JLafont | allo | 16:00 |
| mithro | hey JLafont | 16:03 |
| mithro | so how goes your refactoring? | 16:03 |
| JLafont | I think I'm done | 16:07 |
| JLafont | I think I only have to push the commits now | 16:07 |
| mithro | okay | 16:08 |
| mithro | do you want to give the push a try now? | 16:08 |
| mithro | git push git+ssh://[email protected]/git/tpserver-py.git dronesec-new | 16:09 |
| JLafont | I thought I had to push each one seperately? | 16:10 |
| mithro | nope | 16:10 |
| mithro | pushing will push all changes | 16:11 |
| JLafont | ok | 16:12 |
| JLafont | will try | 16:12 |
| JLafont | I take it I should use my own username thoguh | 16:12 |
| mithro | which is how I stuffed up :) | 16:12 |
| mithro | it won't work if you push with my username ;) | 16:12 |
| JLafont | here goes nothing | 16:13 |
| mithro | if this is your first push, it won't annouce anything here | 16:14 |
| JLafont | alrighty | 16:14 |
| *** bddebian has quit IRC | 16:18 | |
| *** JLafont has quit IRC | 16:19 | |
| mithro | well, that didn't go that well :) | 16:19 |
| *** JLafont has joined #tp | 16:19 | |
| jphr | mithro: "and I needed to know, can I somehow get a reference to my Risk class in the other classes?" or should I ask mailing list? | 16:21 |
| mithro | JLafont: you managed to push yourself off the network? | 16:23 |
| JLafont | connectioned timed out :( | 16:23 |
| mithro | jphr: sure! I think it's pretty simple but I have no idea | 16:23 |
| jphr | thanks, I'll probably post a ML message to get the method | 16:24 |
| *** JLafont has quit IRC | 16:25 | |
| mithro | check RFTS and poke nuleren | 16:25 |
| *** Asmm has quit IRC | 16:38 | |
| *** mithro has quit IRC | 17:09 | |
| *** mithro has joined #tp | 17:16 | |
| mithro | ~seen JLafont | 17:17 |
| tpb | mithro: JLafont was last seen in #tp 53 minutes and 14 seconds ago: <JLafont> connectioned timed out :( | 17:17 |
| mithro | :( | 17:18 |
| *** JLafont has joined #tp | 17:22 | |
| JLafont | yay | 17:23 |
| *** jphr_ has joined #tp | 17:30 | |
| JLafont | network was going haywire for a while | 17:33 |
| mithro | JLafont: yeah I guessed as much | 17:34 |
| mithro | I see a new branch | 17:35 |
| mithro | I'm just about to pull and check it | 17:35 |
| JLafont | alright | 17:37 |
| mithro | JLafont: hrm | 17:38 |
| CIA-24 | jphr tpserver-cpp-risk * r65ff175cf77f /modules/games/risk/ (risk.cpp risk.h): Renamed num_galaxies counter to num_constellations. | 17:39 |
| mithro | you either didn't push the correct stuff, or you forgot to fix some stuff | 17:39 |
| JLafont | doh | 17:40 |
| mithro | JLafont: you have been checking your patches before commiting them right? | 17:40 |
| JLafont | yeah | 17:41 |
| mithro | it should be obvious these patches are wrong | 17:41 |
| mithro | as they have a huge amount of removal and addition | 17:41 |
| JLafont | I figure that was due to going from 2 spaces to tabs. As the whole line would change | 17:42 |
| mithro | take a look at the patch for 98e0fc8659acbf034f6f40ed80e761d160eba40c | 17:43 |
| mithro | JLafont: but that is what you are trying to remove! | 17:43 |
| mithro | (changes where just the indenting changed) | 17:43 |
| mithro | so I can see your real code changes | 17:44 |
| mithro | rather then a massive patch which has all the code removed and added as the indention changed | 17:44 |
| JLafont | that patch does seem off | 17:47 |
| *** jphr has quit IRC | 17:47 | |
| mithro | JLafont: hence, how did it get commited :) | 17:49 |
| *** jphr_ has quit IRC | 17:49 | |
| *** jphr has joined #tp | 17:50 | |
| mithro | JLafont: I really want to get over this issue ASAP so you can get back to coding | 17:53 |
| JLafont | mithro: me too | 17:53 |
| mithro | JLafont: how did that patch get committed? | 17:54 |
| JLafont | I think I might have forgotten to add the files I changed | 17:55 |
| mithro | so | 17:55 |
| JLafont | fixing it now | 17:55 |
| mithro | you are reviewing the patch with "git-diff --cached" right | 17:55 |
| mithro | before committing | 17:55 |
| mithro | "git-diff --cached" will show you exactly what is going to be committed | 17:55 |
| JLafont | yes | 17:55 |
| mithro | so, that should have shown you have not done a "git-add" | 17:58 |
| mithro | make sense? | 18:00 |
| JLafont | yeah | 18:02 |
| mithro | it's a good policy to review your patches before pushing | 18:04 |
| mithro | if you have only one patch | 18:04 |
| mithro | you can do a "git commit --amend" | 18:05 |
| mithro | bblr | 18:11 |
| *** JLafont has quit IRC | 18:26 | |
| *** mithro has quit IRC | 18:28 | |
| *** JLafont has joined #tp | 18:38 | |
| *** vi1985 has quit IRC | 18:51 | |
| *** _Lukstr has joined #tp | 18:52 | |
| *** Lukstr has quit IRC | 18:52 | |
| *** Epyon has joined #tp | 18:52 | |
| CIA-24 | verhoevenv daneel-ai * r23ea624b002b / (chr.py chrtest.py): Tests on multiple unification added, bug fixed | 18:53 |
| *** jphr has quit IRC | 18:53 | |
| Iwanowitch | That bugfix went faster than I thought. I'm starting to appreciate Python. | 18:54 |
| *** mithro has joined #tp | 18:54 | |
| Iwanowitch | Only slightly though. | 18:54 |
| CIA-24 | nuleren tpserver-cpp-tae * r57d9e599577a /modules/games/tae/ (tae.cpp tae.h): | 19:01 |
| CIA-24 | Added the Passengers property. Added 8 new components (different types | 19:01 |
| CIA-24 | of cargo holds). The cargo holds use the Passengers property. | 19:01 |
| CIA-24 | nuleren tpserver-cpp-tae * r849736d3587b /modules/games/tae/tae.cpp: Added createPassengerShip function to create a passenger ship | 19:01 |
| CIA-24 | nuleren tpserver-cpp-tae * r9c84ca7f869d /modules/games/tae/tae.cpp: Added createEmptyFleet function. | 19:01 |
| CIA-24 | nuleren tpserver-cpp-tae * ra841b007711b /modules/games/tae/ (tae.cpp tae.h): | 19:01 |
| CIA-24 | Fixed a compilation error in the previous patch caused by a typo and | 19:01 |
| CIA-24 | missing line. | 19:01 |
| *** jphr has joined #tp | 19:03 | |
| mithro | JLafont: so, it all sorted? | 19:06 |
| mithro | Iwanowitch: if you don't like python why are you doing a project in python!? | 19:06 |
| Iwanowitch | mithro: to learn it, obviously. | 19:12 |
| Iwanowitch | Then again, I don't think the prefect or even a really good language exists. | 19:12 |
| Iwanowitch | Python is not too bad overal. | 19:13 |
| JLafont | I'm getting an error about failure to push some refs | 19:18 |
| *** peres has joined #tp | 19:19 | |
| *** nuleren has quit IRC | 19:19 | |
| mithro | JLafont: that would be because you are trying to do a "backwards" push | 19:22 |
| mithro | you'll need my help to fix it | 19:23 |
| mithro | I just remove the dronesec-new branch | 19:26 |
| mithro | you can repush it | 19:26 |
| mithro | ~seen jmtan | 19:27 |
| tpb | mithro: jmtan was last seen in #tp 2 days, 17 hours, 16 minutes, and 16 seconds ago: <jmtan> thank goodness i guess | 19:27 |
| JLafont | ok | 19:31 |
| mithro | you used gitk to check your commit right? | 19:42 |
| mithro | this doesn't look right | 19:43 |
| mithro | dronesec-new is now based on dronesec | 19:43 |
| mithro | I think you stuffed up :/ | 19:44 |
| mithro | I have to run now | 19:44 |
| JLafont | I probably did | 19:44 |
| mithro | JLafont: you know how to use gitk right? | 19:44 |
| mithro | if you do a | 19:44 |
| mithro | gitk -a | 19:44 |
| mithro | it prints out a tree of your commits | 19:44 |
| mithro | and you can see that your branch was wrong | 19:45 |
| mithro | I have removed dronesec-new on the server | 19:46 |
| *** mithro_ has joined #tp | 19:55 | |
| *** mithro has quit IRC | 19:56 | |
| mithro_ | JLafont: so what is preventing you seeing the problems in gitk before you push? | 19:56 |
| *** mithro_ is now known as mithro | 19:56 | |
| mithro | JLafont: are you going to be around at 8:30 tonight? | 19:58 |
| mithro | I want to figure out what is stopping us from moving forward | 19:59 |
| mithro | well, I have to run off - lets organise a meeting time and do this in real time | 20:05 |
| *** mithro has quit IRC | 20:21 | |
| *** Erroneous has quit IRC | 20:52 | |
| *** _Lukstr is now known as Lukstr | 21:11 | |
| *** Lukstr has quit IRC | 21:13 | |
| *** _Lukstr has joined #tp | 21:14 | |
| *** bddebian has joined #tp | 21:14 | |
| bddebian | Heya | 21:15 |
| *** Iwanowitch has quit IRC | 21:20 | |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 22:11 |
| *** greywhind has joined #tp | 22:12 | |
| *** mithro has joined #tp | 22:25 | |
| tpb | aloril has joined on worldforge | 22:28 |
| mithro | JLafont: ping? | 22:29 |
| JLafont | mithro: pong | 22:31 |
| mithro | JLafont: so do you have time to sit down and get this right? | 22:31 |
| JLafont | yeah | 22:31 |
| mithro | okay | 22:32 |
| mithro | so we are going to do this one patch at the time, okay? | 22:33 |
| JLafont | yeah | 22:33 |
| mithro | so where should we start from? | 22:35 |
| JLafont | Not sure. I created dronesec-new using master, but then it somehow swtiched over to dronesec | 22:36 |
| mithro | how did you create dronesec-new? | 22:37 |
| mithro | git branch <id> | 22:37 |
| mithro | git checkout <branchname> | 22:37 |
| mithro | sorry | 22:37 |
| mithro | that should have been | 22:37 |
| mithro | git branch <branchname> <id> | 22:38 |
| JLafont | d556aa10f45ec66ef22b2a3edd60c3c93be2a74 ? | 22:40 |
| mithro | yeah | 22:40 |
| mithro | but | 22:40 |
| mithro | you probably want to use a different name then dronesec-new this time | 22:40 |
| JLafont | yeah | 22:42 |
| JLafont | I called it dronesec-fix | 22:43 |
| mithro | okay | 22:43 |
| mithro | so you got the branch? | 22:43 |
| mithro | and checked it out? | 22:43 |
| JLafont | yeah | 22:43 |
| mithro | okay | 22:44 |
| mithro | lets push the branch | 22:44 |
| mithro | with a | 22:44 |
| mithro | git push <location> dronesec-fix | 22:44 |
| JLafont | done | 22:46 |
| mithro | okay | 22:47 |
| mithro | so lets cherry pick the first patch on your original dronesec branch | 22:47 |
| mithro | you know how to do that right? | 22:47 |
| JLafont | yes | 22:47 |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 22:48 |
| mithro | so, we don't need to do any modifications to the first patch | 22:48 |
| mithro | so just commit it | 22:48 |
| mithro | then do a | 22:48 |
| mithro | git push <location> dronesec-fix | 22:48 |
| JLafont | alright | 22:51 |
| mithro | fetching now | 22:52 |
| mithro | okay cherry pick the next commit | 22:53 |
| mithro | (which is 375b778e579ef040f684853f9e8bf960f65f0bfa) | 22:53 |
| mithro | now looking at this patch | 22:54 |
| mithro | there are some things which could be fixed up | 22:54 |
| mithro | edit tp/server/rules/dronesec/__init__.py | 22:54 |
| mithro | and modify splitfleet and clean so they no longer appear in the patch | 22:55 |
| JLafont | alright | 22:56 |
| mithro | done? | 22:57 |
| JLafont | should I also fix the tabs? | 22:57 |
| mithro | you mean fix the spaces? | 22:57 |
| mithro | everything should be using tabs | 22:57 |
| JLafont | yeah | 22:57 |
| JLafont | fix it so it uses tabs | 22:57 |
| mithro | okay | 22:58 |
| mithro | so | 22:58 |
| mithro | so | 22:58 |
| mithro | looking in "git diff --cached" everything looks okay | 22:59 |
| *** peres has quit IRC | 22:59 | |
| mithro | this no longer appears | 23:00 |
| mithro | -SplitFleet, # Split any fleets - this means you can merge then split in one turn | 23:00 |
| mithro | -Clean, # Clean up fleets which no longer exist | 23:00 |
| mithro | + SplitFleet, # Split any fleets - this means you can merge then split in one turn | 23:00 |
| mithro | + Clean, # Clean up fleets which no longer exist | 23:00 |
| JLafont | yeah | 23:00 |
| mithro | okay | 23:01 |
| mithro | now commit it | 23:01 |
| mithro | with a | 23:01 |
| mithro | "git commit" | 23:01 |
| mithro | then push it | 23:01 |
| JLafont | so a clean commit? | 23:01 |
| JLafont | err new commit | 23:01 |
| JLafont | pushed | 23:02 |
| *** Asmm has joined #tp | 23:02 | |
| mithro | okay that looks fine | 23:04 |
| mithro | lets cherry pick the next one | 23:04 |
| Asmm | hello | 23:04 |
| Asmm | my java work seems to get up to speed, have a simple graphical game viewer client already, and basic framework and classes which should simplify Ai work | 23:05 |
| mithro | Asmm: sounds cool | 23:07 |
| mithro | you want to edit tp/server/rules/dronesec/drones/Dronepedia.py | 23:07 |
| mithro | so it uses tabs | 23:07 |
| tpb | aloril has joined on worldforge | 23:07 |
| JLafont | done | 23:09 |
| JLafont | commiting now | 23:09 |
| mithro | okay | 23:09 |
| JLafont | pushed | 23:09 |
| Asmm | but i was goign to ask - I saw you responding to someone about a Game frame with some sort of ruleselt info, but i couldnt find one in the tp03 docs, is it there? | 23:09 |
| mithro | it's not a documented part of tp03 | 23:10 |
| mithro | it's a back ported tp04 thing | 23:10 |
| mithro | JLafont: that looks good too | 23:11 |
| mithro | get the next patch | 23:12 |
| mithro | fix all the problems like this | 23:12 |
| mithro | - | 23:12 |
| mithro | -################ | 23:12 |
| mithro | + | 23:12 |
| mithro | +################ | 23:12 |
| Asmm | any news when tp04 will be fully up and running? i remember hearing that tpserver-cpp has this and that done to suport tp04, but given there is even no official tp04 doc i guess it is not there yet? I've seen the draft. and it looks very interesting, with some new features like this game frame or downloading only whats changed | 23:13 |
| mithro | there is an official tp04 doc | 23:13 |
| mithro | http://www.thousandparsec.net/tp/dev/documents/protocolxml.php | 23:14 |
| tpb | <http://ln-s.net/JXj> (at www.thousandparsec.net) | 23:14 |
| Asmm | cool | 23:15 |
| mithro | JLafont: any luck with the next patch? | 23:18 |
| tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 23:19 |
| JLafont | pushed | 23:20 |
| mithro | JLafont: looks good to me | 23:21 |
| JLafont | This one had no changes so I just recommited and pushed | 23:25 |
| JLafont | I just pushed 2 more patches that didn't get any changes | 23:28 |
| mithro | checking now | 23:28 |
| mithro | both them look good | 23:29 |
| JLafont | another one pushed | 23:40 |
| mithro | afraid you stuffed that one up | 23:43 |
| mithro | add resource/Planet are using spaces | 23:45 |
| mithro | and there is a partial conflict remaining in the __init__ | 23:45 |
| JLafont | woops | 23:45 |
| mithro | measure twice, cut once! | 23:47 |
| mithro | JLafont: you know how to fix? | 23:51 |
| JLafont | cherry pick again? | 23:51 |
| *** bddebian has quit IRC | 23:53 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!