--- Log opened Fri Aug 30 00:00:46 2013
20130830 00:08:25-!- shadowm_desktop is now known as shadowm_tty
20130830 00:08:55-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20130830 00:11:25-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev
20130830 00:15:28-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has quit [Ping timeout: 264 seconds]
20130830 00:18:00-!- nurupo|away [~nurupo.ga@biribiri.org] has joined #wesnoth-dev
20130830 00:18:20-!- nurupo|away is now known as nurupo
20130830 00:18:25-!- nurupo [~nurupo.ga@biribiri.org] has quit [Changing host]
20130830 00:18:25-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20130830 00:19:04-!- Kostic [~marko@85.202.113.200] has quit [Ping timeout: 264 seconds]
20130830 00:20:13-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130830 00:33:08< flix> mattsc: I added a attribute to recruitment-instructions. You can have a look, I called it "pattern": http://wiki.wesnoth.org/User:Flixx/Configuration_Specifications#recruitment-instructions
20130830 00:33:35< flix> mattsc: So thank you, you gave me really helpful input :)
20130830 00:35:01< mattsc> flix: looks great, thank you!
20130830 00:35:44< mattsc> flix: I guess the only other comment I have is that this wiki page would benefit from a good number of examples once these aspects are available.
20130830 00:36:42< flix> mattsc: Yes, of course. Especially for those recruitment-instructions. I'll do it.
20130830 00:36:50< mattsc> In a way, you have example "hidden" in the text, but spelling them out specifically would be good.
20130830 00:37:20< mattsc> Great.
20130830 00:41:41-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Ping timeout: 248 seconds]
20130830 00:46:20-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has joined #wesnoth-dev
20130830 00:48:19-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Remote host closed the connection]
20130830 00:58:41-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20130830 01:03:22-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has joined #wesnoth-dev
20130830 01:03:22-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has quit [Changing host]
20130830 01:03:22-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20130830 01:06:30-!- _8680__ [~8680@2002:44e1:fb42:0:682f:e950:c34b:cc66] has quit [Quit: leaving]
20130830 01:06:52-!- _8680_ [~8680@2002:44e1:fb42:0:5156:dbf3:2d41:1a25] has joined #wesnoth-dev
20130830 01:07:19-!- _8680_ is now known as Guest51704
20130830 01:08:01-!- Guest51704 [~8680@2002:44e1:fb42:0:5156:dbf3:2d41:1a25] has quit [Client Quit]
20130830 01:08:24-!- _8680__ [~8680@2002:44e1:fb42:0:5156:dbf3:2d41:1a25] has joined #wesnoth-dev
20130830 01:10:35-!- H-Hour [~H-Hour@cpc7-sgyl35-2-0-cust428.18-2.cable.virginmedia.com] has quit [Read error: Connection reset by peer]
20130830 01:11:01-!- _8680__ is now known as _8680_
20130830 01:25:54-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20130830 01:33:29-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20130830 01:33:49-!- shadowm_tty is now known as shadowm_desktop
20130830 01:33:51-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Read error: error:1408F10B:SSL routines:SSL3_GET_RECORD:wrong version number]
20130830 01:34:36-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20130830 01:52:42-!- Stumpfenstiel [~quassel@178.115.248.41.wireless.dyn.drei.com] has joined #wesnoth-dev
20130830 01:56:13-!- Stumpfenstiel [~quassel@178.115.248.41.wireless.dyn.drei.com] has quit [Quit: http://quassel-irc.org - Chat comfortably. Anywhere.]
20130830 02:00:16-!- Stumpfenstiel [~quassel@178.115.248.41.wireless.dyn.drei.com] has joined #wesnoth-dev
20130830 02:03:32-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn]
20130830 02:06:01-!- Stumpfenstiel [~quassel@178.115.248.41.wireless.dyn.drei.com] has quit [Remote host closed the connection]
20130830 02:20:36-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20130830 02:30:48-!- Jetrel_new [~richard_k@c-75-73-180-126.hsd1.mn.comcast.net] has quit [Quit: Jetrel_new]
20130830 02:31:57-!- Jetrel_new [~richard_k@c-75-73-180-126.hsd1.mn.comcast.net] has joined #wesnoth-dev
20130830 02:32:15-!- irker247 [~irker@ai0867.net] has joined #wesnoth-dev
20130830 02:32:15< irker247> wesnoth: mattsc wesnoth-old:master 87a9c2b9f64b / data/ai/micro_ais/ais/micro_ais_wml_tags.lua: [micro_ai] tag: fix bug that prevented removal of sticky behavior CAs http://git.io/urY8Ug
20130830 02:34:28-!- Vandal [Ganrao@cpe-65-189-245-210.woh.res.rr.com] has quit []
20130830 03:05:19-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev
20130830 03:11:32-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20130830 03:18:18-!- Octalot [~noct@host86-159-77-104.range86-159.btcentralplus.com] has quit []
20130830 03:28:09< mattsc> Hi vultraz: I believe it was you who reported a while ago that you had trouble removing the guardian MAI?
20130830 03:28:55< mattsc> I looked into that and found a bug (fixed up there ^), although the problem I found was different from the one you reported.
20130830 03:29:17< mattsc> Either way, it should be working now (I think)
20130830 03:36:49-!- flix [~flix@rstk-4d061407.pool.mediaWays.net] has left #wesnoth-dev []
20130830 03:47:34-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Quit: Lost terminal]
20130830 03:47:50-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20130830 03:54:13< vultraz> mattsc: I don't think it was limited to the Guardian MAI - it was that an mai with action=delete still demands keys required for that mai
20130830 03:55:32< mattsc> vultraz: strange, that's not what I found in the tests I just did.
20130830 03:56:16< mattsc> What I needed for removal are side=, ai_type= and action=delete; plus id= is it's a sticky BCA.
20130830 03:56:31< mattsc> *if it's
20130830 03:57:06< vultraz> ah, well...id was a required key, yes
20130830 03:57:43< vultraz> but it also demanded guardian_type= I think
20130830 03:58:32< mattsc> For behavior CAs (which attach directly to a unit), that's necessary in order to identify for which unit it needs to be removed.  So if that was the error message, then that's correct.  All other keys should not be required though.
20130830 03:59:00< mattsc> Ah, yes, you are right.  If it's one of those, that one is required as well.  :P
20130830 03:59:34< mattsc> ... since it's theoretically possible to attach several guardian AIs to the same unit.
20130830 04:00:16< vultraz> I see
20130830 04:00:21< vultraz> you should note that on the wiki
20130830 04:00:34< mattsc> True.  I will.
20130830 04:01:07< mattsc> But in either case, I found a different bug that way, so it was good in any case!
20130830 04:04:30-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130830 04:05:26-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Quit: system reboot in progress]
20130830 04:07:12-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20130830 04:11:11-!- EliDupree [~quassel@66-189-34-122.dhcp.oxfr.ma.charter.com] has quit [Ping timeout: 260 seconds]
20130830 04:16:04< vultraz> mattsc: ya know, with the introduction of multiple MAIs per side, what happens if an umc author simply wants to say, "remove all mais from this side and all units"?
20130830 04:16:19< vultraz> you would think action=delete side=1 would do that
20130830 04:16:26< vultraz> but from what I gather, it won't
20130830 04:17:37< vultraz> mattsc: or, remove all mais of x type from all units on y side
20130830 04:20:16< vultraz> mattsc: especially with BCAs like the Guardian MAI, it seems cumbersome to have to remove them from each unit individually 
20130830 04:26:08< mattsc> vultraz: you can always do it manually with [modify_ai] using wildcards: http://wiki.wesnoth.org/AiWML#Using_.5Bmodify_ai.5D_to_Change_Goals.2C_Candidate_Actions_and_Stages
20130830 04:29:04< mattsc> vultraz: it shouldn't be hard to add the functionality you suggest though.  I'll put it on my list (but with low priority)
20130830 04:32:52< vultraz> mattsc: I'm sure those are borderline cases, and I don't need them myself, but I just suggested them as they seem logican
20130830 04:35:16< mattsc> Yeah, they do make sense.
20130830 04:36:47< vultraz> incidentally, were you able to observe the wolf issue?
20130830 04:37:24< mattsc> No, haven't gotten around to that yet.  It's the next thing on the list.
20130830 04:41:40-!- Ivanovic_ [~ivanovic@x2f51509.dyn.telefonica.de] has joined #wesnoth-dev
20130830 04:42:01-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection]
20130830 04:44:55-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 260 seconds]
20130830 04:46:19-!- Ivanovic_ [~ivanovic@x2f51509.dyn.telefonica.de] has quit [Ping timeout: 260 seconds]
20130830 04:52:57-!- mattsc [~mattsc@154.20.32.246] has quit [Quit: Ciao]
20130830 04:58:03-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20130830 05:02:52-!- kex [~kex@78.157.29.205] has quit [Remote host closed the connection]
20130830 05:03:32-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20130830 05:07:56-!- kex [~kex@78.157.29.205] has quit [Ping timeout: 245 seconds]
20130830 05:18:29-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Ping timeout: 248 seconds]
20130830 05:44:41-!- Ivanovic_ [~ivanovic@x2f4f943.dyn.telefonica.de] has joined #wesnoth-dev
20130830 05:45:22-!- Ivanovic_ [~ivanovic@x2f4f943.dyn.telefonica.de] has quit [Changing host]
20130830 05:45:22-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20130830 05:46:40-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 264 seconds]
20130830 05:46:46-!- Ivanovic_ is now known as Ivanovic
20130830 05:47:05-!- xight [~xight@138.199.78.102] has joined #wesnoth-dev
20130830 05:55:49-!- Upth [~ogmar@c-71-197-216-52.hsd1.wa.comcast.net] has joined #wesnoth-dev
20130830 05:55:49-!- Upth is now known as Upthorn
20130830 05:55:53-!- xight [~xight@138.199.78.102] has quit [Quit: WeeChat 0.4.0]
20130830 06:17:18-!- Lehen [~Lehen@100-42-244-61.eastlink.ca] has joined #wesnoth-dev
20130830 06:18:33-!- Lehen [~Lehen@100-42-244-61.eastlink.ca] has quit [Client Quit]
20130830 06:32:07-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20130830 06:45:13-!- nurupo is now known as nurupo|away
20130830 07:01:43-!- Ardonik [~ardonik@adsl-75-28-97-38.dsl.irvnca.sbcglobal.net] has joined #wesnoth-dev
20130830 07:14:10-!- Ard0nik [~ardonik@adsl-75-28-101-254.dsl.irvnca.sbcglobal.net] has joined #wesnoth-dev
20130830 07:16:41-!- Ardonik [~ardonik@adsl-75-28-97-38.dsl.irvnca.sbcglobal.net] has quit [Ping timeout: 245 seconds]
20130830 07:19:16-!- Ard0nik is now known as Ardonik
20130830 07:19:38-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130830 07:23:48-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 276 seconds]
20130830 07:25:44-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20130830 07:28:23-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Read error: Connection reset by peer]
20130830 07:32:08-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20130830 07:32:33-!- bumbadadabum [~bumba@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20130830 07:36:30-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Client Quit]
20130830 08:05:50-!- bumbadadabum [~bumba@d155109.upc-d.chello.nl] has quit [Ping timeout: 245 seconds]
20130830 08:43:18-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20130830 08:48:27-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20130830 09:01:17-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 09:18:37-!- trademark_ [~trademark@mne69-1-82-67-17-201.fbx.proxad.net] has joined #wesnoth-dev
20130830 09:43:30-!- thunderstruck [~thunderst@cpc5-sgyl29-2-0-cust174.sgyl.cable.virginmedia.com] has joined #wesnoth-dev
20130830 10:07:02-!- H-Hour [~H-Hour@cpc7-sgyl35-2-0-cust428.18-2.cable.virginmedia.com] has joined #wesnoth-dev
20130830 10:15:06-!- Octalot [~noct@host86-159-77-104.range86-159.btcentralplus.com] has joined #wesnoth-dev
20130830 10:36:11-!- mjs-de [~mjs-de@g224184218.adsl.alicedsl.de] has joined #wesnoth-dev
20130830 10:38:29-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 10:41:32-!- markus_ [~mjs-de@g224189055.adsl.alicedsl.de] has joined #wesnoth-dev
20130830 10:43:06-!- _8680_ [~8680@2002:44e1:fb42:0:5156:dbf3:2d41:1a25] has quit [Ping timeout: 264 seconds]
20130830 10:45:39-!- mjs-de [~mjs-de@g224184218.adsl.alicedsl.de] has quit [Ping timeout: 260 seconds]
20130830 10:52:22-!- _8680_ [~8680@2002:44e1:fb42:0:3894:8394:3500:29eb] has joined #wesnoth-dev
20130830 10:52:45-!- _8680_ is now known as Guest48574
20130830 11:22:50-!- markus_ is now known as mjs-de
20130830 11:29:35-!- iwaim_ [~iwaim@2001:2c0:40e:2002:0:4:14:80] has quit [Quit: Tiarra 0.1+svn-38663: SIGTERM received; exit]
20130830 11:30:14-!- iwaim [~iwaim@2001:2c0:40e:2002:0:4:14:80] has joined #wesnoth-dev
20130830 11:30:23-!- irker247 [~irker@ai0867.net] has quit [Quit: transmission timeout]
20130830 11:41:40-!- esr [~esr@wesnoth/developer/esr] has quit [Read error: Connection reset by peer]
20130830 11:43:10-!- esr [~esr@wesnoth/developer/esr] has joined #wesnoth-dev
20130830 12:14:12-!- Octalot [~noct@host86-159-77-104.range86-159.btcentralplus.com] has quit []
20130830 12:15:01< thunderstruck> fabi: Would you still like to leave "Chapter One End" as it is now?
20130830 12:15:06< thunderstruck> in LoW.
20130830 12:15:28< fabi> thunderstruck: I guess it is no longer necessary after your work.
20130830 12:18:18-!- kex [~kex@89.205.70.185] has joined #wesnoth-dev
20130830 12:18:44-!- GunChleoc [50079c6b@gateway/web/freenode/ip.80.7.156.107] has joined #wesnoth-dev
20130830 12:19:32-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Quit: Távozom]
20130830 12:24:03< thunderstruck> fabi: What's with this formatting in scenarios attribute values: "<i>The Legend of Wesmere</i>\nMultiplayer Campaign\nChapter one"?
20130830 12:24:22< thunderstruck> description attribute*
20130830 12:24:30< fabi> hmmm
20130830 12:24:46< fabi> Anything wrong with it?
20130830 12:25:28< thunderstruck> I am compiling at the moment and I can't run Wesnoth to check, but I don't think mp::create screen display those descriptions properly.
20130830 12:26:04< fabi> Ah
20130830 12:26:15< fabi> But it should.
20130830 12:27:10< thunderstruck> fabi: Do you know at which end the problem lies?
20130830 12:27:22< fabi> No, sorry.
20130830 12:27:43< fabi> markup things are not my field.
20130830 12:28:01< fabi> I have a problem with markup in the editor that is not only strange but also a heisenbug.
20130830 12:29:50< thunderstruck> fabi: Ok, it's not a big deal, because now the decription= in [campaign] will be used for mp::create.
20130830 12:30:26< fabi> Indeed, don't get lost in details.
20130830 12:33:09< thunderstruck> fabi: I guess we could use those scenario descriptions in mp::configure, where the starting points (sceanrios with allow_new_game=yes) are displayed 
20130830 12:33:42< fabi> Ah yeah, that is a good idea.
20130830 12:33:56-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev
20130830 12:38:25-!- GunChleoc [50079c6b@gateway/web/freenode/ip.80.7.156.107] has quit [Ping timeout: 250 seconds]
20130830 13:40:28-!- kex [~kex@89.205.70.185] has quit [Remote host closed the connection]
20130830 13:44:36-!- DCW [~Thunderbi@cpc1-finc14-2-0-cust12.4-2.cable.virginmedia.com] has joined #wesnoth-dev
20130830 13:49:52-!- Kostic [~marko@85.202.113.200] has joined #wesnoth-dev
20130830 13:56:49-!- kex [~kex@89.205.70.185] has joined #wesnoth-dev
20130830 14:03:22-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 14:05:12-!- GunChleoc [50079c6b@gateway/web/freenode/ip.80.7.156.107] has joined #wesnoth-dev
20130830 14:16:08-!- DCW [~Thunderbi@cpc1-finc14-2-0-cust12.4-2.cable.virginmedia.com] has quit [Remote host closed the connection]
20130830 14:19:34-!- horon [~horon@nttkyo176024.tkyo.nt.ngn2.ppp.infoweb.ne.jp] has joined #wesnoth-dev
20130830 14:37:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20130830 14:38:41-!- stikonas [~gentoo@5.20.200.50] has joined #wesnoth-dev
20130830 14:38:41-!- stikonas [~gentoo@5.20.200.50] has quit [Changing host]
20130830 14:38:41-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 14:55:19-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Ping timeout: 260 seconds]
20130830 14:55:55-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 15:01:50-!- EliDupree [~quassel@66-189-34-122.dhcp.oxfr.ma.charter.com] has joined #wesnoth-dev
20130830 15:06:38-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Ping timeout: 256 seconds]
20130830 15:19:32-!- mattsc [~mattsc@207.230.251.234] has joined #wesnoth-dev
20130830 15:27:24-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 15:28:53< thunderstruck> lipkab: Hi.
20130830 15:29:36< thunderstruck> About the patch you sent me: which version is the latest, the one on the pastebin or on the forums?
20130830 15:31:54-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Ping timeout: 264 seconds]
20130830 15:37:52-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.102] has joined #wesnoth-dev
20130830 15:40:28-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 15:42:05-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 245 seconds]
20130830 15:42:09-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 15:45:06-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Ping timeout: 264 seconds]
20130830 15:45:28-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 15:47:31< lipkab> thunderstruck: Hello.
20130830 15:49:28< thunderstruck> lipkab: I think I've found out that myself. It's the one in the forums, because pastebin paste was deleted.
20130830 15:56:03< thunderstruck> lipkab: Do you mind if instead of your 2nd patch, I will do it by myself following on what you did in your patch? I think that would be easier than to fix merge conflicts.
20130830 15:56:13< thunderstruck> And I would give a credit to you in commit's message.
20130830 16:02:12-!- mattsc [~mattsc@207.230.251.234] has quit [Quit: Computer's asleep]
20130830 16:06:39-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has joined #wesnoth-dev
20130830 16:06:39-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has quit [Changing host]
20130830 16:06:39-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20130830 16:06:53< lipkab> thunderstruck: Ah, sorry, I didn't read your second message.
20130830 16:07:09< lipkab> thunderstruck: Do it as you see fit.
20130830 16:07:54< lipkab> There's no need to credit me for the commit, I have the creds in the file itself anyways ;)
20130830 16:13:06< thunderstruck> lipkab: The first patch does not apply as well. Is there still a way to apply it partially or do I have to do it manually?
20130830 16:17:41-!- GunChleoc [50079c6b@gateway/web/freenode/ip.80.7.156.107] has quit [Ping timeout: 250 seconds]
20130830 16:20:56< lipkab> thunderstruck: Umm, did I send two patches?
20130830 16:21:01< lipkab> I only recall one.
20130830 16:21:11< lipkab> Restoring mp_options
20130830 16:21:20< thunderstruck> One file, two patches.
20130830 16:21:31< thunderstruck> Subject: [PATCH 1/2] Bring back mp_options.
20130830 16:21:45< thunderstruck> Subject: [PATCH 2/2] Wire mp_options back in.
20130830 16:21:49< lipkab> Ah, right.
20130830 16:22:29< lipkab> Well, the first one is only putting mp_options back in the source tree.
20130830 16:22:32-!- mattsc [~mattsc@204.174.103.3] has joined #wesnoth-dev
20130830 16:23:10< lipkab> So it's not worth bothering with conflict resolution.
20130830 16:23:24< lipkab> Just get mp_option.?pp from the main repo.
20130830 16:23:38< lipkab> *mp_options
20130830 16:25:05< thunderstruck> lipkab: I've found a way to apply it by using "patch" and then fixing conflicts manually.
20130830 16:25:30< lipkab> Okay.
20130830 16:38:23-!- Kostic [~marko@85.202.113.200] has quit [Quit: Ex-Chat]
20130830 16:39:10-!- Kostic [~marko@85.202.113.85] has joined #wesnoth-dev
20130830 16:43:13-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Quit: Nettalk6 - www.ntalk.de]
20130830 16:48:32-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 16:52:24-!- esr [~esr@wesnoth/developer/esr] has quit [Quit: WeeChat 0.4.0]
20130830 16:55:26-!- Upthorn [~ogmar@c-71-197-216-52.hsd1.wa.comcast.net] has quit [Ping timeout: 245 seconds]
20130830 17:02:55-!- horon [~horon@nttkyo176024.tkyo.nt.ngn2.ppp.infoweb.ne.jp] has quit [Quit: Leaving...]
20130830 17:26:40-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 245 seconds]
20130830 17:29:49-!- gfgtdf [~chatzilla@f054141067.adsl.alicedsl.de] has joined #wesnoth-dev
20130830 17:35:49-!- bumbadadabum [~bumba@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20130830 17:36:01< gfgtdf> does anyone know why nobody merged my pull request yet?
20130830 17:41:09-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20130830 17:41:42-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 17:43:31< Soliton> did you ask anyone for review?
20130830 17:44:22< Soliton> that's one big commit.
20130830 17:45:30< Soliton> if you want to be nice to whoever reviews that you'd break it down into smaller parts that are easier to review.
20130830 17:46:36< lipkab> (And resolve conflicts)
20130830 17:56:32-!- Ardonik [~ardonik@adsl-75-28-101-254.dsl.irvnca.sbcglobal.net] has quit [Read error: Connection reset by peer]
20130830 17:57:38-!- Ardonik [~ardonik@adsl-75-28-101-23.dsl.irvnca.sbcglobal.net] has joined #wesnoth-dev
20130830 17:58:05< gfgtdf> Soliton: fabi said he'd do it, but that was on the day i commited it.  And is there a way to see the conflicts?
20130830 18:01:01-!- kex [~kex@89.205.70.185] has quit [Remote host closed the connection]
20130830 18:02:51-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.102] has quit [Remote host closed the connection]
20130830 18:06:33< Soliton> gfgtdf: remind him then. and i still fear for the review quality of such a huge patch...
20130830 18:07:06< Soliton> gfgtdf: try to apply on top of current master and see if it works to check for conflicts.
20130830 18:08:37< gfgtdf> Soliton: dont i need direct acccces to the git repo to apply?
20130830 18:10:19-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20130830 18:10:42< Soliton> yes, and presumably you have a clone somewhere on your disk.
20130830 18:11:54< gfgtdf> i have the clone that i used to make that commit,
20130830 18:12:04< gfgtdf> Soliton: ^
20130830 18:12:56< Soliton> if you need hand-holding you need to wait for someone else or till i get home.
20130830 18:18:20-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer]
20130830 18:18:49-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev
20130830 18:22:45-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20130830 18:28:07-!- nurupo|away [~nurupo.ga@unaffiliated/nurupo] has quit [Ping timeout: 260 seconds]
20130830 18:30:24-!- nurupo|away [~nurupo.ga@biribiri.org] has joined #wesnoth-dev
20130830 18:30:42-!- nurupo|away is now known as nurupo
20130830 18:30:43-!- nurupo [~nurupo.ga@biribiri.org] has quit [Changing host]
20130830 18:30:43-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20130830 18:43:27-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has joined #wesnoth-dev
20130830 18:44:51-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has quit [Client Quit]
20130830 18:45:00-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has joined #wesnoth-dev
20130830 18:54:32-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has quit [Quit: Leaving]
20130830 18:54:42-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has joined #wesnoth-dev
20130830 18:59:26-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20130830 19:00:49-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has quit [Quit: Leaving]
20130830 19:01:02-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has joined #wesnoth-dev
20130830 19:11:41< gfgtdf> wesbot: seen fabi
20130830 19:11:41< wesbot> gfgtdf: Queried user last spoke 6h 37m ago.  fabi is currently here and on the channels #wesnoth, #wesnoth-de and #wesnoth-umc-dev.
20130830 19:41:34-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20130830 19:42:14-!- stikonas_ [~gentoo@5.20.200.50] has joined #wesnoth-dev
20130830 19:42:14-!- stikonas_ [~gentoo@5.20.200.50] has quit [Changing host]
20130830 19:42:14-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 19:48:03-!- stikonas_ is now known as stikonas
20130830 19:49:24-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130830 19:55:31-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has joined #wesnoth-dev
20130830 19:55:31-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has quit [Changing host]
20130830 19:55:31-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20130830 19:58:34< fabi> gfgtdf: hi
20130830 19:58:57-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
20130830 20:05:52< gfgtdf> fabi: hi
20130830 20:06:19< fabi> gfgtdf: Ah yes, your merge request.
20130830 20:06:35< gfgtdf> fabi: are you gonna merge it?
20130830 20:06:52< fabi> gfgtdf: Sorry, some heavy occurrences of real life.
20130830 20:07:31< gfgtdf> fabi: i think the might be some problems because the game_events file was splittet in the same time i made the request
20130830 20:08:02< gfgtdf> fabi: but the should be quite easy
20130830 20:08:23< fabi> gfgtdf: Indeed. That is a big problem. Soliton is also pretty much right. More smaller patches are easier to review than a single huge one.
20130830 20:08:40< gfgtdf> fabi: is there some way i can mege it myself?
20130830 20:09:45< fabi> gfgtdf: Well, if you have to ask, I guess not ;-P
20130830 20:10:03< fabi> gfgtdf: I can't promise but I hope to have more time on Sunday.
20130830 20:12:14-!- trademark_ [~trademark@mne69-1-82-67-17-201.fbx.proxad.net] has quit [Ping timeout: 264 seconds]
20130830 20:12:55< gfgtdf> fabi: another question, can i reach you in forum pms normaly? because you didnt answer to the last.
20130830 20:13:40< fabi> gfgtdf: Yes, you should. I check them regularly.
20130830 20:25:37-!- Upth [~ogmar@wsctc-208-115-94-229.smartcity.com] has joined #wesnoth-dev
20130830 20:25:37-!- Upth is now known as Upthorn
20130830 20:25:38-!- zookeeper2 [~lmsnie@87-100-196-230.bb.dnainternet.fi] has joined #wesnoth-dev
20130830 20:26:52-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 264 seconds]
20130830 20:33:28-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has joined #wesnoth-dev
20130830 20:33:28-!- skyfaller [~skyfaller@c-75-67-154-18.hsd1.ma.comcast.net] has quit [Changing host]
20130830 20:33:28-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20130830 20:33:41-!- Upthorn [~ogmar@wsctc-208-115-94-229.smartcity.com] has quit [Ping timeout: 248 seconds]
20130830 20:35:09-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Ping timeout: 268 seconds]
20130830 20:42:04< gfgtdf> fabi: i have another question:
20130830 20:42:06< gfgtdf> fabi: is that the tavis doesnt show results for my request also caused by merging problems?
20130830 20:42:43< fabi> gfgtdf: Travis is quite new and I do not know much about it. AI0867 is the one to be ask.
20130830 20:43:13< gfgtdf> wesnoth: seen AI0867 
20130830 20:43:21< gfgtdf> wesbot: seen AI0867 
20130830 20:43:21< wesbot> gfgtdf: Queried user last spoke 2d 19h ago.  AI0867 is currently here and on the channels #wesnoth-de and #wesnoth-umc-dev.
20130830 20:50:31-!- Kostic [~marko@85.202.113.85] has quit [Quit: Ex-Chat]
20130830 20:58:45-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20130830 21:02:40-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 21:03:08-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has joined #wesnoth-dev
20130830 21:08:13-!- jetrel_laptop_ [~jetrel_la@67-6-120-135.mpls.qwest.net] has joined #wesnoth-dev
20130830 21:08:30-!- jetrel_laptop [~jetrel_la@64.215.234.33] has quit [Ping timeout: 264 seconds]
20130830 21:08:30-!- jetrel_laptop_ is now known as jetrel_laptop
20130830 21:14:46-!- bumbadadabum [~bumba@d155109.upc-d.chello.nl] has quit [Quit: Konversation terminated!]
20130830 21:32:04-!- Guest48574 [~8680@2002:44e1:fb42:0:3894:8394:3500:29eb] has quit [Ping timeout: 246 seconds]
20130830 21:32:58-!- _8680_ [~8680@2002:44e1:fb42:0:8556:20b:10ee:9568] has joined #wesnoth-dev
20130830 21:33:20-!- _8680_ is now known as Guest38346
20130830 21:37:35-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 21:40:21< AI0867> gfgtdf: what's the issue?
20130830 21:40:48< gfgtdf> i had a question: is that the tavis doesnt show results for my request also caused by merging problems?
20130830 21:41:21< AI0867> I think the case is that if github can't merge the pull request, travis can't test the merge-results
20130830 21:41:31< AI0867> I may be wrong though
20130830 21:41:39< AI0867> which pull request are you referring to?
20130830 21:41:58< gfgtdf> AI0867: and if i change the request to fix the problems will travis then test it or do i have to mak a new request?
20130830 21:42:02-!- jetrel_laptop [~jetrel_la@67-6-120-135.mpls.qwest.net] has quit [Quit: jetrel_laptop]
20130830 21:42:14< gfgtdf> the pull reuests by gfgtdf (me)
20130830 21:42:20< AI0867> checking...
20130830 21:42:48< gfgtdf> there might be merging problems because the game_events file was splittet durign the time i wrote it.
20130830 21:43:26< AI0867> I think that would trigger a travis build
20130830 21:43:45< AI0867> https://travis-ci.org/wesnoth/wesnoth-old/pull_requests shows no attempts to ever build your PR
20130830 21:44:55< gfgtdf> AI0867: what would trigger a travis build?
20130830 21:46:12-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 21:46:58-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Client Quit]
20130830 21:47:06-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 245 seconds]
20130830 21:47:18< AI0867> gfgtdf: a push to the branch your pull request is based on, probably
20130830 21:47:35< gfgtdf> ok
20130830 21:47:54-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20130830 21:52:28-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Quit: Leaving]
20130830 21:52:52-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 21:54:10-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 21:54:14-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Client Quit]
20130830 21:55:01-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 21:59:33-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has quit [Ping timeout: 248 seconds]
20130830 21:59:58-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Quit: Leaving]
20130830 22:00:58-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 22:01:04-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Remote host closed the connection]
20130830 22:01:41-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 22:01:45-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has quit [Quit: Leaving]
20130830 22:02:18-!- nurupo|away [~nurupo.ga@biribiri.org] has joined #wesnoth-dev
20130830 22:02:40-!- nurupo|away is now known as nurupo
20130830 22:02:41-!- nurupo [~nurupo.ga@biribiri.org] has quit [Changing host]
20130830 22:02:41-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20130830 22:03:20-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Client Quit]
20130830 22:03:36-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 22:06:17< AI0867> gfgtdf: https://travis-ci.org/wesnoth/wesnoth-old/builds/10814941
20130830 22:06:44< AI0867> it's in the queue now
20130830 22:07:32< AI0867> er, I'm not sure what you're doing, but you just broke the auto-merge in the PR again
20130830 22:07:36< gfgtdf> AI0867: ah thx good t know. But that was a test with just on file in the pull request i will dfilitely fail 
20130830 22:08:13-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Client Quit]
20130830 22:09:38< gfgtdf> it*
20130830 22:10:54< gfgtdf> AI0867: i removed some of the files from the pull request to figure out wich causes the merging probmes, but now i know for sure, that changing the request triggers a travis build.
20130830 22:13:17-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has joined #wesnoth-dev
20130830 22:15:20-!- thunderstruck [~thunderst@cpc5-sgyl29-2-0-cust174.sgyl.cable.virginmedia.com] has quit [Quit: Leaving]
20130830 22:17:23-!- lipkab2 [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 22:18:06-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Ping timeout: 264 seconds]
20130830 22:24:35-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 245 seconds]
20130830 22:34:11-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev
20130830 22:35:17< Guest38346> How obsolete is the trailer linked to from www.wesnoth.org?
20130830 22:36:08-!- Guest38346 is now known as _8680_
20130830 22:36:38-!- _8680_ is now known as Guest75588
20130830 22:36:47 * Guest75588 smacks NickServ.
20130830 22:37:17-!- Guest75588 is now known as _8680_
20130830 22:50:46-!- lipkab2 [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Read error: Connection reset by peer]
20130830 22:52:09-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20130830 22:52:17-!- Bengt82 [~Bengt82@s83-179-55-156.cust.tele2.se] has quit [Quit: Leaving]
20130830 23:04:32-!- P1x3LF1r3 [~P1x3LF1r3@138.199.78.93] has joined #wesnoth-dev
20130830 23:04:35-!- zookeeper2 is now known as zookeeper
20130830 23:04:39-!- zookeeper [~lmsnie@87-100-196-230.bb.dnainternet.fi] has quit [Changing host]
20130830 23:04:39-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20130830 23:08:32< fabi> _8680_: It can't be that old. The new animated water graphics indicate that it is at least from a 1.9 version.
20130830 23:08:41-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 240 seconds]
20130830 23:08:42< fabi> based on a 1.9 version.
20130830 23:13:00-!- nurupo is now known as nurupo|away
20130830 23:30:30-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20130830 23:41:09-!- lipkab [~the_new_l@host-91-147-212-174.biatv.hu] has quit [Quit: Távozom]
20130830 23:48:48-!- gfgtdf_ [~chatzilla@f054144077.adsl.alicedsl.de] has joined #wesnoth-dev
20130830 23:51:56-!- gfgtdf [~chatzilla@f054141067.adsl.alicedsl.de] has quit [Ping timeout: 256 seconds]
20130830 23:51:58-!- gfgtdf_ is now known as gfgtdf
20130830 23:53:52-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Remote host closed the connection]
--- Log closed Sat Aug 31 00:00:47 2013