--- Log opened Tue Oct 20 00:00:16 2015 20151020 00:05:09-!- mjs-de [~mjs-de@f049235163.adsl.alicedsl.de] has joined #wesnoth-dev 20151020 00:11:07-!- esr [~esr@wesnoth/developer/esr] has quit [Quit: WeeChat 1.0.1] 20151020 00:12:17-!- esr [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has joined #wesnoth-dev 20151020 00:12:17-!- esr [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has quit [Changing host] 20151020 00:12:17-!- esr [~esr@wesnoth/developer/esr] has joined #wesnoth-dev 20151020 00:14:00-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Read error: Connection reset by peer] 20151020 00:14:26-!- iceiceice [~chris@50.245.222.235] has joined #wesnoth-dev 20151020 00:14:26-!- iceiceice [~chris@50.245.222.235] has quit [Changing host] 20151020 00:14:26-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20151020 00:31:56-!- Shackra [~Jorge@186.177.2.148] has quit [Ping timeout: 250 seconds] 20151020 00:32:25< irker446> wesnoth: Ignacio R. Morelle wesnoth:1.12 ec1cb54aa3b3 / changelog src/builder.cpp src/minimap.cpp: Avoid loading terrain minimap images when not specified by WML http://git.io/vWJVq 20151020 00:33:11< irker446> wesnoth: Ignacio R. Morelle wesnoth:master 62e84fa24055 / src/ (minimap.cpp terrain_builder.cpp): Avoid loading terrain minimap images when not specified by WML http://git.io/vWJV3 20151020 00:34:06-!- gfgtdf [~chatzilla@f054165205.adsl.alicedsl.de] has joined #wesnoth-dev 20151020 00:34:18-!- gfgtdf [~chatzilla@f054165205.adsl.alicedsl.de] has quit [Client Quit] 20151020 00:34:31< irker446> wesnoth: Ignacio R. Morelle wesnoth:master e056f1a688aa / changelog: Update changelog for previous minimap fix commit http://git.io/vWJVR 20151020 00:35:43-!- Appleman1234 [~Appleman1@KD118156241250.au-net.ne.jp] has joined #wesnoth-dev 20151020 00:41:09-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20151020 00:49:18< irker446> wesnoth: Ignacio R. Morelle wesnoth:master 03a85fde5679 / CMakeLists.txt: cmake: Tests and tools also need Boost.Filesystem + Boost.Locale http://git.io/vWJoW 20151020 00:49:21< irker446> wesnoth: Ignacio R. Morelle wesnoth:master 9fd59b503f42 / src/CMakeLists.txt: cmake: Use Boost.Filesystem FS API for tools http://git.io/vWJol 20151020 01:07:45-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20151020 01:28:45-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 265 seconds] 20151020 01:32:49-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc] 20151020 01:36:09-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20151020 01:48:41-!- travis-ci [~travis-ci@ec2-54-162-84-124.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 01:48:42< travis-ci> wesnoth/wesnoth#7671 (master - 62e84fa : Ignacio R. Morelle): The build is still failing. 20151020 01:48:42< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86307430 20151020 01:48:42-!- travis-ci [~travis-ci@ec2-54-162-84-124.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 01:50:27-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20151020 01:54:36< shadowm> SIGH. 20151020 01:54:44< shadowm> unknown location(0): fatal error in "test_gui2": memory access violation at address: 0x00000068: no mapping at fault address 20151020 01:56:24< shadowm> vultraz: gui2::tunit_create::profile_button_callback() does not make sure disp_ is not NULL before dereferencing. 20151020 01:57:12< shadowm> Whether that's the cause of this issue with the tests I don't know but it seems extremely likely. 20151020 01:57:47< shadowm> (i.e. do GUI2 tests try to inject and dispatch events to all widgets in each dialog?) 20151020 01:58:43< shadowm> Travis really should highlight the author of the first failed commit instead of everyone else each time. 20151020 02:03:25< shadowm> vultraz: Do we ever actually want to pass a NULL pointer to the ctor, actually, and why? 20151020 02:04:56< shadowm> #2 0x0000000000762518 in gui2::tunit_create::list_item_clicked (this=0x6127c20, window=...) at src/gui/dialogs/unit_create.cpp:293 20151020 02:04:59< shadowm> #3 0x00000000007619df in gui2::tunit_create::pre_show (this=0x6127c20, window=...) at src/gui/dialogs/unit_create.cpp:187 20151020 02:05:47< shadowm> Mystery solved, that confirms my suspicion (since that's obviously a NULL pointer dereference w/member access offset). 20151020 02:06:19< shadowm> Oh wait no, that's not the method that deals with disp_. 20151020 02:06:57< shadowm> Your code also assumes that resources::controller->play_controller is never NULL. 20151020 02:07:11< shadowm> I mean resources::controller. 20151020 02:12:35< irker446> wesnoth: Ignacio R. Morelle wesnoth:master 49e3d20e7bfe / src/gui/dialogs/unit_create.cpp: gui2/tunit_create: Prevent null pointer dereferences http://git.io/vWJH6 20151020 02:12:43< shadowm> 20151019 23:12:07 warning scripting/lua: wesnoth.put_unit(x, y, unit) is deprecated. Use wesnoth.put_unit(unit, x, y) instead 20151020 02:28:47-!- travis-ci [~travis-ci@ec2-54-226-65-27.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 02:28:48< travis-ci> wesnoth/wesnoth#7672 (master - e056f1a : Ignacio R. Morelle): The build is still failing. 20151020 02:28:48< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86307591 20151020 02:28:48-!- travis-ci [~travis-ci@ec2-54-226-65-27.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 02:42:36< shadowm> zookeeper: Think we should make leorock116 an art contributor? 20151020 02:42:40-!- mjs-de [~mjs-de@f049235163.adsl.alicedsl.de] has quit [Remote host closed the connection] 20151020 02:48:03< celticminstrel> Why did you paste the put_unit warning? 20151020 02:48:39-!- Kwandulin [~Miranda@p200300760F2AB1CF014DAFC0C8493E56.dip0.t-ipconnect.de] has joined #wesnoth-dev 20151020 02:49:23< shadowm> Because I'm curious what's up with that. 20151020 02:50:02< celticminstrel> I changed the order of the parameters to be consistent with all the other unit functions. 20151020 02:50:33< celticminstrel> So that it could be used as a method call on the unit itself. 20151020 02:50:38< shadowm> And haven't updated the wiki yet. 20151020 02:50:46< celticminstrel> Did I forget to do that? 20151020 02:50:59< shadowm> I don't know: http://wiki.wesnoth.org/LuaWML:Units#wesnoth.put_unit 20151020 02:51:08< celticminstrel> Whoops. 20151020 02:51:51< shadowm> We'll keep support for the previous order until 1.15.x I guess? 20151020 02:51:57< celticminstrel> Sure. 20151020 02:52:28< shadowm> (Cue vultraz screaming "but who even neeeeeeeeds backwards compatibility".) 20151020 02:59:00-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20151020 02:59:10-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20151020 03:02:21-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 255 seconds] 20151020 03:02:21-!- wedge010 is now known as wedge009 20151020 03:03:43< vultraz> shadowm: do you have anything against using the icons? 20151020 03:10:00-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc] 20151020 03:12:55-!- travis-ci [~travis-ci@ec2-54-162-84-124.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 03:12:56< travis-ci> wesnoth/wesnoth#7673 (master - 9fd59b5 : Ignacio R. Morelle): The build is still failing. 20151020 03:12:56< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86309286 20151020 03:12:56-!- travis-ci [~travis-ci@ec2-54-162-84-124.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 03:13:46-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20151020 03:14:02-!- Kwandulin [~Miranda@p200300760F2AB1CF014DAFC0C8493E56.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20151020 03:15:50-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Client Quit] 20151020 03:18:10< irker446> wesnoth: Celtic Minstrel wesnoth:master e9cfef3b7213 / src/scripting/game_lua_kernel.cpp: Lua API: Fix unit:vision() and unit:jamming() returning movement cost http://git.io/vWJpM 20151020 03:29:19-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20151020 03:36:31< irker446> wesnoth: Charles Dang wesnoth:master 0e45d64a7181 / src/gui/dialogs/ (unit_create.cpp unit_create.hpp): tunit_crteate: Port Filter functionality from Load Game dialog http://git.io/vWUe2 20151020 03:36:34< irker446> wesnoth: Charles Dang wesnoth:master 013acd316f12 / src/menu_events.cpp: Switch to GUI2 Create Unit dialog http://git.io/vWUea 20151020 03:37:00< celticminstrel> Well, I've updated most of the Lua unit stuff now, I think... 20151020 03:37:28< celticminstrel> There's probably one or two things still missing in the wiki though... 20151020 03:42:43< vultraz> shadowm: am now open to critique 20151020 03:46:47< shadowm> vultraz: I assume you read the stuff I said? 20151020 03:47:21< vultraz> about dereferencing nullprts? 20151020 03:47:27< vultraz> nullptr 20151020 03:47:33< shadowm> About dereferencing null pointers. Yes. 20151020 03:47:54< shadowm> I asked you a question, too. 20151020 03:49:57< vultraz> 20151020 02:03:25< shadowm> vultraz: Do we ever actually want to pass a NULL pointer to the ctor, actually, and why? <- this? 20151020 03:51:14< vultraz> god dammit I pressed Rebuild instead of Build AGAIN 20151020 03:51:43< celticminstrel> Are CodeBlocks toolbars not customizable? 20151020 03:52:15< vultraz> they probably are but as I said, the options are in a menu 20151020 03:53:35< vultraz> shadowm: as for your question, I don't know because I don't know what a ctro is 20151020 03:53:39< vultraz> ctor 20151020 03:54:40< celticminstrel> Constructor. 20151020 03:54:46< celticminstrel> dtor is destructor. 20151020 03:54:52< celticminstrel> Standard abbreviations. :) 20151020 03:55:04< vultraz> oh 20151020 03:55:06< vultraz> derp 20151020 03:57:03< vultraz> shadowm: in that case, I'm not sure. I was just referencing some other code 20151020 03:57:43< vultraz> but I guess so just to be safe? 20151020 04:05:56-!- travis-ci [~travis-ci@ec2-54-226-65-27.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 04:05:57< travis-ci> wesnoth/wesnoth#7674 (master - 49e3d20 : Ignacio R. Morelle): The build was fixed. 20151020 04:05:58< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86316822 20151020 04:05:58-!- travis-ci [~travis-ci@ec2-54-226-65-27.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 04:18:54< shadowm> celticminstrel: How do I fix the second put_unit call in the test scenario? 20151020 04:19:19< shadowm> The obvious solution gets me: 20151020 01:17:59 error scripting/lua: [string "..."]:4: bad argument #1 to 'put_unit' (invalid location) 20151020 04:19:46 * vultraz wonders how the sidebar handles large-size sprites 20151020 04:19:54< shadowm> You know how, actually. 20151020 04:20:15< celticminstrel> Uh. 20151020 04:20:18< shadowm> You've helped me with that issue in my own campaign. It squashes them to fit, horribly. 20151020 04:20:33< shadowm> (Non-proportional rescaling.) 20151020 04:20:38< vultraz> bleh 20151020 04:21:32< celticminstrel> Ah. 20151020 04:21:49< celticminstrel> Hmm. 20151020 04:22:20< vultraz> well, really not sure how to deal with the column size issue for both these dialogs, then 20151020 04:22:42-!- Shackra [~Jorge@186.177.2.148] has quit [Remote host closed the connection] 20151020 04:22:49 * vultraz ponders delving into the guts of gui2 to add fixed-width cells 20151020 04:22:51< shadowm> Easy, just auto-rescale them to fit in 72x72. 20151020 04:23:42< celticminstrel> shadowm: Looks like it won't work with a Lua table describing the unit unless the coordinates are in the table rather than as separate arguments. 20151020 04:24:38< shadowm> It did before, though. 20151020 04:24:46< celticminstrel> True. 20151020 04:24:59< celticminstrel> And still does when the location comes first. 20151020 04:25:32< celticminstrel> Is it important enough to change though? I suppose it could be a little confusing for people converting their code. 20151020 04:26:05< shadowm> Yes. 20151020 04:29:24< shadowm> vultraz: I suggest you take a look at the WML for the add-on description dialog. 20151020 04:30:12< vultraz> huh huh huh 20151020 04:32:21< shadowm> Lines 29 through 44 specifically. 20151020 04:33:41< shadowm> 20151020 01:33:08 error engine: Create unit dialog returned nonexistent or unusable unit_type id 'Qatif-al-nar'. 20151020 04:34:05< shadowm> How interesting. 20151020 04:34:08< celticminstrel> Did it return name instead of ID? 20151020 04:35:54< shadowm> Yes. 20151020 04:36:00< shadowm> units_[static_cast(selected_row)]->type_name(); 20151020 04:36:08< shadowm> Tsk tsk. 20151020 04:36:25< celticminstrel> I guess the name and ID are the same for many mainline units though. 20151020 04:37:05< vultraz> will fix 20151020 04:37:27< shadowm> celticminstrel: Only if you speak English. 20151020 04:37:36< celticminstrel> True. 20151020 04:38:18< celticminstrel> shadowm: Try this commit: https://github.com/CelticMinstrel/wesnoth/tree/lua-put-unit-fix 20151020 04:38:29< celticminstrel> cherry-pick or whatever 20151020 04:38:48< shadowm> Only the branch tip? 20151020 04:38:52< celticminstrel> Yeah. 20151020 04:39:01< shadowm> (Because that's a branch, not a commit.) 20151020 04:39:14< celticminstrel> Yes, I realize. It's the branch tip that I'm talking about. 20151020 04:42:58< shadowm> It works but I'm getting the warning anyway for some reason. 20151020 04:43:07< celticminstrel> The deprecated warning? 20151020 04:43:12< shadowm> (I mean, you could test this yourself.) 20151020 04:43:24< shadowm> Yes. 20151020 04:43:36< celticminstrel> Ah, I see why. 20151020 04:44:55< celticminstrel> It might've been fixed by now, but last time I tried the test scenario, Wesnoth crashed. (Though, that was on turn 1 end, as I recall.) 20151020 04:45:14< shadowm> It doesn't crash on startup for me at least. 20151020 04:45:41< celticminstrel> Updated that branch, should be correct now. 20151020 04:46:18< celticminstrel> (I overwrote the previous tip.) 20151020 04:47:47< irker446> wesnoth: Charles Dang wesnoth:master 6b3baa2a2b86 / src/gui/dialogs/unit_create.cpp: tunit_create: use type image icon if available http://git.io/vWUq3 20151020 04:47:50< irker446> wesnoth: Charles Dang wesnoth:master 675738e63527 / src/gui/dialogs/unit_create.cpp: tunit_create: use type id for return value and help dialog http://git.io/vWUqs 20151020 04:47:55< vultraz> shadowm: ^ 20151020 04:48:05< vultraz> shadowm: any other feedback? 20151020 04:48:34< shadowm> celticminstrel: Works. 20151020 04:48:47< celticminstrel> Yay! 20151020 04:50:35-!- travis-ci [~travis-ci@ec2-54-224-125-17.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 04:50:36< travis-ci> wesnoth/wesnoth#7675 (master - e9cfef3 : Celtic Minstrel): The build was fixed. 20151020 04:50:36< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86322355 20151020 04:50:36-!- travis-ci [~travis-ci@ec2-54-224-125-17.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 05:10:06-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 05:16:46-!- noy [~Noy@wesnoth/developer/noy] has quit [Read error: Connection reset by peer] 20151020 05:17:08-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 05:18:29-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev 20151020 05:18:33-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host] 20151020 05:18:33-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20151020 05:34:22-!- travis-ci [~travis-ci@ec2-54-224-125-17.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 05:34:23< travis-ci> wesnoth/wesnoth#7676 (master - 013acd3 : Charles Dang): The build was fixed. 20151020 05:34:23< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86323571 20151020 05:34:23-!- travis-ci [~travis-ci@ec2-54-224-125-17.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 05:35:29-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Remote host closed the connection] 20151020 05:38:37-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev 20151020 05:39:57-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev 20151020 05:39:57-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host] 20151020 05:39:57-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20151020 05:56:02-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20151020 05:56:23-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev 20151020 06:01:43-!- noy [~Noy@wesnoth/developer/noy] has quit [Read error: Connection reset by peer] 20151020 06:02:06-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 06:38:29-!- TC01 [~quassel@london.acm.jhu.edu] has quit [Remote host closed the connection] 20151020 06:40:57-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20151020 06:55:30-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has joined #wesnoth-dev 20151020 06:55:30-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has quit [Changing host] 20151020 06:55:30-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20151020 07:06:42-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: And lo! The computer falls into a deep sleep, to awake again some other day!] 20151020 07:32:21< shadowm> zookeeper: It's hard to give you an objective answer since, as I said before, I use that track for a very specific purpose and I've grown tired over the years of mainline genericizing music to hell. 20151020 07:32:54< shadowm> So just do whatever you feel is best for Wesnoth. 20151020 07:33:12< zookeeper> well, i have no problem with keeping the old track too 20151020 07:36:02< shadowm> Also, remember to make sure the musician is okay with the GNU GPL because I don't want a repeat of the "nobody told me my music could be modified and redistributed by other people for $$$" drama we had years ago. 20151020 07:36:34< shadowm> 23:42:37 zookeeper: Think we should make leorock116 an art contributor? 20151020 07:37:44< zookeeper> the current tracks have the "track number" given in the metadata, what is that based on? 20151020 07:38:06< shadowm> Uh. 20151020 07:38:47< shadowm> Possibly an effect of commit 102bcd7101710ca8632e86ac166203aa9d3f3ba3 ? 20151020 07:39:11< zookeeper> looks like it 20151020 07:39:21< shadowm> In which case I honestly have no idea. *checks IRC logs* 20151020 07:40:15< zookeeper> if leorock116 keeps making more material then sure, but i don't know if it's really necessary yet. only a couple of sounds so far, and the final result is more of a joint effort i'd say. but i have no objections if you want to do it. 20151020 07:40:46< shadowm> Nope, nada, at least for the two days leading up to the commit's commit date (Dec 10). 20151020 07:41:07< shadowm> Assume it's fully arbitrary and meaningless since it's not documented anywhere. 20151020 07:42:59-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 240 seconds] 20151020 07:43:42< vultraz> Track numbers are their numbers in the compilation albums 20151020 07:43:53< shadowm> What compilation albums? 20151020 07:44:05< shadowm> We don't have compilation albums. 20151020 07:44:32< shadowm> (Unless some of you people have been secretly running a record label behind our backs.) 20151020 07:49:13-!- irker446 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20151020 07:53:41< vultraz> I've seen references to a 'BfW OST' 20151020 07:54:16< shadowm> Where, exactly? 20151020 07:54:35< vultraz> Well, for one, in the metadata itself 20151020 07:54:44< shadowm> Yes, but that's always been there. 20151020 07:55:23< shadowm> Unlike the disc/track numbers. 20151020 07:56:36< shadowm> (Okay, not literally always, the standarization actually happened later down the road, but again, no track numbers since they are meaningless for all intents and effects because the music is only ever officially distributed as part of the game resources.) 20151020 08:08:13< vultraz> I just noticed something about the long-standing newlines-on-windows bug 20151020 08:08:24< vultraz> may be wrong... 20151020 08:08:33 * vultraz gets screeenshots to overlay 20151020 08:12:12< vultraz> ahhhhh 20151020 08:13:07-!- Netsplit *.net <-> *.split quits: MrMaemo 20151020 08:13:24< vultraz> shadowm: newlines are rendered 2 pixels high 20151020 08:14:39-!- horrowind [~Icedove@2a02:810a:8b00:1c54:21b:fcff:fee3:c3ff] has joined #wesnoth-dev 20151020 08:18:31-!- rayblade53 [~chatzilla@124.109.10.167] has joined #wesnoth-dev 20151020 08:19:29-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Disconnected by services] 20151020 08:19:31-!- rayblade53 is now known as vultraz 20151020 08:19:53-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20151020 08:19:53-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20151020 08:22:28-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20151020 08:22:46< vultraz> shadowm: ie, with two lines with a "\n" between them, the top line renders 2px higher than without the newline 20151020 08:23:01< vultraz> as opposed to 1 line's height's worth 20151020 08:32:40-!- horrowind [~Icedove@2a02:810a:8b00:1c54:21b:fcff:fee3:c3ff] has quit [Quit: horrowind] 20151020 08:35:02-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20151020 08:35:22-!- joet [~joet@host86-163-218-88.range86-163.btcentralplus.com] has joined #wesnoth-dev 20151020 08:48:05-!- Appleman1234 [~Appleman1@KD118156241250.au-net.ne.jp] has quit [Ping timeout: 256 seconds] 20151020 08:53:10-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20151020 08:58:50< zookeeper> shadowm, oh and i don't think i need to ask him any licensing questions since he already has a track in (northerners). 20151020 09:05:02< shadowm> wedge009: I can't apply #533 on top of either 1.12 with the revert of the previous patch, or a fork of 1.12 without the revert, for some reason. 20151020 09:05:42< shadowm> That is, tried merging it on top of 5bd79efa8b615e020ed6adc6abd036133cc739e7 and ec1cb54aa3b3b713da2e6e9d9c64ea99e568f69f and in both cases I get conflicts. 20151020 09:06:05< shadowm> Would it be too much to ask for a version rebased on top of the current 1.12 tip? 20151020 09:07:24< shadowm> wedge009: Alternatively, does this PR have any non-obvious prerequisites? 20151020 09:07:43< shadowm> both modified: src/hotkey/hotkey_item.cpp 20151020 09:07:57< shadowm> Oh wait. 20151020 09:08:23< shadowm> Nah, I get conflicts on top of 7ce73bd302052fd28773c75856224bbf1165274c too. 20151020 09:09:34< shadowm> OH. I see, PR #533's first commit parent is THIS: https://github.com/Wedge009/wesnoth/commit/6464c6e1b8e1ea950cf184ff8a6dfffbc13efb62 20151020 09:10:00< shadowm> So it predates c98f3e029d243a4bd47c33df74be02f03141215c too. 20151020 09:10:37 * shadowm wonders what the cleanest approach to resolving this is. 20151020 09:11:40< shadowm> Oh well, I reverted c98f3e029d243a4bd47c33df74be02f03141215c and merged #533 on top for testing. 20151020 09:12:14< shadowm> I figure I can just squash this mess for merging back to 1.12 without extra noise. 20151020 09:13:03< shadowm> wedge009: tl;dr PR #533 is built on top of a grossly out of date 1.12 branch but that's okay because I can rebase it myself now that I figured out the correct parent. 20151020 09:14:18< shadowm> Should've occurred to me to actually look at the PR branch log to begin with. 20151020 09:19:58< shadowm> Things seem to be working correctly again at first glance, will keep testing it in a private branch before pushing upstream. 20151020 09:22:56< wedge009> shadowm: Sorry about that. I thought the aim was to put it into the 1.12 branch, so I tried to save you some work. But I wound up giving you more? 20151020 09:23:25< wedge009> I just used whatever was the 1.12 head/tip/end was... but maybe I did it wrong? 20151020 09:23:36< shadowm> No, not really, I had to do extra work because I did a dumb thing and didn't check who the branch's parent was. 20151020 09:24:04< shadowm> That said, I think you were looking at _your_ 1.12 branch rather than ours, which is out of date. 20151020 09:24:19< wedge009> Oh, that's the problem. >.< 20151020 09:24:27< shadowm> I.e. you probably haven't pulled from ours in months. 20151020 09:24:34< wedge009> I mainly pull from the master. 20151020 09:24:56< wedge009> Gah, I'm still new to this. 20151020 09:25:43< shadowm> Yes, non-linear versioning can be quite confusing. 20151020 09:27:10< wedge009> I pull several times a day, but on the master. How do I push branch updates to my fork on GitHub? 20151020 09:27:56< wedge009> Well, if it simplifies things any, I only changed those if conditions in get/set_hotkey(). 20151020 09:27:59< shadowm> git push ยทยทยท 20151020 09:28:46< shadowm> Where is the remote alias for the repository you want to push to (most likely `origin` if it's the one you originaly cloned your copy from, otherwise it's something you yourself set at some point). 20151020 09:29:26< wedge009> Well, I can only push to my own fork so it should be that. 20151020 09:29:28< shadowm> Some people might suggest using --all instead of naming individual branches. I don't advise that. I for one tend to have a lot of private branches I don't want published for one reason or another. 20151020 09:30:44< wedge009> Should I just redo the PR? 20151020 09:31:30< shadowm> You don't really need to since I can and have mostly rebased it locally, as I said. 20151020 09:32:42< wedge009> Okay, thanks. 20151020 09:44:38-!- Appleman1234 [~Appleman1@KD111239014036.au-net.ne.jp] has joined #wesnoth-dev 20151020 09:51:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 260 seconds] 20151020 09:54:26< wedge009> Well, my 1.12 branch is up-to-date now. Closing the gate after the horse has bolted. 20151020 10:13:56-!- joet [~joet@host86-163-218-88.range86-163.btcentralplus.com] has quit [Ping timeout: 272 seconds] 20151020 10:19:10-!- mjs-de [~mjs-de@f049068080.adsl.alicedsl.de] has joined #wesnoth-dev 20151020 10:24:22-!- zombah [~zombah@2a02:28:3:1:214:4fff:fe47:5920] has joined #wesnoth-dev 20151020 10:27:25-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20151020 10:35:29-!- joet [~joet@host86-163-218-88.range86-163.btcentralplus.com] has joined #wesnoth-dev 20151020 10:46:05-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 250 seconds] 20151020 11:09:42-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20151020 11:16:38-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20151020 11:19:28-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev 20151020 11:27:18-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20151020 11:34:29-!- gfgtdf [~chatzilla@f054156054.adsl.alicedsl.de] has joined #wesnoth-dev 20151020 11:34:53< gfgtdf> vultraz: your code still has these strnge static_casts in "units_[static_cast(selected_row)] ...." 20151020 11:35:32< gfgtdf> vultraz: also is there a reason forexplicitly speciifying 'play_controller' in resources::controller->play_controller::current_side() ? 20151020 11:41:56-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20151020 11:42:22< vultraz> I thought it was needed 20151020 11:42:34< vultraz> gfgtdf: should I remove the static casts? 20151020 11:42:47< gfgtdf> vultraz: yes 20151020 11:45:31< vultraz> seems I don't need the explicit play_controller:: 20151020 11:45:39< vultraz> callcall 20151020 11:45:41< vultraz> call* 20151020 11:47:30< vultraz> hm, ok in one case the static cast is still necessary 20151020 11:51:58-!- irker872 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20151020 11:51:58< irker872> wesnoth: Charles Dang wesnoth:master 33bfaf5ffc24 / src/gui/dialogs/unit_create.cpp: tunit_create: cleanup, mostly removing static_casts http://git.io/vWTP1 20151020 12:30:59-!- janebot_ [~Gambot@grickit.us] has quit [Remote host closed the connection] 20151020 12:31:06-!- janebot_ [~Gambot@grickit.us] has joined #wesnoth-dev 20151020 12:32:00-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 272 seconds] 20151020 12:46:47-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has joined #wesnoth-dev 20151020 12:46:47-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has quit [Changing host] 20151020 12:46:47-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20151020 12:58:33-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 256 seconds] 20151020 13:00:29-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has joined #wesnoth-dev 20151020 13:00:29-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has quit [Changing host] 20151020 13:00:29-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20151020 13:00:54-!- Elvish_Hunter [~elvish_hu@wesnoth/developer/elvish-hunter] has joined #wesnoth-dev 20151020 13:01:28< Elvish_Hunter> Hi all 20151020 13:04:12< irker872> wesnoth: Elvish_Hunter wesnoth:master 1a0d04d7b2ea / data/tools/GUI.pyw: GUI.pyw: fixed a bug that caused the output to not be printed on Windows http://git.io/vWkUn 20151020 13:04:14< irker872> wesnoth: Elvish_Hunter wesnoth:master 42ac2e0fe713 / data/tools/wmllint: wmllint: upgrade from optparse to argparse http://git.io/vWkUc 20151020 13:04:16< irker872> wesnoth: Elvish_Hunter wesnoth:master 2d4ef7a42d0e / data/tools/wmlscope: wmlscope: upgrade from optparse to argparse http://git.io/vWkUC 20151020 13:04:18< irker872> wesnoth: Elvish_Hunter wesnoth:master 491ba7924f40 / data/tools/wmlindent: wmlindent: upgrade from optparse to argparse http://git.io/vWkUW 20151020 13:04:20< irker872> wesnoth: Elvish_Hunter wesnoth:master e07de1bf48f3 / data/tools/GUI.pyw: GUI.pyw: fixed regexps not being handled correctly on non Windows systems http://git.io/vWkUl 20151020 13:05:00-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20151020 13:06:36< Elvish_Hunter> 20151019 02:49:10< shadowm> They've not stuck around as far as I can tell (Elvish_Hunter should be able to confirm). 20151020 13:08:04< Elvish_Hunter> You're right. After the discussion that happened in this thread (http://forums.wesnoth.org/viewtopic.php?f=2&t=42945) I didn't hear anything new. 20151020 13:08:45< Elvish_Hunter> If we exclude some additional messages in this channel, of course. 20151020 13:10:30< Elvish_Hunter> So, at the end I'm the one currently maintaining the main WML Python tools, and unfortunately I don't know Scons at all. 20151020 13:12:13-!- travis-ci [~travis-ci@ec2-54-226-65-27.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 13:12:14< travis-ci> wesnoth/wesnoth#7679 (master - 33bfaf5 : Charles Dang): The build has errored. 20151020 13:12:14< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86382203 20151020 13:12:14-!- travis-ci [~travis-ci@ec2-54-226-65-27.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 13:13:35< Elvish_Hunter> By the way: while moving the tools from optparse to argparse, I tried to be careful and to not break the current API. 20151020 13:14:15< Elvish_Hunter> If any of you finds a command line switch that worked before and now doesn't, please let me know. 20151020 13:17:53-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20151020 13:32:23-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 13:45:59< irker872> wesnoth: Charles Dang wesnoth:master cd9c23fea0dc / data/gui/default/window/unit_create.cfg src/gui/dialogs/unit_create.cpp: tunit_create: more minimal display of level http://git.io/vWkcD 20151020 13:46:42< vultraz> I moved it to an x-large sized label next to the race icon 20151020 13:46:49< vultraz> that says "L " 20151020 13:51:48-!- noy [~Noy@wesnoth/developer/noy] has quit [Read error: Connection reset by peer] 20151020 13:59:57-!- Elvish_Hunter [~elvish_hu@wesnoth/developer/elvish-hunter] has left #wesnoth-dev ["Ciao!"] 20151020 14:07:00-!- aquileia [863cae5e@gateway/web/freenode/ip.134.60.174.94] has joined #wesnoth-dev 20151020 14:08:08-!- TC01 [~quassel@london.acm.jhu.edu] has joined #wesnoth-dev 20151020 14:10:00< aquileia> loonycyborg, shadowm: Do I need to support major version patches in my script? I currently define Version_M as a constant (1.12, 1.13, ...) which would mean that the script can't produce e.g. a 1.12.4 -> 1.13.2 patch 20151020 14:10:44< aquileia> only 1.12.x -> 1.12.y or 1.13.x -> 1.13.y patches would be supported 20151020 14:12:07< aquileia> It might be an issue for the download patcher, though we could use a hack to generate such patches 20151020 14:12:21< aquileia> let me know, I'll read the logs 20151020 14:12:27-!- aquileia [863cae5e@gateway/web/freenode/ip.134.60.174.94] has quit [Quit: Page closed] 20151020 14:17:55-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev 20151020 14:18:09-!- juman [~quassel@x4d04f459.dyn.telefonica.de] has joined #wesnoth-dev 20151020 14:22:22< juman> hey all; I have implemented the concede button feature from the "easy coding" section on the wesnoth wiki. Can I just submit it via github or do I have to discuss something on the forums first as I have not submitted anything for wenoth so far? 20151020 14:26:13< vultraz> juman: just create a PR on github. We'll review it :) 20151020 14:26:19< vultraz> (PR = pull request) 20151020 14:26:52< juman> do I have to fully update my own repo before doing so? 20151020 14:29:47< vultraz> It would be optimal so you can make sure any marge conflicts be resolved 20151020 14:32:40-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Remote host closed the connection] 20151020 14:33:11-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20151020 14:36:35-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 14:39:46-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 268 seconds] 20151020 14:46:46-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc] 20151020 14:52:59-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20151020 14:55:34-!- travis-ci [~travis-ci@ec2-50-17-58-105.compute-1.amazonaws.com] has joined #wesnoth-dev 20151020 14:55:35< travis-ci> wesnoth/wesnoth#7681 (master - cd9c23f : Charles Dang): The build passed. 20151020 14:55:35< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/86401816 20151020 14:55:35-!- travis-ci [~travis-ci@ec2-50-17-58-105.compute-1.amazonaws.com] has left #wesnoth-dev [] 20151020 14:56:01-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20151020 14:57:41-!- Appleman1234 [~Appleman1@KD111239014036.au-net.ne.jp] has quit [Ping timeout: 268 seconds] 20151020 14:59:11-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20151020 15:01:45-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 250 seconds] 20151020 15:01:45-!- wedge010 is now known as wedge009 20151020 15:05:20< juman> ok I did a pull request I hope I didnt make a mess :P 20151020 15:05:40< celticminstrel> Let's see. 20151020 15:05:53< celticminstrel> You made a mess. :P 20151020 15:07:02< celticminstrel> ...a pretty big mess, too... o.O 20151020 15:08:34< celticminstrel> Um, why did you add a CodeBlocks project file when there was already one there? 20151020 15:08:34< juman> because of these strange added blanks? 20151020 15:08:42< celticminstrel> No, because of the project file. 20151020 15:08:52< juman> uhm damn I didnt do that on purpose 20151020 15:08:58-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20151020 15:09:02< juman> thought I deleted them from the commit 20151020 15:09:27< juman> damn shall I just do It again? 20151020 15:09:32< celticminstrel> How well do you understand git? 20151020 15:10:15< juman> from 1 to 10? maybe 4? :P 20151020 15:10:30< celticminstrel> Okay. 20151020 15:10:35< celticminstrel> I think you can fix this as follows. 20151020 15:10:42< celticminstrel> git reset cd9c23fea0dce685aefd68c6139222b6178a7e30 20151020 15:10:47< celticminstrel> Then redo the commit. 20151020 15:11:04< celticminstrel> The reset won't change any of your files, so you just have to re-commit what you've already got. 20151020 15:11:12< celticminstrel> Oh, but... 20151020 15:11:54< celticminstrel> White-space-only changes are something to avoid. 20151020 15:12:07< celticminstrel> How do you do your commits? Git gui? 20151020 15:12:29< juman> command line "git commit ..." 20151020 15:12:47< juman> and unfortunately I did git add ./src 20151020 15:12:47< celticminstrel> You used git add? Or git commit -a? 20151020 15:12:52< celticminstrel> Ah. 20151020 15:13:05< celticminstrel> If you're not sure you want to add everything, try git add -i 20151020 15:14:18< juman> does the git reset apply instantly? 20151020 15:14:46< celticminstrel> Yes. 20151020 15:14:57< celticminstrel> The last step once you've fixed it is git push --force 20151020 15:15:17< juman> and btw shall I change the theme for the commit, too? As you have to add a concede button to actually have one? 20151020 15:15:27< celticminstrel> Huh? 20151020 15:16:05< juman> As a user to be able to see and be able to press the button it has to be in some actual menu 20151020 15:16:05< celticminstrel> BTW, the commit message you had before isn't bad but might be better if you used a line break instead of the semicolon. 20151020 15:16:22< juman> okay 20151020 15:16:41< celticminstrel> As you might've noticed, it gets shortened on github. 20151020 15:17:06< celticminstrel> You should also address point 3 of what gfgtdf has said. 20151020 15:17:38< celticminstrel> You'll need to start two copies of Wesnoth to test that. 20151020 15:17:39< gfgtdf> iceiceice: online ? 20151020 15:18:19< juman> yes okay 20151020 15:18:52< gfgtdf> iceiceice: afaik your are the one who requested that feature (at least your are the one who edited the EasyCoding page) so maybe you have an option on https://github.com/wesnoth/wesnoth/pull/535 ? 20151020 15:36:52-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20151020 15:36:53-!- rayblade53 [~chatzilla@124.109.10.167] has joined #wesnoth-dev 20151020 15:37:13-!- rayblade53 [~chatzilla@124.109.10.167] has quit [Client Quit] 20151020 15:42:05-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20151020 15:42:11-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 264 seconds] 20151020 15:55:05-!- Appleman1234 [~Appleman1@KD106161083184.au-net.ne.jp] has joined #wesnoth-dev 20151020 15:56:01-!- juman [~quassel@x4d04f459.dyn.telefonica.de] has quit [Remote host closed the connection] 20151020 15:57:42-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20151020 16:17:02-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20151020 16:18:32-!- noy [~Noy@184.69.143.198] has joined #wesnoth-dev 20151020 16:18:33-!- noy [~Noy@184.69.143.198] has quit [Changing host] 20151020 16:18:33-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 16:25:39-!- louis94 [~~louis94@109.129.245.154] has joined #wesnoth-dev 20151020 16:30:10-!- Appleman1234 [~Appleman1@KD106161083184.au-net.ne.jp] has quit [Ping timeout: 265 seconds] 20151020 16:47:39-!- gfgtdf [~chatzilla@f054156054.adsl.alicedsl.de] has quit [Ping timeout: 240 seconds] 20151020 16:48:20-!- gfgtdf [~chatzilla@x55b11206.dyn.telefonica.de] has joined #wesnoth-dev 20151020 16:48:28-!- irker872 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20151020 16:49:42-!- gfgtdf_ [~chatzilla@x55b19ca2.dyn.telefonica.de] has joined #wesnoth-dev 20151020 16:52:25-!- gfgtdf [~chatzilla@x55b11206.dyn.telefonica.de] has quit [Ping timeout: 240 seconds] 20151020 16:52:37-!- gfgtdf_ is now known as gfgtdf 20151020 16:55:45-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20151020 17:26:41-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20151020 17:27:08-!- Appleman1234 [~Appleman1@KD118156240224.au-net.ne.jp] has joined #wesnoth-dev 20151020 17:34:47-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev 20151020 17:38:02-!- subliun [~quassel@unaffiliated/subliun] has quit [Ping timeout: 260 seconds] 20151020 17:39:12-!- subliun [~quassel@unaffiliated/subliun] has joined #wesnoth-dev 20151020 17:39:41-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20151020 17:43:59-!- louis94 [~~louis94@109.129.245.154] has quit [Ping timeout: 240 seconds] 20151020 17:49:41< iceiceice> gfgtdf: i looked at that PR 20151020 17:49:46< iceiceice> some things i saw 20151020 17:49:58< iceiceice> 1: tabs vs spaces issue in menu_events.cpp 20151020 17:50:32< iceiceice> 2: it makes it so that the defeat condition is changed when the user does a menu option, 20151020 17:50:43< iceiceice> so does it need to go into the replay somehow? 20151020 17:50:51< iceiceice> since the game state is being changed 20151020 17:51:00< iceiceice> 3: what about mp sync? 20151020 17:52:15< iceiceice> i think it shouldn't be merged yet 20151020 17:52:39< iceiceice> either there hsould be like, a separate "concede" path made in the server protocol or something 20151020 17:52:45< iceiceice> so that poeple can concede without changing the game state 20151020 17:53:05< iceiceice> or all that sync stuff should be taken care of 20151020 17:53:36< iceiceice> iirc the main reason we wanted a "concede" button is to make statistical study of the server game history easier 20151020 17:54:12< iceiceice> so really it would be enough for "Concede" button to cause the user to chat "I concede!" and then leave the game 20151020 17:54:30< iceiceice> or something like that 20151020 17:54:35< iceiceice> any kind of marker so that we know the button was pressed 20151020 17:55:21-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 252 seconds] 20151020 17:55:22< iceiceice> i consider it up to you though :) 20151020 18:18:51-!- vifon [~vifon@bohdan.wu-be.de] has quit [Quit: WeeChat 0.4.3] 20151020 18:19:06-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20151020 18:34:31-!- irker662 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20151020 18:34:31< irker662> wesnoth: Charles Dang wesnoth:master d3e04c65d6c3 / src/gui/dialogs/unit_create.cpp: tunit_create: add attack details to type summary http://git.io/vWLqD 20151020 18:37:00< gfgtdf> iceiceice: the mien reason why i asked you is that it currently possible to do the ver same that he did in wml, so i wonder whether we still need that as a engine feature. But if you say this is not rally a feature for the 'players' but for the replay analysers it might make sense to do so to motivate people to actually use it 20151020 18:49:40< iceiceice> yeah i mean, i think wintermute probably has some opinion on it iirc 20151020 18:49:52< iceiceice> or, he was the one involved in the projects to look at / use the stats 20151020 18:52:42-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20151020 18:59:30-!- louis94 [~~louis94@109.129.245.154] has joined #wesnoth-dev 20151020 19:02:09-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20151020 19:06:27-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20151020 19:08:28< shadowm> aquileia: Hard to say. In general, when it comes to the full package, people shouldn't expect to be able to upgrade between branches without losing data or features (including access to add-ons). That's not because of packaging reasons, but rather because of our coding practices. 20151020 19:09:04-!- zombah [~zombah@2a02:28:3:1:214:4fff:fe47:5920] has quit [Quit: Leaving] 20151020 19:12:07< shadowm> Factor in patch upgrades and the same principle still applies, so perhaps there's no point in providing the possibility to upgrade between branches without requiring people to do the full download and choose a new install location to keep the old version around -- this so that if they face any issues with the new series it won't prove too disruptive (I always recommend people to keep both stable and development installed rather than ... 20151020 19:12:13< shadowm> ... replace stable with dev). 20151020 19:14:21-!- Appleman1234 [~Appleman1@KD118156240224.au-net.ne.jp] has quit [Ping timeout: 255 seconds] 20151020 19:19:11-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20151020 19:29:33< irker662> wesnoth: Charles Dang wesnoth:master b8937db177e7 / src/gui/dialogs/unit_create.cpp: tunit_create: rearranged HP/XP/MP stats http://git.io/vWL2Z 20151020 19:32:49-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 19:37:06-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 244 seconds] 20151020 19:41:58-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 19:46:18-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 240 seconds] 20151020 20:01:58< vultraz> belgh 20151020 20:02:06< vultraz> can't get these traits to show UP :( 20151020 20:05:36< gfgtdf> vultraz: whats the probem ? 20151020 20:06:01< vultraz> gfgtdf: trying to figure out how to get the traits a unit type haz 20151020 20:06:03< vultraz> has* 20151020 20:07:10< gfgtdf> vultraz: the unit_type class has a memeber function possible_traits() 20151020 20:07:24< gfgtdf> but do you really need it ? 20151020 20:08:03-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20151020 20:08:39< vultraz> I'm trying this http://pastebin.com/DitqWSWc based on dialogs.cpp:1394 20151020 20:09:10< gfgtdf> vultraz: i thought the usual unit debug dialog doesnt show the traits eigher ? 20151020 20:09:20< vultraz> it does 20151020 20:09:28< gfgtdf> ah only musthaev traits 20151020 20:10:30< vultraz> yes 20151020 20:10:49< gfgtdf> vultraz: hmm the code looks correct to me 20151020 20:11:45< gfgtdf> wee there recntly some chnages to the wml menu ? my wml menu looks strange now :s 20151020 20:11:55< vultraz> yes 20151020 20:12:11< vultraz> we removed some items and moved others to Actions 20151020 20:13:12< gfgtdf> vultraz: i meant ragarding the defalut item, i see the default "image not found" item in teh ml menu which looks ver ybad becasue its too bg (72x72 i think) 20151020 20:13:41< vultraz> default item? 20151020 20:14:02< gfgtdf> icon* 20151020 20:15:12< vultraz> do you mean the right click menu? 20151020 20:15:24< gfgtdf> yes 20151020 20:15:51< vultraz> there shouldn't be images there... 20151020 20:17:40< vultraz> Ok I think I figured the problem out 20151020 20:18:01< vultraz> yup 20151020 20:18:06< vultraz> I was building HELP_INDEXED 20151020 20:18:19< vultraz> but I needed tobuild the units with WITHOUT_ANIMATIONS 20151020 20:21:59< vultraz> gfgtdf: final question: is there any way to determine whether possible_traits() has anything or not ? since it's an iterator I can't just say .empty() 20151020 20:22:57< gfgtdf> vultraz: well you coudl have a bool has_traits = false; which you set to traue inside the loop 20151020 20:23:18< vultraz> hm ok 20151020 20:23:23< vultraz> that's simple 20151020 20:23:47-!- louis94 [~~louis94@109.129.245.154] has quit [Ping timeout: 246 seconds] 20151020 20:26:22< shadowm> vultraz: It's an iterator pair, not a single iterator. Check whether both iterators equal each other. 20151020 20:26:35< shadowm> If they do it means the iterator pair represents an empty range. 20151020 20:26:58< celticminstrel> I'm sure I've mentioned this before. :/ 20151020 20:27:30< shadowm> (In general, if foo.begin() == foo.end() for any foo that is a STL or STL-compatible container, it means the container is empty. foo.empty() should be preferred where available, of course.) 20151020 20:29:24< shadowm> This is extremely important basic stuff you need to learn in C++. 20151020 20:29:54< vultraz> well, obviously 20151020 20:30:47< gfgtdf> vultraz: i'd actualyl prefer the the boolen varaible in the loop becase then the code will still work when the returntype of possible_traits() changes (for example to a const std::vector& or something). 20151020 20:31:46< shadowm> Except odds are a lot of existing code would break anyway. 20151020 20:32:15< shadowm> src/unit_types.cpp: config::const_child_itors t = possible_traits(); 20151020 20:32:21< shadowm> src/help/help_topic_generators.cpp: config::const_child_itors traits = type_.possible_traits(); 20151020 20:33:06< shadowm> Not a lot but enough for the coder to have to go and fix it. 20151020 20:35:12< shadowm> gfgtdf: Exactly where does the image not found placeholder come up in the context menu? (Need to be in debug mode for that to show but we don't want incorrect image references around regardless.) 20151020 20:35:13< gfgtdf> shadowm: i wondder whether it makes sense to change config::const_child_itors from std::pair to a boost::iterator_range type 20151020 20:35:35< shadowm> For example, the test scenario's context menu seems clean to me. 20151020 20:35:36< gfgtdf> shadowm: i already tested that issue and it seems to behave teh same in 1.12 20151020 20:35:55< gfgtdf> shadowm: custom wml contest menu ([set_menu_item]) 20151020 20:35:57< shadowm> Is it an add-on then? You'd want to complain to the author. 20151020 20:37:26< shadowm> I wonder btw if there's a single person in the team that has tried to use a touchscreen with Wesnoth. 20151020 20:38:04< vultraz> blagh I'm doing it wrong 20151020 20:38:19< shadowm> I.e. how good or bad is the touchscreen experience. 20151020 20:38:28< shadowm> With Wesnoth, specifically. 20151020 20:38:33< gfgtdf> shadowm: its was testing code from a bug report iirr 20151020 20:38:48< shadowm> IIRR? 20151020 20:38:53< gfgtdf> iirc* 20151020 20:38:59< vultraz> if i remember right 20151020 20:41:03< vultraz> oh, actually, I can't take this method since I want to then filter the results for musthave later... 20151020 20:41:06< vultraz> bleh 20151020 20:41:08< vultraz> bool it is 20151020 20:42:00< vultraz> or I could add a function to unit_type 20151020 20:44:18< celticminstrel> Why is a bool bleh? 20151020 20:44:35< celticminstrel> It seems a perfectly logical solution to me. 20151020 20:46:06< vultraz> no, bleh that the iterator solution can't work 20151020 20:51:49-!- louis94 [~~louis94@109.129.245.154] has joined #wesnoth-dev 20151020 20:56:43-!- vincent_c [~bip@vcheng.org] has quit [Remote host closed the connection] 20151020 20:57:30-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20151020 20:57:39< irker662> wesnoth: Charles Dang wesnoth:master f8ca1e96bc7c / src/gui/dialogs/unit_create.cpp: tunit_create: add trait and ability info http://git.io/vWLhK 20151020 20:57:49< vultraz> OK 20151020 20:58:01< vultraz> that populates the details panel 20151020 20:58:31< vultraz> shadowm, celticminstrel ^ column resize issues aside, would like feedback on final design 20151020 21:05:03-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev 20151020 21:06:07 * vultraz will return later 20151020 21:13:38-!- vincent_c [~bip@vcheng.org] has joined #wesnoth-dev 20151020 21:32:02-!- louis94 [~~louis94@109.129.245.154] has quit [Quit: Konversation terminated!] 20151020 21:32:21-!- louis94 [~~louis94@109.129.245.154] has joined #wesnoth-dev 20151020 21:39:47-!- daMark [5439aa5b@gateway/web/freenode/ip.84.57.170.91] has joined #wesnoth-dev 20151020 21:43:20< loonycyborg> aquileia:I'd say patches between stable and dev aren't very useful because those are diverging branches. 20151020 21:44:50< loonycyborg> mostly people would want to update between minor releases 20151020 21:45:33< loonycyborg> and if someone wants to try dev branch they'll install it side by side with stable 20151020 21:46:48-!- gfgtdf [~chatzilla@x55b19ca2.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 41.0.2/20151014143721]] 20151020 21:46:55< loonycyborg> you could provide separate patches between .0 versions of different branches 20151020 21:47:39< loonycyborg> then people if they wish to change branches could undo their minor version patch and apply branch patches 20151020 21:47:57< loonycyborg> if they absolutely don't want to download full versions 20151020 21:48:24< loonycyborg> but not sure if it'll actually save any bandwidth :P 20151020 21:48:48-!- fabi [~quassel@176.0.104.29] has joined #wesnoth-dev 20151020 21:48:48-!- fabi [~quassel@176.0.104.29] has quit [Changing host] 20151020 21:48:48-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20151020 21:54:10-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 250 seconds] 20151020 21:54:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20151020 22:06:00< Aginor> happy future day everyone 20151020 22:08:58-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Read error: Connection reset by peer] 20151020 22:09:36-!- daMark [5439aa5b@gateway/web/freenode/ip.84.57.170.91] has left #wesnoth-dev [] 20151020 22:09:45-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has joined #wesnoth-dev 20151020 22:17:03-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Ping timeout: 255 seconds] 20151020 22:30:01-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20151020 22:35:36-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20151020 22:38:35-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20151020 22:39:01-!- IlMago [~IlMago@2602:306:c51d:a6a0:2583:61f1:9a55:151f] has joined #wesnoth-dev 20151020 22:39:38-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 260 seconds] 20151020 22:39:53-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20151020 22:43:01-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20151020 22:50:46-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 272 seconds] 20151020 22:52:36-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20151020 23:01:59-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 264 seconds] 20151020 23:19:59< shadowm> vultraz: Is the intention to use Create Unit as a staging area for a new unit preview pane design? 20151020 23:30:39-!- IlMago [~IlMago@2602:306:c51d:a6a0:2583:61f1:9a55:151f] has quit [Ping timeout: 240 seconds] 20151020 23:32:01-!- Appleman1234 [~Appleman1@KD106161083237.au-net.ne.jp] has joined #wesnoth-dev 20151020 23:57:51-!- irker662 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] --- Log closed Wed Oct 21 00:00:27 2015