--- Log opened Wed Aug 19 00:00:16 2015 20150819 00:01:28-!- BeoXTC_ [3eb2b12a@gateway/web/cgi-irc/kiwiirc.com/ip.62.178.177.42] has joined #wesnoth-dev 20150819 00:08:58-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150819 00:11:11< BeoXTC_> travis script helped me to find all the libraries to compile wesnoth 20150819 00:11:15-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 256 seconds] 20150819 00:11:15-!- wedge010 is now known as wedge009 20150819 00:18:56< BeoXTC_> actually I found another place where it is described: http://wiki.wesnoth.org/CompilingWesnoth 20150819 00:19:01< BeoXTC_> sudo apt-get build-dep wesnoth 20150819 00:29:08< shadowm> celticminstrel: Re PR #465, no love for UtBS? 20150819 00:29:56< celticminstrel> Mostly lazy and/or unsure where to find the relevant code. 20150819 00:30:11< shadowm> Somewhere in Kaleh's unit type definition or utils/ IIRC. 20150819 00:30:30< shadowm> data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg first macro. 20150819 00:30:48-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150819 00:32:22< celticminstrel> (Also, I've played Dead Water but not UtBS, so I didn't actually know where UtBS used it.) 20150819 00:33:55-!- jcnewjersey [~jcnewjers@pool-108-35-38-39.nwrknj.fios.verizon.net] has quit [Ping timeout: 256 seconds] 20150819 00:34:00-!- jcnewjersey1 [~jcnewjers@pool-108-35-38-39.nwrknj.fios.verizon.net] has joined #wesnoth-dev 20150819 00:35:26-!- irker804 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150819 00:35:26< irker804> wesnoth: Celtic Minstrel wesnoth:master 3564b8846081 / src/ (game_events/action_wml.cpp unit_display.cpp): Add female_text= to [unstore_unit] and [animate_unit] http://git.io/vsLhW 20150819 00:35:26< irker804> wesnoth: Celtic Minstrel wesnoth:master 766f3a7701eb / changelog src/game_events/action_wml.cpp src/unit_display.cpp: Fix up female_text= especially in [unstore_unit], update changelog http://git.io/vsLhl 20150819 00:35:26< irker804> wesnoth: Celtic Minstrel wesnoth:master 001fcdcd890a / data/campaigns/Dead_Water/units/Brawler.cfg: Update DW to use new female_text= feature for stun special http://git.io/vsLh8 20150819 00:35:27< irker804> wesnoth: Ignacio R. Morelle wesnoth:master a0268c7ccc42 / / (4 files in 4 dirs): Merge branch 'female_text' of https://github.com/CelticMinstrel/wesnoth into sta http://git.io/vsLh4 20150819 00:35:29< irker804> wesnoth: Ignacio R. Morelle wesnoth:master 5216c544fe30 / / (4 files in 4 dirs): Merge branch 'staging/pr-465' http://git.io/vsLhR 20150819 00:36:08< celticminstrel> ...I just pushed the UtBS fix right now. >_> 20150819 00:37:07< BeoXTC_> how long does it take you to _make_ wesnoth? 20150819 00:37:53< shadowm> BeoXTC_: With -j8 on my desktop it's around 5 minutes. 20150819 00:38:04< celticminstrel> Do I need to make a new pull request for that one commit? 20150819 00:38:23< irker804> wesnoth: Charles Dang wesnoth:master 4e682dd31e67 / data/campaigns/Legend_of_Wesmere/units/Great_Ogre.cfg: LoW: drop unnecessary small_profile key http://git.io/vsLjL 20150819 00:38:24< vultraz> celticminstrel: just pastebin the diff 20150819 00:38:24< shadowm> celticminstrel: No, not really. I can import the patch directly if you prefer. 20150819 00:38:32< shadowm> No need to pastebin it: https://github.com/wesnoth/wesnoth/commit/70e1cf5932d530689bbcb75ec4033ea69dc722b1.patch 20150819 00:38:33< BeoXTC_> thx shadowm 20150819 00:38:39< vultraz> Or that 20150819 00:39:28< celticminstrel> I had no idea github had a way to generate patchfiles like that. I would've just pulled directly from the contributer's repo. 20150819 00:39:31< irker804> wesnoth: Celtic Minstrel wesnoth:master deb1cfbd4766 / data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg: Update UtBS to use new female_text= feature for stun special http://git.io/vsLju 20150819 00:39:47< BeoXTC_> +1 for pull 20150819 00:39:58< shadowm> Or I could've done that too yes. 20150819 00:40:21< celticminstrel> Interesting, the patch retained the author information somehow. 20150819 00:40:46< BeoXTC_> From 70e1cf5932d530689bbcb75ec4033ea69dc722b1 Mon Sep 17 00:00:00 2001 20150819 00:40:46< BeoXTC_> From: Celtic Minstrel 20150819 00:40:47< shadowm> Authr != committer. 20150819 00:40:54< celticminstrel> I know that. 20150819 00:41:03-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has left #wesnoth-dev [] 20150819 00:41:17-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev 20150819 00:41:23< celticminstrel> Whoops. 20150819 00:44:17< shadowm> celticminstrel: There's a few if control blocks without braces in #463. 20150819 00:44:57< shadowm> Also, uh: `desc << increase_movement << _(" movement points");`. 20150819 00:45:21< celticminstrel> There was some copy-pasting of code in that commit, but I can certainly fix the style issues if you want me to. 20150819 00:46:06< celticminstrel> I should use _n for that line, I guess? 20150819 00:46:21< celticminstrel> (Much like I did in the previous block.) 20150819 00:46:40< shadowm> I'm trying to understand the context but using gettext plurals is an excellent idea wherever possible, yes. 20150819 00:47:11< shadowm> More to the point, though, translators may overlook leading/trailing space. 20150819 00:47:15< celticminstrel> The context? That's to alter the number of movement points an attack consumes (usually it consumes all of them). 20150819 00:48:01< shadowm> So any leading or trailing space should preferably be non-translatable. 20150819 00:48:39< shadowm> However, in this case the string is supposed to be built into a larger context... 20150819 00:48:40< celticminstrel> Somehow all my branch-changing broke XCode. 20150819 00:49:03< celticminstrel> Had to reopen the project. 20150819 00:49:07< shadowm> We use vgettext/interpolate_variables_into_string for this purpose most of the time. 20150819 00:49:21< shadowm> That way translators can reorder the parameters if needed. 20150819 00:49:49< celticminstrel> You haven't done that in any of the similar cases though. :/ 20150819 00:49:52< shadowm> For example, src/addon/manager_ui.cpp line 361. 20150819 00:50:18< shadowm> Yes, we probably should switch to that later. 20150819 00:50:42< shadowm> But for the time being, there's the leading space issue you can deal with. 20150819 00:51:11< shadowm> Also, you don't need the "xgettext:no-c-format" magic comment unless the string includes % signs (which are part of the printf(2) syntax). 20150819 00:51:18< shadowm> *3 20150819 00:51:24< celticminstrel> Yeah, I noticed one just now and removed it. 20150819 00:51:36< celticminstrel> That was a relic of copy-pasting the parry/accuracy block. >_> 20150819 00:53:19< shadowm> The max_attacks apply_to handler in unit.cpp looks like it could use plurals too. 20150819 00:54:46< celticminstrel> That's using N_() instead of _(), does that make a difference? 20150819 00:55:31< vultraz> the former is no translate, I believe 20150819 00:55:34-!- Appleman1234 [~Appleman1@KD036012015184.au-net.ne.jp] has joined #wesnoth-dev 20150819 00:55:46< shadowm> N_() is a macro that marks a string for the extractor that generates catalogues (xgettext) but doesn't call gettext at runtime. In this case this seems to be desired because these strings are being built using t_string directly. 20150819 00:56:18-!- gandaro [~gandaro@wikipedia/Gorlingor] has quit [Quit: Leaving] 20150819 00:56:36< shadowm> I assume whoever first wrote this code knew what they were doing, because I'm not well versed on t_string's internals. 20150819 00:56:48< celticminstrel> I don't know how to add plurals then... 20150819 00:57:55< celticminstrel> I think "+1 max attacks" makes sense though, maybe? 20150819 00:58:10< shadowm> Hm. 20150819 00:58:25< vultraz> strikes? 20150819 00:58:43< celticminstrel> I think strikes usually refers to the 5 in 3-5. 20150819 00:58:51< celticminstrel> This is something different. 20150819 00:58:55< shadowm> You can use two separate cases. 20150819 00:59:09< celticminstrel> It lets you attack two different units in one turn. 20150819 00:59:12< celticminstrel> Okay, sure. 20150819 00:59:49< shadowm> const char* const text = foo ? N_("singular") : N_("plural"); 20150819 01:00:03< shadowm> I'd rather not pass the ternary op statement to t_string's constructor directly, though. 20150819 01:00:13-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has joined #wesnoth-dev 20150819 01:00:24< shadowm> We had a memory corruption bug involving that kind of construct in the past. 20150819 01:00:29< celticminstrel> If it's a percentage, should I use the plural? 20150819 01:00:38< pydsigner> I think "+1 max attacks" makes sense though, maybe 20150819 01:00:48< pydsigner> Hmmmmm 20150819 01:01:01< shadowm> Percentage? Uh. 20150819 01:01:30< celticminstrel> It's using apply_modifier, so it could be a percentage. 20150819 01:01:35< shadowm> I don't know, but I guess yes? 20150819 01:01:41< celticminstrel> Okay. 20150819 01:02:26< shadowm> vultraz: #462 needs a changelog entry. 20150819 01:02:36< pydsigner> Would the text for max_hitpoints be "max hitpoints" or "hitpoints"? 20150819 01:02:58< shadowm> Do we use 'max' in the UI? 20150819 01:03:23< celticminstrel> It's just HP for hitpoints. 20150819 01:03:27< shadowm> "Trait: resilient +4 HP and +1 HP per level" 20150819 01:04:03< pydsigner> Herm 20150819 01:04:18< shadowm> "Trait: quick +1 moves and 5% HP" 20150819 01:04:55< pydsigner> There really isn't much precedent for usage of max attacks 20150819 01:05:36< celticminstrel> I misspoke in-channel, the commit uses "attacks per turn". 20150819 01:05:36< shadowm> I appear to have ended up with a campaignd instance detached from any console. 20150819 01:05:43< celticminstrel> In which case +1 does need a singular. 20150819 01:06:09< pydsigner> since it is almost exclusively used for debugging 20150819 01:06:11< vultraz> shadowm: done 20150819 01:06:28< shadowm> vultraz: Just did a quick test, looks good to me. 20150819 01:06:45< shadowm> Merge away. 20150819 01:07:58< shadowm> pydsigner: Surely one of those add-ons with ludicrously OP units uses that. 20150819 01:08:19< shadowm> OTOH the whole point of the PR is that it wasn't doable with [effect] (traits, AMLAs, items) before. 20150819 01:08:38< irker804> wesnoth: Charles Dang wesnoth:master ee549394ed7c / src/addon/ (state.cpp state.hpp): Record remote addon version when fetching tracking info http://git.io/vstkT 20150819 01:08:41< irker804> wesnoth: Charles Dang wesnoth:master ad127d662f64 / src/addon/manager_ui.cpp: Validate whether addon version to upload is greater than its remote version http://git.io/vstkk 20150819 01:08:44< irker804> wesnoth: Charles Dang wesnoth:master d51ba383d4da / changelog: Changelog entry for addon version validation http://git.io/vstkI 20150819 01:08:47< irker804> wesnoth: Charles Dang wesnoth:master c3c0c9c2fdae / changelog src/addon/manager_ui.cpp src/addon/state.cpp src/addon/state.hpp: Merge pull request #462 from Vultraz/addon_version_validation http://git.io/vstkL 20150819 01:09:13< pydsigner> shadowm: I don't know of any instance 20150819 01:09:37< celticminstrel> It's possible in the unit_type but wasn't supported by effect. 20150819 01:10:10< celticminstrel> I don't know of any add-on that actually has units with multiple attacks though. 20150819 01:10:22< pydsigner> Essentially, those add-ons have always used events 20150819 01:10:42< shadowm> attacks_left > 2 was also broken before 1.11.x or 1.9.x IIRC. 20150819 01:11:11< celticminstrel> Maybe they were written before attacks_left existed? I dunno. Or they're based on things that are that old and haven't been updated to use new features. 20150819 01:11:29< pydsigner> and returned movement/attack based on the result of a battle 20150819 01:11:55< celticminstrel> Style/plural changes pushed. 20150819 01:12:01< shadowm> There certainly is a lot of code floating around based on misconceptions or missing features. 20150819 01:12:16< shadowm> [+units] comes to mind. 20150819 01:12:42< celticminstrel> Is that one a missing feature or a misconception? 20150819 01:12:56< shadowm> Misconception. 20150819 01:13:01< celticminstrel> How so? 20150819 01:13:47< shadowm> Many people (including me) use [+units] to deliver their add-on's [unit_type] definitions. This does not achieve anything that plain [units] wouldn't as well. 20150819 01:14:12< celticminstrel> Ahh... so the game will read multiple [units] tags? 20150819 01:14:51< shadowm> Yes. 20150819 01:15:41< pydsigner> >< 20150819 01:16:00< shadowm> It automatically merges them into a single node that's passed to the unit types code, so there's no need to use the continuation tag syntax for this. And (IIRC, don't quote me on this part) there usually isn't a previous [units] tag to extend anyway because the mainline units are processed in a different context. 20150819 01:16:25< shadowm> That is, unless you are working in MP mode with several add-ons adding to the unit type set. 20150819 01:16:27< vultraz> So... why do we do it 20150819 01:16:45< shadowm> It's likely this wasn't always the case, probably circa 1.0. 20150819 01:16:49< pydsigner> Because tradition? 20150819 01:18:00< shadowm> It's likely the habit may have resulted from standard practice in the early days of user-made campaigns, before MP mode became a thing. 20150819 01:19:43< shadowm> As the add-on ecosystem has grown, Wesnoth has had to figure out new ways to force everyone to play nice with each other. 20150819 01:20:23-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150819 01:21:38-!- BeoXTC_ [3eb2b12a@gateway/web/cgi-irc/kiwiirc.com/ip.62.178.177.42] has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client] 20150819 01:33:37< celticminstrel> I know there's some demand for a foreach loop iterating through WML arrays, but what about a foreach loop iterating through keys in a WML container variable? 20150819 01:35:04< shadowm> WML attributes are always stored in lexicographical order. What would the purpose be? 20150819 01:35:15< celticminstrel> I'm not sure. 20150819 01:36:13< celticminstrel> In theory you could probably think of a WML container variable as a dictionary/map, but I dunno if anyone actually uses them like that. 20150819 01:39:32< shadowm> I think most WML people are content with simpler approaches. 20150819 01:40:02< celticminstrel> Most of the time I think WML containers are used more like structs. 20150819 01:40:14 * celticminstrel nods. 20150819 01:40:19< celticminstrel> Okay then. 20150819 01:42:04< shadowm> I mean that people usually know exactly what they are looking for in a WML node and don't need to go over every attribute. 20150819 01:42:28< celticminstrel> That's kinda what I meant by "using them like structs", I guess. 20150819 01:43:00< shadowm> I believe that walking over the attribute set can be done with Lua already, so if you want to add such a thing... otherwise I personally wouldn't spend any time on it. 20150819 01:43:18< shadowm> (Unless zookeeper or vultraz have a concrete use case in mind.) 20150819 01:43:32< celticminstrel> I guess the few people who do want it can probably manage to use Lua to do it. 20150819 01:43:43< celticminstrel> (If those few people even exist.) 20150819 01:44:37< celticminstrel> Is there any point in having a clear_variable tag in a foreach loop that empties the array after iterating? Elvish_Hunter's version has that and I don't it makes much sense. 20150819 01:45:24< shadowm> The array as in the array we just iterated over? 20150819 01:45:30< celticminstrel> Yes. 20150819 01:46:20< shadowm> Uh, you mean as in an optional boolean attribute to a potential [foreach] tag? Otherwise  20150819 01:46:25< shadowm> *? 20150819 01:46:31< celticminstrel> Yes. 20150819 01:46:44< shadowm> No, there isn't. That reeks of featuritis. 20150819 01:47:08< shadowm> If someone wants to clear the array after the loop then they should be perfectly able to do so by hand. 20150819 01:47:45< pydsigner> ^ 20150819 01:48:07< shadowm> Every WML action should do one thing and only one thing right. (Insert link to the Unix philosophy here.) 20150819 01:48:55< celticminstrel> What about a boolean key that determines whether the $this_item variable is a reference or a copy? (I was thinking of readonly=) 20150819 01:55:37< shadowm> How would a reference be implemented? 20150819 01:56:00< celticminstrel> It'd copy changes back to the array at the end of the loop. 20150819 01:56:36-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20150819 01:56:40< pydsigner> Not recommended 20150819 01:56:44< shadowm> Okay, so it'd be a copy either way and the only difference is whether it's copied back to the real thing? 20150819 01:57:00< celticminstrel> Yeah, basically. 20150819 01:58:30< shadowm> There is a way to do "references" and I've used it in my own code. `$$foo|.bar` where $foo is a string value like `bar[4]`. 20150819 01:59:10< shadowm> It's ugly but effective. 20150819 01:59:35< celticminstrel> Hmm. 20150819 01:59:54< celticminstrel> Now I'm not sure what to do. I guess I'll think on it. 20150819 02:00:02< celticminstrel> Also, one more comment before I disappear for food: 20150819 02:00:07< celticminstrel> Some people seem to consider the inability to modify the array during iteration (by which I mean inserting or deleting elements) to be a requirement, but I'm not sure it can be done. No foreach loop I know of allows it. (C++/Java range-for, Python/Lua/JavaScript for-in, PHP foreach loop...) 20150819 02:00:08< shadowm> Another problem to consider is nested loops. 20150819 02:00:23< celticminstrel> Yes, the $this_item variable is customizable. I just used it by way of example. 20150819 02:00:56< mattsc> celticminstrel: umm, I tried PR464 and … it’s strange 20150819 02:00:57< shadowm> The *ability* to modify it, you mean? 20150819 02:01:05< mattsc> Hi, btw 20150819 02:01:38< mattsc> It copies the translations just fine, but when I run Wesnoth, it crashes at the same place where it crashes when the pango versions are mismatched. 20150819 02:01:58< mattsc> No idea how that is possible. 20150819 02:02:56< mattsc> The other strange thing is that your “Fetch Mac OS X version instead of Darwin version” commit from a couple days is included for me if I get the PR through the github app (but only that) 20150819 02:03:07< mattsc> But even with that, I have no idea how that would cause that crash. 20150819 02:03:38< mattsc> Anyways, looks like you have disappeared for food. I’ll be here on and off throughout the evening. 20150819 02:03:57< shadowm> The notion of modifying a container that's being iterated on isn't compatible with an opaque range iteration pattern, no. 20150819 02:04:58< shadowm> Even with a more transparent pattern like a subscript or iterator loop it's an easy way to shoot yourself in the foot, so only people who know what they are doing should do it -- both in WML and C++. 20150819 02:06:12< shadowm> So I really don't believe a prospective [foreach] tag should support that. Also, in hindsight the {FOREACH} name is a little bit unfortunate in that regard. 20150819 02:07:48< shadowm> Basically, if people want it, they should deal with the nitty-gritty by themselves and take full responsibility for any mistakes in their code rather than come back yelling at us. 20150819 02:15:37-!- katalia369 [467a77ae@gateway/web/freenode/ip.70.122.119.174] has joined #wesnoth-dev 20150819 02:15:47< katalia369> 'allo 20150819 02:16:00< shadowm> Hi there. 20150819 02:16:36< katalia369> how's it going shadowm 20150819 02:27:11< shadowm> Eh, same as usual. 20150819 02:27:45< shadowm> Except I seem to spend more time looking at other people's code than writing my own and that's a little disconcerting. 20150819 02:32:26< katalia369> i think i understand 20150819 02:33:04< katalia369> right about the time i found out i am better than the average bear at grammar and began to copy edit and quit writing my short stories 20150819 02:36:00< katalia369> right now i am just keeping this open in one widow, wesnoth in another, and trying to find a new mask on a third 20150819 02:36:20< shadowm> Mask? 20150819 02:36:47< katalia369> i want to build this etsy store for fashion art of mine up into something that at least supports its own cost 20150819 02:37:32< katalia369> so i made a seperate facebook off a second email and took out a blog on tumblr...i can say things more freely in accounts NOT connected to the volunteer boy scout mom, mother of five 20150819 02:37:57< katalia369> so to build this artist persona up on the net and sell my wares, a Mask for vids and pictures 20150819 02:38:09< katalia369> decor it in Kat style 20150819 02:54:42< celticminstrel> Yeah, the ability to modify it. I started rephrasing it halfway through and missed that. 20150819 02:54:50< celticminstrel> mattsc: Uh, that's... weird... 20150819 02:55:47< mattsc> celticminstrel: indeed. I’ve done some more test to make sure that it is not a problem with the translations folder itself somehow, but it is not 20150819 02:56:31< mattsc> It works (defined as: doesn’t crash) with or without translations for master, and crashes with and without translations for your PR. 20150819 02:57:15< mattsc> celticminstrel: the only thing I can think of is that it is based on a different Xcode project file version and that somehow the “magic numbers” in your changes don’t work out. 20150819 02:57:38< celticminstrel> The only change I made was adding a shellscript build phase. 20150819 02:57:45< mattsc> I did change the pango modules recently, possibly after the version on which you based this. 20150819 02:58:06< mattsc> Yes, but you pulled it out of a PR that you started possibly before I made the pango changes? 20150819 02:58:11< celticminstrel> Possibly. 20150819 02:58:29< mattsc> I don’t know how that would cause this crash, but I cannot come up with anything else 20150819 02:59:24< mattsc> I see two options: you start another PR from current master and make those changes again; or you tell me what to change and I enter it manually in my Xcode 20150819 02:59:40< mattsc> Either way might or might not work and will maybe tell us something. 20150819 03:00:01< mattsc> Anyways, I need to be off for a while right now; not sure yet if I’ll be back for more than a few minutes later tonight. 20150819 03:02:29 * celticminstrel fixes the problem that forces me to recompile everything when checking out a different branch. 20150819 03:02:40< celticminstrel> (Not a fix worth pushing, probably.) 20150819 03:03:17< celticminstrel> I think it's actually a bug in my old clang. 20150819 03:04:10-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev 20150819 03:04:10-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host] 20150819 03:04:10-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150819 03:05:43-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has quit [Quit: Connection closed for inactivity] 20150819 03:08:45-!- katalia369 [467a77ae@gateway/web/freenode/ip.70.122.119.174] has quit [Quit: Page closed] 20150819 03:14:56-!- legoktm [~quassel@wikipedia/Legoktm] has quit [Quit: No Ping reply in 180 seconds.] 20150819 03:18:06-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 272 seconds] 20150819 03:19:32-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150819 03:20:54-!- legoktm [~quassel@2604:a880:800:10::1c2:b001] has joined #wesnoth-dev 20150819 03:21:18-!- legoktm is now known as Guest69082 20150819 03:26:19-!- EliDupree_ [~quassel@2604:a880:800:10::99a:2001] has quit [Quit: No Ping reply in 180 seconds.] 20150819 03:27:59-!- EliDupree [~quassel@2604:a880:800:10::99a:2001] has joined #wesnoth-dev 20150819 03:30:49-!- [Relic] [~Relic]@2602:306:33a3:6d30:9ce6:2e9a:5b6e:1f8] has quit [Quit: I press the magic X and all the weirdos go away!] 20150819 03:39:48-!- nemaara [~nemaara@2601:40a:8204:4716:a12a:bc4f:9bf1:aacd] has joined #wesnoth-dev 20150819 03:42:29-!- nemaara [~nemaara@2601:40a:8204:4716:a12a:bc4f:9bf1:aacd] has left #wesnoth-dev [] 20150819 03:57:11-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Quit: My Mac has gone to sleep. ZZZzzz…] 20150819 04:01:19-!- genbattle [~genbattle@182.16.153.90] has quit [Read error: Connection reset by peer] 20150819 04:12:27-!- EliDupree [~quassel@2604:a880:800:10::99a:2001] has quit [Quit: No Ping reply in 180 seconds.] 20150819 04:16:50-!- EliDupree [~quassel@2604:a880:800:10::99a:2001] has joined #wesnoth-dev 20150819 04:17:10-!- Portaljacker [~Portaljac@modemcable081.139-178-173.mc.videotron.ca] has joined #wesnoth-dev 20150819 04:20:11-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has quit [Ping timeout: 240 seconds] 20150819 04:22:49-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has joined #wesnoth-dev 20150819 04:28:39< aeth> WML at the moment isn't compiled, is it? 20150819 04:30:25< shadowm> It's deserialized into config objects. 20150819 04:30:41-!- Portaljacker [~Portaljac@modemcable081.139-178-173.mc.videotron.ca] has quit [Quit: Leaving] 20150819 04:30:48-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20150819 04:31:06< aeth> Each run, though? What if Wesnoth did a checksum and if the checksum doesn't change it uses a faster to load cache? 20150819 04:31:21< shadowm> Event WML (a.k.a. the only part of WML representing actual scripts) is not treated especially when it comes to storage, only accessed through an adaptor that handles variables. 20150819 04:31:54< shadowm> We already have a cache. 20150819 04:32:02< aeth> ah 20150819 04:32:08< aeth> I can't seem to find it 20150819 04:32:17< aeth> It doesn't seem to be in .locak 20150819 04:32:22< aeth> *.local 20150819 04:32:30< aeth> Soft keyboards are terrible 20150819 04:32:46< shadowm> .cache/wesnoth is used with the XDG FS scheme. 20150819 04:32:56< aeth> oh, .cache, ok 20150819 04:33:40< shadowm> The cache will be used provided 1) the WML in question stays unchanged; 2) the game version remains unchanged (this includes the commit hash where available). 20150819 04:37:07< aeth> Is the cache just mainline? 20150819 04:37:14< shadowm> Add-ons too. 20150819 04:37:35< irker804> wesnoth: Ignacio R. Morelle wesnoth:master 44312adfcb8f / src/config.hpp: config: Fix child/const_child_iterator implementations of operator> http://git.io/vst1D 20150819 04:41:40< aeth> The cache seems to just be .gz compressed pieces of WML. 20150819 04:42:07< shadowm> Yes. 20150819 04:42:20< shadowm> That's why it's called a cache. 20150819 04:42:49< celticminstrel> So basically the cache means you don't need to preprocess. 20150819 04:43:01< celticminstrel> Is that correct? 20150819 04:44:05< shadowm> Yes. 20150819 04:45:16-!- Guest69082 [~quassel@2604:a880:800:10::1c2:b001] has quit [Changing host] 20150819 04:45:16-!- Guest69082 [~quassel@wikipedia/Legoktm] has joined #wesnoth-dev 20150819 04:45:40< irker804> wesnoth: Ignacio R. Morelle wesnoth:master f572f2f49f8a / changelog src/unit.cpp: Fix unit [resistance] and [jamming_costs] not being used in sync checks http://git.io/vstM5 20150819 04:45:43< irker804> wesnoth: Wedge009 wesnoth:1.12 c98f3e029d24 / src/hotkey/hotkey_item.cpp: Correct handling of Ctrl+Return/Enter hot-key. http://git.io/vstMd 20150819 04:45:45< irker804> wesnoth: Ignacio R. Morelle wesnoth:1.12 b7e172994fbd / changelog src/unit.cpp: Fix unit [resistance] and [jamming_costs] not being used in sync checks http://git.io/vstMF 20150819 04:45:56< aeth> So the cache is the literal WML with all the macros expanded? 20150819 04:45:58< shadowm> Oops. 20150819 04:46:07< shadowm> I didn't intend to push c98f3e029d24 yet but okay. 20150819 04:46:38-!- Guest69082 is now known as legoktm 20150819 04:46:38< celticminstrel> jamming_costs is part of movetype, right? 20150819 04:46:49< shadowm> Yes. 20150819 04:46:58< shadowm> Probably. Maybe. I don't know, I didn't code it. 20150819 04:47:16< celticminstrel> Oh. I guess asking you to explain how it works might not be useful then. 20150819 04:47:35< shadowm> The author was notably negligent when it came to documentation and I don't think it's in the wiki yet for that reason. 20150819 04:47:41< celticminstrel> I'm guessing it's not in 1.12? 20150819 04:47:55< shadowm> It is in 1.12, hence the backport above. 20150819 04:47:59< celticminstrel> Ah. 20150819 04:48:25< celticminstrel> I can vaguely guess what it does from the name (interfering with other unit's vision?)... 20150819 04:48:44< shadowm> Most likely. 20150819 04:48:47-!- Shackra [~Jorge@186.177.2.148] has quit [Read error: Connection reset by peer] 20150819 04:49:15-!- EliDupree [~quassel@2604:a880:800:10::99a:2001] has quit [Quit: No Ping reply in 180 seconds.] 20150819 04:51:18-!- EliDupree [~quassel@2604:a880:800:10::99a:2001] has joined #wesnoth-dev 20150819 04:52:24< irker804> wesnoth: Ignacio R. Morelle wesnoth:master 65ea7152d039 / src/dialogs.cpp: gui1: Fix nonsensical bitwise OR http://git.io/vstDw 20150819 04:54:06< shadowm> Nonsensical... bitwise AND. 20150819 04:54:20< shadowm> Oh well, the commit message is completely wrong but the intention is correct. 20150819 04:54:37< shadowm> In that that shouldn't be a bitwise AND to begin with. 20150819 04:55:20< celticminstrel> Heh. 20150819 04:58:04< irker804> wesnoth: Ignacio R. Morelle wesnoth:master 1f50e2802328 / src/dialogs.cpp: gui1: Formatting tweak http://git.io/vstyr 20150819 05:00:15-!- mjs-de [~mjs-de@x4db6b342.dyn.telefonica.de] has joined #wesnoth-dev 20150819 05:09:40-!- gen_battle [~genbattle@182.16.153.90] has joined #wesnoth-dev 20150819 05:10:09< irker804> wesnoth: Ignacio R. Morelle wesnoth:master 056189d1c676 / src/ (dialogs.cpp game_initialization/playcampaign.cpp playturn.cpp variable.cpp): Fix several null pointer checks done after first use http://git.io/vst9o 20150819 05:19:44-!- legoktm is now known as Sn0c0 20150819 05:41:26-!- Kwandulin [~Miranda@p5B008F44.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150819 05:46:27-!- Sn0c0 is now known as legoktm 20150819 06:07:45-!- Appleman1234 [~Appleman1@KD036012015184.au-net.ne.jp] has quit [Ping timeout: 265 seconds] 20150819 06:11:38-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 244 seconds] 20150819 06:13:36-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150819 06:14:00-!- markus_ [~mjs-de@x4db6bda2.dyn.telefonica.de] has joined #wesnoth-dev 20150819 06:17:25-!- mjs-de [~mjs-de@x4db6b342.dyn.telefonica.de] has quit [Ping timeout: 240 seconds] 20150819 06:42:06-!- gen_battle [~genbattle@182.16.153.90] has quit [Ping timeout: 244 seconds] 20150819 07:04:10-!- Appleman1234 [~Appleman1@KD036012031005.au-net.ne.jp] has joined #wesnoth-dev 20150819 07:11:30-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150819 07:40:31-!- Appleman1234 [~Appleman1@KD036012031005.au-net.ne.jp] has quit [Ping timeout: 250 seconds] 20150819 07:52:26-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: And lo! The computer falls into a deep sleep, to awake again some other day!] 20150819 07:52:59< irker804> wesnoth: Ignacio R. Morelle wesnoth:1.12 cfb1f8e09865 / changelog fonts/fonts.conf players_changelog src/font.cpp: font: Provide our own fontconfig settings (bug #20337) http://git.io/vsqlI 20150819 07:59:17-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150819 08:14:02-!- EdB [~edb@89-158-11-138.rev.numericable.fr] has joined #wesnoth-dev 20150819 08:32:45-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 256 seconds] 20150819 08:35:04-!- EdB [~edb@89-158-11-138.rev.numericable.fr] has quit [Quit: Konversation terminated!] 20150819 08:36:58-!- Appleman1234 [~Appleman1@KD036012023166.au-net.ne.jp] has joined #wesnoth-dev 20150819 09:06:08< wedge009> I think I've finally got the Windows Tray working. Just didn't know how to cast properly. I feel so stupid. 20150819 09:06:16< wedge009> In SDL2.0, I mean. 20150819 09:08:31< wedge009> I need to head out for a bit, but I'll update PR #454 with the correct implementation when I return. 20150819 09:08:57< vultraz> :D 20150819 09:10:24-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 244 seconds] 20150819 09:25:18-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 255 seconds] 20150819 09:26:29-!- markus_ is now known as mjs-de 20150819 09:29:56-!- zombah [~zombah@2a02:28:3:1:214:4fff:fe47:5920] has joined #wesnoth-dev 20150819 09:45:38-!- subliun [~quassel@139.216.140.254] has quit [Ping timeout: 250 seconds] 20150819 09:48:38-!- subliun [~quassel@139.216.140.254] has joined #wesnoth-dev 20150819 10:16:15-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Quit: My Mac has gone to sleep. ZZZzzz…] 20150819 10:22:41-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150819 11:14:46-!- irker804 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20150819 11:20:42-!- Kwandulin [~Miranda@p5B008F44.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150819 11:38:39-!- louis94 [~~louis94@91.178.27.233] has joined #wesnoth-dev 20150819 11:38:41-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150819 11:46:17-!- louis94 [~~louis94@91.178.27.233] has quit [Ping timeout: 246 seconds] 20150819 11:46:24-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has joined #wesnoth-dev 20150819 12:07:40-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev 20150819 12:07:40-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host] 20150819 12:07:40-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150819 12:08:58-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150819 12:11:02-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 260 seconds] 20150819 12:11:03-!- wedge010 is now known as wedge009 20150819 12:16:01-!- Appleman1234 [~Appleman1@KD036012023166.au-net.ne.jp] has quit [Ping timeout: 256 seconds] 20150819 12:20:54-!- louis94 [~~louis94@91.178.27.233] has joined #wesnoth-dev 20150819 12:25:47-!- gandaro [~gandaro@wikipedia/Gorlingor] has joined #wesnoth-dev 20150819 12:47:30-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20150819 12:59:14-!- prkc [~prkc@4E5CCDCF.dsl.pool.telekom.hu] has joined #wesnoth-dev 20150819 13:06:28-!- louis94 [~~louis94@91.178.27.233] has quit [Ping timeout: 272 seconds] 20150819 13:13:35-!- Appleman1234 [~Appleman1@KD036012024142.au-net.ne.jp] has joined #wesnoth-dev 20150819 13:33:49-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has quit [Quit: Leaving] 20150819 13:49:20-!- Appleman1234 [~Appleman1@KD036012024142.au-net.ne.jp] has quit [Ping timeout: 265 seconds] 20150819 13:54:36-!- Kwandulin [~Miranda@p5B008F44.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150819 14:45:36< wedge009> Hello again. https://github.com/wesnoth/wesnoth/pull/454 is ready for review. Please read the commentary at the end, there's one minor bug introduced with SDL2.0 implementation, but I'm pretty sure it wasn't due to my changes. I will try to have another look after work tomorrow, but for the time being I'm considering this ready to merge. 20150819 14:46:22-!- Appleman1234 [~Appleman1@KD036012026020.au-net.ne.jp] has joined #wesnoth-dev 20150819 14:46:24< wedge009> If you think the bug is a show-stopper, that's okay, but keep in mind that the current code will not compile properly in Windows and SDL 2.0 without these changes. 20150819 14:49:59< wedge009> Aginor: How are you going re-writing the hot-key handling? Just wondering if I should bother looking into the more esoteric key combinations that aren't being detected properly, or aren't consistent between Windows and Linux. 20150819 15:06:45-!- Kwandulin [~Miranda@p5B008F44.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150819 15:08:21-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150819 15:08:56-!- louis94 [~~louis94@91.178.27.233] has joined #wesnoth-dev 20150819 15:21:54-!- Appleman1234 [~Appleman1@KD036012026020.au-net.ne.jp] has quit [Ping timeout: 250 seconds] 20150819 15:30:03< vultraz> I wonder what the behavior would be on Windows 10 20150819 15:30:10< vultraz> since it doesn't use the bubbles anymore 20150819 15:30:39< vultraz> And it should also get recorded in the Action Center 20150819 15:37:12< vultraz> Like, would the popup... stay on screen? 20150819 15:37:28< vultraz> Or stick in the AC? 20150819 15:39:47< vultraz> wedge009: what windows version do you have? 20150819 15:46:22-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev 20150819 15:52:30-!- [Relic] [~Relic]@2602:306:33a3:6d30:f589:5a37:4719:9337] has joined #wesnoth-dev 20150819 16:02:56-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20150819 16:08:14-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20150819 16:18:55-!- Appleman1234 [~Appleman1@KD036012022046.au-net.ne.jp] has joined #wesnoth-dev 20150819 16:29:47-!- Kwandulin [~Miranda@p5B008F44.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150819 16:30:17-!- jcnewjersey1 [~jcnewjers@pool-108-35-38-39.nwrknj.fios.verizon.net] has quit [Ping timeout: 265 seconds] 20150819 16:30:18-!- jcnewjersey [~jcnewjers@pool-108-35-38-39.nwrknj.fios.verizon.net] has joined #wesnoth-dev 20150819 16:36:12-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150819 16:43:22-!- zombah [~zombah@2a02:28:3:1:214:4fff:fe47:5920] has quit [Quit: Leaving] 20150819 16:49:37-!- louis94 [~~louis94@91.178.27.233] has quit [Quit: Konversation terminated!] 20150819 16:53:43-!- Appleman1234 [~Appleman1@KD036012022046.au-net.ne.jp] has quit [Ping timeout: 252 seconds] 20150819 17:45:49-!- Kwandulin [~Miranda@p5B008F44.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150819 17:51:33-!- Appleman1234 [~Appleman1@KD036012012112.au-net.ne.jp] has joined #wesnoth-dev 20150819 17:59:24-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc] 20150819 18:05:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 245 seconds] 20150819 18:05:25-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150819 18:21:12< wedge009> vultraz: Tested on Windows 7. 20150819 18:26:50-!- Appleman1234 [~Appleman1@KD036012012112.au-net.ne.jp] has quit [Ping timeout: 240 seconds] 20150819 18:31:39-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150819 18:33:11-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 246 seconds] 20150819 18:33:12-!- wedge010 is now known as wedge009 20150819 18:46:37-!- jimlei [~quassel@164.10.189.109.customer.cdi.no] has quit [Remote host closed the connection] 20150819 19:08:20-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150819 19:24:36-!- Appleman1234 [~Appleman1@KD036012013075.au-net.ne.jp] has joined #wesnoth-dev 20150819 19:49:13-!- ancestral [~ancestral@206.104.135.61] has joined #wesnoth-dev 20150819 20:01:18-!- Appleman1234 [~Appleman1@KD036012013075.au-net.ne.jp] has quit [Ping timeout: 272 seconds] 20150819 20:09:45< mattsc> celticminstrel: hi 20150819 20:09:57< celticminstrel> 'lo 20150819 20:10:32-!- ancestral [~ancestral@206.104.135.61] has quit [Quit: i go nstuf kthxbai] 20150819 20:10:33< mattsc> I tested your rebased version of PR464 and it works without problems now 20150819 20:10:55< celticminstrel> Surprisingly, it seems that your new pango modules also work for me. 20150819 20:11:05< celticminstrel> I have no idea how that's possible. 20150819 20:11:22< mattsc> oh, cool 20150819 20:12:57< mattsc> Well, looking at them with otool, there’s only a single System framework they are using (Carbon), which apparently has not moved 20150819 20:13:31< mattsc> Everything else is stuff in the local Resources folder, which you have replaced yuorself. So my guess is that that is why it’s working. 20150819 20:13:43< celticminstrel> Yeah, for some reason the CoreText module does not reference CoreText anymore. 20150819 20:13:50< mattsc> On the PR, a couple questions for my own education: 20150819 20:14:25< mattsc> You’re using a script here because …? Can the built-in ‘copy files” mechanism of Xcode only copy individual files? 20150819 20:14:54< celticminstrel> It's because the built-in Copy Files fails if the file doesn't exist. 20150819 20:15:05< mattsc> Ah, I see. 20150819 20:15:12< celticminstrel> I tried that first, actually. 20150819 20:15:34< mattsc> And I am not super familiar with ditto. Does that overwrite all files each time, or only if they’ve been updated? 20150819 20:16:22< celticminstrel> From the manpage: "If the destination directory does not exist it will be created before the first source is copied. If the destination directory already exists then the source directories are merged with the previous contents of the destination." 20150819 20:16:38< mattsc> Yes, I saw that. 20150819 20:16:49< mattsc> What does “merged” mean in this context? 20150819 20:16:53< celticminstrel> Good question! 20150819 20:17:21< mattsc> Just wondering whether we’re copying 100MB of files every time we’re building a minor update. 20150819 20:17:47< mattsc> Also, “merged” sounds like a file that was deleted will continue to exist. 20150819 20:17:57< celticminstrel> Yes, that's true. 20150819 20:18:39< mattsc> I’m not sure if either of that is a serious issue, but at least whoever builds the releases should be aware of it. 20150819 20:19:10-!- genbattle [~genbattle@182.16.153.90] has joined #wesnoth-dev 20150819 20:19:14< celticminstrel> I think if they do a clean build it shouldn't be an issue? 20150819 20:19:24< mattsc> Ah, yes, good point. 20150819 20:19:36< mattsc> And it should be a clean build anyway… 20150819 20:19:45< celticminstrel> For a release, yeah. 20150819 20:19:57< mattsc> Yes, that’s what I meant. Sorry. 20150819 20:20:22< celticminstrel> I can't tell whether ditto's merge checks file modified times, and I can't see a flag to make it do so. 20150819 20:20:53< mattsc> As I said, I barely know what ditto does. I think we could use rsync with the delete flag. 20150819 20:21:03< mattsc> You can use rsync locally, right? 20150819 20:21:15< celticminstrel> I dunno. 20150819 20:21:56< celticminstrel> I didn't use cp because its behaviour can be different based on whether or not the destination directory already exists. 20150819 20:22:59< mattsc> You can use rsync. I just synced the pango modules to my desktop. 20150819 20:23:19< mattsc> And I know that that only syncs updated files and can delete files. 20150819 20:23:21< celticminstrel> Sounds good. 20150819 20:23:35< celticminstrel> Potentially even better than my ditto. 20150819 20:23:43< mattsc> I don’t know though, maybe ditto does that already also. 20150819 20:23:52< celticminstrel> Maybe. Google time? 20150819 20:24:07 * celticminstrel is currently in the middle of trying to fix a bug unrelated to Wesnoth. 20150819 20:24:12< mattsc> Maybe somebody of the Linux people could chime in here? :) 20150819 20:24:22< celticminstrel> ditto is a Mac too. 20150819 20:24:24< mattsc> *some 20150819 20:24:26< celticminstrel> ^tool. 20150819 20:24:33< celticminstrel> I think. 20150819 20:24:37< mattsc> Mac only? I see. 20150819 20:24:48< celticminstrel> Maybe it exists on BSD or something, I dunno. 20150819 20:25:43< mattsc> Well, let’s wait a little and see if somebody has any comments. 20150819 20:26:03< mattsc> For example, are there reasons why we shouldn’t use rsync? 20150819 20:26:45< mattsc> After that, I’ll merge it with either ditto or rsync, whatever you decide is best in the end. 20150819 20:27:35< celticminstrel> I'm not entirely sure, but I think XCode's "Copy Files" task might use ditto internally. 20150819 20:27:58< pydsigner> Maybe somebody of the Linux people could chime in here? :) 20150819 20:28:13< pydsigner> `man rsync`? 20150819 20:28:31< mattsc> pydsigner: yes, I hang my head in shame about that grammar. ;) 20150819 20:29:05< mattsc> pydsigner: I know how to use rsync. I don’t know if there are any reasons why it should not be used for something like this. 20150819 20:29:10< pydsigner> I wasn't looking at your grammar there 20150819 20:29:33< mattsc> pydsigner: I know, just poking fun of myself. :) 20150819 20:30:12 * pydsigner is still typing too slow :( 20150819 20:31:01< pydsigner> http://unix.stackexchange.com/questions/90775/why-not-always-use-rsync 20150819 20:31:05< mattsc> Let me rephrase again: I know that I can make rsync do what I think we want to do here (copying only changed files, deleting things that got deleted at the source), but I don’t know if there are any down sides to it (overhead, security, …) 20150819 20:31:22< pydsigner> Some good info there I think 20150819 20:31:46< pydsigner> Availability seems to be the main concern 20150819 20:32:56< celticminstrel> Looks like it's installed by default on Macs. At least, it's at /usr/bin/rsync. 20150819 20:33:27< celticminstrel> (Though I also have it from MacPorts.) 20150819 20:34:06< mattsc> pydsigner: interesting and sounds like it would work well here. Thanks. 20150819 20:34:30< mattsc> celticminstrel: it’s in /usr/bin for me as well, which means it’s part of Xcode, right? 20150819 20:34:42< celticminstrel> Hmm. I'm not sure. 20150819 20:35:22< celticminstrel> XCode does install its commandline tools in /usr/bin, but that doesn't necessarily mean everything in /usr/bin is part of XCode's commandline tools. 20150819 20:36:17< mattsc> A quick Google search seems to indicate that OS X comes with rsync by default 20150819 20:37:11< mattsc> celticminstrel: I’ll leave this up to you. If ditto only updates changed files and deletes removed files, it’s perfect. 20150819 20:38:19< mattsc> celticminstrel: on a side note, was there anything else I said I would do? 20150819 20:42:20< celticminstrel> I don't think there was anything else. 20150819 20:43:21< mattsc> celticminstrel: http://www.howtogeek.com/198043/how-to-merge-folders-on-mac-os-x-without-losing-all-your-files-seriously/ 20150819 20:43:37< mattsc> Go to the section on “How to Merge Folders With the Ditto Command” 20150819 20:44:04< mattsc> In my opinion, that’s sub-ideal behavior, although in practice it might make very little difference. 20150819 20:46:06< celticminstrel> From the first few lines, I think that's from 10.6 or earlier, but I'll keep reading. 20150819 20:47:12< celticminstrel> Oh, it does mention 10.7 later on. 20150819 20:47:20< celticminstrel> I've definitely seen that merge button before. 20150819 20:48:29 * celticminstrel finally gets to the ditto section. 20150819 20:49:35< celticminstrel> Are you referring to this: "Unlike the Finder, the ditto command forcibly overwrites the contents of the destination folder with the contents of the source folder. Even if the source folder contains older files than the destination folder, the destination folder’s conflicting files will be overwritten with these older files." 20150819 20:50:02< mattsc> Yes, that is one aspect 20150819 20:50:25< mattsc> And the other one is the merging. Which means if a file gets renamed, you end up with both version 20150819 20:50:35< mattsc> don’t know if that is likely to happen 20150819 20:51:00< celticminstrel> I have never used rsync before. 20150819 20:51:07< mattsc> I just ran ‘time rsync -rv --delete translations dest-dir/‘ 20150819 20:51:18< celticminstrel> But I don't have a problem with using it. I also don't have any idea if there are downsides like you were asking though. 20150819 20:51:39< mattsc> It removed a file I had put into the destination, as expected. And when everything was up to date, it took ~30 milliseconds. 20150819 20:51:51< mattsc> I think that’s acceptable overhead. :) 20150819 20:52:42< mattsc> celticminstrel: well, let’s wait a few hours and see if somebody has something to add, but if not, I’d vote for rsync. 20150819 20:54:13< mattsc> celticminstrel: in any case, except for that little detail, the PR works perfectly for me. Thanks for setting that up! 20150819 20:54:45< celticminstrel> I wonder if I could also set up a target to build the translations... but running one command from the terminal isn't really a big deal, so maybe I won't bother. 20150819 20:56:00< mattsc> Agreed - also, that takes quite some time, so you really noly would want to do that if something has changed. 20150819 20:56:41< celticminstrel> Yeah, it'd be a separate target that the main build is not dependent on. 20150819 20:56:56< celticminstrel> But likely not worth it. 20150819 20:57:04< mattsc> Oh, right, you said “target”. 20150819 20:57:19< mattsc> I’d tend to agree. 20150819 20:57:53< mattsc> Also, isn’t it amazing how every little question turns into an hour-long discussion. :P 20150819 21:01:37-!- louis94 [~~louis94@91.178.27.233] has joined #wesnoth-dev 20150819 21:10:47< celticminstrel> Still have two pull requests to open... 20150819 21:12:51-!- Appleman1234 [~Appleman1@KD036012031003.au-net.ne.jp] has joined #wesnoth-dev 20150819 21:12:56< Aginor> wedge009: I've done the changes, I'm debugging them at the moment, I have an issue with std::remove_if that seems to ignore my predicate function and delete all hotkeys :) 20150819 21:13:08< Aginor> wedge009: could you please describe the bug you refer to? 20150819 21:13:13< celticminstrel> How are you using remove_if? 20150819 21:14:23< Aginor> hotkeys_.erase(std::remove_if(hotkeys_.begin(), hotkeys_.end(), boost::bind(&hotkey_base::bindings_uqual, _1, newitem))) 20150819 21:14:50< celticminstrel> hotkeys_ is a vector? map? 20150819 21:14:58< Aginor> std::vector 20150819 21:15:14< celticminstrel> So you're not using remove_if then. 20150819 21:15:29< celticminstrel> Oh wait, weird. 20150819 21:15:46< Aginor> I'm using the std::remove_if that returns an iterator that only contains the element matches the predicate function 20150819 21:15:56< celticminstrel> Uhh. 20150819 21:16:00< Aginor> (in theory) 20150819 21:16:19< celticminstrel> I'm pretty sure that's not how remove_if works. 20150819 21:16:52< Aginor> hmm 20150819 21:16:55< Aginor> I think you're right 20150819 21:17:01< Aginor> Removes all elements satisfying specific criteria from the range [first, last) and returns a past-the-end iterator for the new end of the range. 20150819 21:17:03< celticminstrel> Just call remove_if without erase. 20150819 21:17:09< celticminstrel> See if that works. 20150819 21:17:19< Aginor> I will 20150819 21:17:44< celticminstrel> I vaguely recall having problems with remove_if, though I think that was in a map. 20150819 21:18:10< celticminstrel> Oh. 20150819 21:18:19< celticminstrel> Hmm. 20150819 21:18:58< celticminstrel> It looks like what remove_if really does is rearrange the contents of the list so that the elements to be removed are in a contiguous range. 20150819 21:19:25< Aginor> that's not what happens though 20150819 21:19:28< celticminstrel> So if that's right, then erase(remove_if(...), end()) should work... 20150819 21:19:39< celticminstrel> But you said that removed all hotkeys... 20150819 21:20:55< Aginor> adding a 20150819 21:20:55< Aginor> before1 20150819 21:20:55< Aginor> equal check 20150819 21:20:55< Aginor> this:97 other: 109 20150819 21:20:55< Aginor> checking a vs m result: 0 20150819 21:20:57< Aginor> checking a vs m result: 0 20150819 21:21:00< Aginor> after0 20150819 21:21:22< Aginor> that's some of my debug output, where vector size is in before and after 20150819 21:21:47< Aginor> the checking comes from my predicate 20150819 21:22:19< Aginor> so even though the predicate returns false, it is removed and vector.size() returns 0 20150819 21:24:34-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20150819 21:24:42< Aginor> I need to head out shortly, but I'll look at this a bit more later 20150819 21:25:09-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Remote host closed the connection] 20150819 21:27:05-!- subliun [~quassel@139.216.140.254] has quit [Ping timeout: 245 seconds] 20150819 21:27:46-!- subliun [~quassel@139.216.140.254] has joined #wesnoth-dev 20150819 21:44:46-!- Appleman1234 [~Appleman1@KD036012031003.au-net.ne.jp] has quit [Ping timeout: 240 seconds] 20150819 21:45:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150819 21:46:00-!- Ravana_ [~Ravana@unaffiliated/ravana/x-2327071] has quit [Read error: Connection reset by peer] 20150819 21:47:40-!- BeoXTC_ [3eb2b12a@gateway/web/cgi-irc/kiwiirc.com/ip.62.178.177.42] has joined #wesnoth-dev 20150819 21:48:43< celticminstrel> I want Cmd+W to close map, but I can't assign it to that because it's assigned to Quit Game. :/ 20150819 21:49:05< celticminstrel> Which it also makes sense for. 20150819 21:53:17< BeoXTC_> do you know git well? 20150819 21:53:30< celticminstrel> Somewhat, why? 20150819 21:53:48< BeoXTC_> there is this wiki page for wesnoth about git 20150819 21:54:09< BeoXTC_> it explains downstream and upstream as if it was something really weird 20150819 21:54:36< BeoXTC_> in the end, it is a distributed system where each clone is a whole repo and you just say "how you connect" them 20150819 21:55:19< BeoXTC_> in the end the writer of this wiki page explains how to push to upstream and pull from downstream but you could configure it with two commands and you shouldn't need to care about it anymore 20150819 21:55:30< BeoXTC_> http://wiki.wesnoth.org/Git_for_Wesnoth_Crash_Course 20150819 21:55:33< celticminstrel> git push --set-upstream origin master 20150819 21:56:04< celticminstrel> That "workflow picture" is the opposite of how I do it. 20150819 21:56:13< celticminstrel> I set my fork as the upstream. 20150819 21:56:18< BeoXTC_> yes 20150819 21:56:21< BeoXTC_> :) 20150819 21:56:37< celticminstrel> And I add an alias "main" pointing to the Wesnoth repo. 20150819 21:58:10< BeoXTC_> I would be happy to have those upstream/downstream commands in the wiki. how can I add them? 20150819 21:59:28< celticminstrel> There's an "edit" button somewhere, isn't there? I recommend you make an account first, too. 20150819 22:05:25-!- mjs-de [~mjs-de@x4db6bda2.dyn.telefonica.de] has quit [Ping timeout: 246 seconds] 20150819 22:23:24-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has joined #wesnoth-dev 20150819 22:24:17-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20150819 22:42:01-!- Appleman1234 [~Appleman1@KD036012029140.au-net.ne.jp] has joined #wesnoth-dev 20150819 23:17:53-!- BeoXTC_ [3eb2b12a@gateway/web/cgi-irc/kiwiirc.com/ip.62.178.177.42] has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client] 20150819 23:29:01-!- prkc [~prkc@4E5CCDCF.dsl.pool.telekom.hu] has quit [Remote host closed the connection] 20150819 23:45:57-!- irker106 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150819 23:45:57< irker106> wesnoth: Charles Dang wesnoth:master eecbf6efc488 / data/core/images/story/ (12 files): Add 12 new generic storyscreen art pieces by LordBob http://git.io/vsGuT 20150819 23:46:39< vultraz> dun dun duunnn 20150819 23:47:38< celticminstrel> Ooooh... 20150819 23:48:43< celticminstrel> ...weird horizontal streaks in landscape-mountains-01.jpg. 20150819 23:49:31< shadowm> vultraz: These were considered finished? 20150819 23:50:03< vultraz> LB OK'ed their being committed 20150819 23:50:48< shadowm> And one of them is 640x480. 20150819 23:51:13< vultraz> Yes, sadly. 20150819 23:51:33-!- knotwork_ is now known as knotwork 20150819 23:55:01< vultraz> Should I ask him about that one? 20150819 23:55:35-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc] 20150819 23:56:48< Aginor> ok, I've gotten std::remove_if to work with vector 20150819 23:57:07< vultraz> Side note: the new logo text looks sexy a'f. 20150819 23:57:56< Aginor> myvector.erase(myvector.begin(), std::erase_if(myvector.begin(), myvector.end(), predicate) 20150819 23:58:03< shadowm> vultraz: Why are you asking *me* :| 20150819 23:58:14< vultraz> Since you brought it up 20150819 23:58:18< vultraz> https://www.dropbox.com/s/xuqrh359aghurgd/newlogoingame.PNG?dl=0 20150819 23:58:36< shadowm> vultraz: Aren't you the high-res-obsessed person rather than me? 20150819 23:58:49< vultraz> Point taken --- Log closed Thu Aug 20 00:00:25 2015