| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** bddebian has quit IRC | 00:26 | |
| *** vi1985 has quit IRC | 00:26 | |
| *** andrei has joined #tp | 00:50 | |
| CIA-29 | victor.ivri gencon-rfts-ai * r8c21e76adf54 /gencon/Client.java: Minor changes, plus identified source of error to be researched and fixed. | 00:52 |
|---|---|---|
| *** zzorn_laptop has joined #tp | 01:23 | |
| *** JLafont has quit IRC | 01:46 | |
| *** JLafont has joined #tp | 01:47 | |
| *** zzorn_laptop has quit IRC | 02:10 | |
| *** mithro has quit IRC | 02:34 | |
| *** zzorn_laptop has joined #tp | 02:55 | |
| tpb | aloril_ has joined on worldforge | 03:14 |
| *** nash_ has quit IRC | 03:17 | |
| tpb | aloril__ has quit worldforge (Ping timeout: 378 seconds) | 03:18 |
| *** llnz has joined #tp | 03:40 | |
| *** Iwanowitch has joined #tp | 04:34 | |
| llnz | hi Iwanowitch | 04:38 |
| llnz | ~seen jotham | 05:20 |
| tpb | llnz: jotham was last seen in #tp 2 days, 2 hours, 34 minutes, and 32 seconds ago: <jotham> i don't read any blogs | 05:20 |
| Iwanowitch | llnz: Hi! | 05:23 |
| llnz | hi | 05:23 |
| llnz | how's is going? | 05:25 |
| Iwanowitch | Way too busy with schoolwork. I don't like it. | 05:27 |
| Iwanowitch | I spend the weekend in the pc labs, from 10 AM to 4 AM twice. | 05:27 |
| Iwanowitch | And the project is still not done :( | 05:28 |
| llnz | ouch | 05:29 |
| CIA-29 | llnz web * re08883dedb36 /utils/sloc2html.py: Give java a decent colour so it can be seen on the sloc page | 05:31 |
| *** JLafont has quit IRC | 05:57 | |
| *** JLafont has joined #tp | 05:58 | |
| *** peres has joined #tp | 06:35 | |
| *** peres has quit IRC | 07:08 | |
| tpb | aloril__ has joined on worldforge | 07:25 |
| tpb | aloril_ has quit worldforge (Ping timeout: 378 seconds) | 07:28 |
| Iwanowitch | What is this worldforge thing that keeps popping up? | 08:22 |
| llnz | Iwanowitch: the bot (tpb) is on both freenode and worldforge irc networks | 08:23 |
| llnz | worldforge is the project where tp was started | 08:23 |
| llnz | so we keep a (small) presence there | 08:24 |
| Iwanowitch | So you get notified here if things are said there? | 08:24 |
| llnz | yeah | 08:27 |
| llnz | and the reverse | 08:27 |
| *** Marcel- has joined #tp | 08:41 | |
| *** JLafont has quit IRC | 09:00 | |
| *** JLafont has joined #tp | 09:01 | |
| ezod | llnz: ping? | 09:06 |
| llnz | ezod: pong! | 09:06 |
| llnz | :-) | 09:07 |
| ezod | llnz: got your comment.. as you may know i've little experience with revision control | 09:07 |
| llnz | that's ok | 09:07 |
| ezod | llnz: so, how exactly do i merge in the master branch? | 09:07 |
| llnz | are you using git or cg? | 09:08 |
| ezod | git, but i have both | 09:08 |
| llnz | git is fine | 09:08 |
| llnz | to merge the changes from the master branch you run: | 09:09 |
| llnz | git-merge origin/master | 09:09 |
| llnz | I will complain of a conflict | 09:09 |
| llnz | s/I/it/ | 09:09 |
| ezod | thanks, trying | 09:10 |
| ezod | hm, no problem | 09:11 |
| ezod | i didn't touch any of those files | 09:11 |
| llnz | except the author file | 09:11 |
| ezod | but you didn't touch that either, right? | 09:11 |
| ezod | so it just considers my version newer | 09:12 |
| llnz | you will need to edit the author file, then run "git-commit AUTHORS" | 09:12 |
| llnz | i did change the author file to add xdotx | 09:12 |
| ezod | strange, i didn't get that | 09:13 |
| * ezod paste alert | 09:13 | |
| ezod | Merge made by recursive. tpserver/objecttypemanager.cpp | 2 +- tpserver/ordermanager.cpp | 2 +- tpserver/playeragent.cpp | 6 +++--- tpserver/playerview.cpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) | 09:13 |
| ezod | ack | 09:13 |
| ezod | sorry | 09:13 |
| ezod | http://pastebin.com/d20c679c4 | 09:15 |
| ezod | do i need to pull first or something? | 09:16 |
| * ezod is confused by git | 09:16 | |
| llnz | yes, i think you will need to | 09:16 |
| llnz | don't worry, i'm still learning it too | 09:16 |
| ezod | if i do git pull, will that roll back my local commits in config? | 09:17 |
| llnz | it shouldn't | 09:17 |
| llnz | if you are worried, you could do a commit first | 09:17 |
| ezod | like, a push? | 09:18 |
| llnz | no, just git-commit | 09:19 |
| llnz | it will keep it locally until you do a push | 09:19 |
| ezod | oh ok, i've already been doing that | 09:19 |
| ezod | so it worked now | 09:20 |
| llnz | cool | 09:20 |
| ezod | i had been wondering about that | 09:23 |
| ezod | merging a branch after 4 months of divergence.. :) | 09:24 |
| llnz | one month to the day | 09:24 |
| llnz | so have you merged yet? | 09:25 |
| llnz | did it complain about AUTHORS? | 09:25 |
| ezod | sure did | 09:25 |
| ezod | i just went in and made it look the way i wanted it to, then commit -a the whole merge | 09:26 |
| llnz | cool | 09:26 |
| llnz | when you are ready to push the code, feel free to do so | 09:26 |
| ezod | will do | 09:27 |
| ezod | oh, frame.h has changed | 09:31 |
| llnz | yes | 09:31 |
| ezod | interesting | 09:31 |
| llnz | btw, i hope you know about the cvs mailing list (inaccurate name now) | 09:34 |
| llnz | but there is also an rss feed for the commits in the master branch | 09:34 |
| ezod | i know about the list, what about the feed? | 09:35 |
| ezod | is it part of gitweb? | 09:35 |
| llnz | yes | 09:35 |
| llnz | go to the tpserver-cpp.git summary page | 09:35 |
| llnz | rss and atom feeds are at the bottom (or status area of your browser) | 09:36 |
| ezod | yep, got it, little rss button :) | 09:36 |
| llnz | cool | 09:36 |
| * llnz should be in bed | 09:40 | |
| * llnz wanders off | 09:41 | |
| llnz | later all | 09:41 |
| *** llnz has quit IRC | 09:41 | |
| *** zzorn_laptop has quit IRC | 11:37 | |
| *** peres has joined #tp | 11:41 | |
| *** peres has quit IRC | 12:50 | |
| *** Erroneous has joined #tp | 13:07 | |
| *** andrei has quit IRC | 14:43 | |
| *** SmokingRope has quit IRC | 15:00 | |
| CIA-29 | victor.ivri gencon-rfts-ai * r5981d5f148dc /gencon/Client.java: Some more control structures in client. | 17:30 |
| *** llnz has joined #tp | 18:17 | |
| CIA-29 | victor.ivri gencon-rfts-ai * r2e8063f6a390 /gencon/Client.java: Sorted out minor bugs. | 18:20 |
| *** jotham is now known as notjotham | 18:44 | |
| *** Epyon has joined #tp | 18:56 | |
| *** mithro has joined #tp | 18:57 | |
| *** xdotx has quit IRC | 19:01 | |
| *** Marcel- has quit IRC | 19:14 | |
| llnz | bbl | 19:14 |
| *** llnz has quit IRC | 19:14 | |
| *** notjotham is now known as Cocks | 19:24 | |
| *** Cocks is now known as notjotham | 19:24 | |
| *** nash has joined #tp | 19:29 | |
| *** Iwanowitch has quit IRC | 19:44 | |
| *** nash_ has joined #tp | 20:35 | |
| *** nash has quit IRC | 20:35 | |
| mithro | nash_: ping? | 20:55 |
| nash_ | you | 20:58 |
| *** nash_ is now known as nash | 20:58 | |
| mithro | you? | 20:59 |
| mithro | well I'm in Sydney till tommorrow | 20:59 |
| nash | My wifes birthday party is tonight, so tomorrow lunch would be it | 20:59 |
| mithro | nash: I don't think I would be around for tommorrow lunch | 21:00 |
| nash | No time todayu | 21:01 |
| nash | Got a todo list from hell | 21:01 |
| nash | I'm getting shit over things that were done which I said not to do | 21:01 |
| ezod | mithro: what do you think about making the admin protocol part of the main protocol? we would note which need to be implemented by game-related code, admin-related code, or both.. | 21:04 |
| ezod | mithro: it would still be split auth-wise, connection-wise, different ports, etc. | 21:05 |
| ezod | mithro: but the frames and stuff would all live together | 21:05 |
| mithro | I think having it seperate is probably preferred for the moment | 21:07 |
| *** bddebian has joined #tp | 21:09 | |
| nash | make it depend on the other protocol, and make sure it can be integrated however | 21:10 |
| ezod | alright.. would it be fair to call it an extension at least? | 21:10 |
| ezod | because in terms of implementation, it's going to be a lot better if i can put all the frames together, at least in tpserver-cpp | 21:11 |
| ezod | has to do with using the same code for manipulating frames | 21:14 |
| nash | Yes | 21:14 |
| nash | An extension to the protocol would seem to make sense to me | 21:14 |
| bddebian | Heya | 21:15 |
| ezod | hi bddebian | 21:15 |
| ezod | ok, so i'll figure this out and put on the wiki page exactly what i'd like to do | 21:16 |
| bddebian | Hello ezod, nash | 21:17 |
| ezod | i think the only effect on the protocol would be that i'd need some frame type id numbers reserved for the admin frames... | 21:17 |
| ezod | anyway, thanks, bbiab | 21:19 |
| nash | heyo bddebian | 21:20 |
| nash | ezod: Start at 200 or something ;-) | 21:21 |
| *** Epyon has quit IRC | 21:48 | |
| *** Erroneous has quit IRC | 21:56 | |
| *** Lukstr has joined #tp | 23:39 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!