--- Log opened Mon Mar 21 00:00:27 2016 20160321 00:01:26-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 268 seconds] 20160321 00:06:34< vultraz> damn. apparently adjust_profile((*v).str()); isn't valid. 20160321 00:06:39 * vultraz guesses he needs a string copy 20160321 00:08:06< vultraz> gm 20160321 00:08:07< vultraz> hm 20160321 00:09:04< vultraz> note to self: make that function return a string instead of editing the reference 20160321 00:09:46< vultraz> hmmm 20160321 00:12:35< vultraz> actually, no 20160321 00:12:40< vultraz> but why is the code not working :| 20160321 00:20:01< vultraz> hmmmmmmm 20160321 00:20:42< vultraz> actually, we may need to retain the code that pipes '/transparent' *into* the portrait string 20160321 00:21:20< celticminstrel> The point is that if someone references it with transparent, they get directed to the correct image. 20160321 00:21:27< vultraz> right 20160321 00:21:31< celticminstrel> (But only if it's referencing an image that doesn't exist.) 20160321 00:21:40< celticminstrel> So that's definitely removing "transparent", not adding it. 20160321 00:21:57< vultraz> but 95% of unit types refer to the "non-transparent" image 20160321 00:22:08< vultraz> we'll be fixing that for core by moving those in a bit 20160321 00:22:19< vultraz> but for umc, those paths won't get translated.. 20160321 00:24:00< vultraz> also keep in kind people will still have to run wmllint to correct their paths outside a unit config context 20160321 00:50:38-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20160321 01:01:23< vultraz> dammit, this isn't working as expected 20160321 01:14:37< vultraz> aggghh 20160321 01:23:56< vultraz> celticminstrel: could you help me out: http://pastebin.com/Wt0pyafJ 20160321 01:24:27< vultraz> for some reason this is not correcting paths w/o "/transparent" to use "/transparent" 20160321 01:24:38< vultraz> which needs to be done for compatibility 20160321 01:24:46< vultraz> backwards compatibility* 20160321 01:29:29-!- louis94 [~~louis94@91.178.241.89] has quit [Quit: Konversation terminated!] 20160321 01:31:38< vultraz> I'm out for now, since I have stuff to do and have wasted ~2 hours on this :| 20160321 01:38:56 * vultraz does wonder if "if(profile.find(path_adjust))" is valid 20160321 01:50:05< vultraz> ahh wait I got it 20160321 01:50:09< vultraz> you need to check again != std::string::npos 20160321 01:54:19-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has quit [Quit: Connection closed for inactivity] 20160321 02:07:57< irker976> wesnoth: Charles Dang wesnoth:master 05743bce2032 / src/units/ (types.cpp types.hpp unit.cpp): Decoupled small_profile from profile https://github.com/wesnoth/wesnoth/commit/05743bce2032ef0d8c8d2e2547bf2f7ecede7532 20160321 02:08:00< irker976> wesnoth: Charles Dang wesnoth:master c82807aea369 / src/help/help_topic_generators.cpp: Allow use of small_profile in help browser if specified https://github.com/wesnoth/wesnoth/commit/c82807aea36997554fc4db1f9ad7e4eb55aa81bf 20160321 02:08:03< irker976> wesnoth: Charles Dang wesnoth:master d1e972b31858 / data/core/units/ (24 files in 9 dirs): Remove '/transparent' from remaining unit type profile paths https://github.com/wesnoth/wesnoth/commit/d1e972b31858f10876f01fc8b62da3c5037f19a2 20160321 02:08:07< vultraz> celticminstrel: ^ please begin the image move\ 20160321 02:08:18< vultraz> Now I'm really out 20160321 02:09:09< vultraz> might have to add the apply_to=profile small_portrait= key to the wiki 20160321 02:14:47-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20160321 02:15:09< celticminstrel> vultraz: Sorry, was doing supper. 20160321 02:16:09-!- gfgtdf [~chatzilla@x55b191d6.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 45.0.1/20160315153207]] 20160321 02:23:58< wedge009> celticminstrel: VC9 project seems okay, other than the fact that src/portrait.* seems to be non-existent now. I don't use VC9 directly as I use VC14, checking VC9 project changes when compilation breaks. Was it just aquileia who uses VC9? Anyone else? 20160321 02:24:40< wedge009> Using scons in Linux is broken for me, though. I don't know how to fix that one. 20160321 02:24:51< celticminstrel> wedge009: Good to know; there'll be another push in a bit, so it'd be great if you can check again then. 20160321 02:24:56< wedge009> Sure. 20160321 02:25:07< wedge009> I have to check whenever stuff breaks anyway. (: 20160321 02:27:53-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 02:27:54< travis-ci> wesnoth/wesnoth#8982 (master - d1e972b : Charles Dang): The build is still failing. 20160321 02:27:54< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117360781 20160321 02:27:54-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 02:40:52< celticminstrel> vultraz: Uhh... why the heck did you use the conditional operator as a statement instead of just using an if statement? o.o 20160321 02:41:22< celticminstrel> vultraz: I assume you tested this, right? It looks okay at a glance though. 20160321 02:45:47-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev 20160321 02:47:25-!- aeonchild [enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 248 seconds] 20160321 02:50:16-!- aeonchild [enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20160321 02:50:36-!- aquileia [~androirc@HSI-KBW-095-208-125-086.hsi5.kabel-badenwuerttemberg.de] has joined #wesnoth-dev 20160321 02:52:48-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Ping timeout: 246 seconds] 20160321 02:53:54-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has quit [Quit: Leaving] 20160321 02:55:59-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev 20160321 02:57:35< aquileia> If nobody raises any objections, I'll commit amorphous' swordsman animations tomorrow - yes, we lose ancestral idle animation, but the baseframe looks a lot better. 20160321 02:58:26< ancestral> aquileia: Good use the word “ancestral” there ;-) 20160321 02:59:53< aquileia> zookeeper, vultraz, Jetrel: I already asked him via PM how he'd like to be mentioned in the credits, so I'll handle the commit 20160321 03:00:35< aquileia> ancestral: Sorry, IRC name autocompletion... 20160321 03:00:59< Jetrel> aquileia: do you have a link to the forum post with the animation? 20160321 03:01:12< Jetrel> I'm happy to trust your judgement on it, I'm just curious. 20160321 03:01:25< aquileia> http://forums.wesnoth.org/viewtopic.php?f=9&t=41517&p=595175#p595151 20160321 03:03:07< aquileia> Anyway, I'll be back tomorrow, bye 20160321 03:03:16-!- aquileia [~androirc@HSI-KBW-095-208-125-086.hsi5.kabel-badenwuerttemberg.de] has left #wesnoth-dev ["Trennungsnachricht"] 20160321 03:05:11< shadowm> 23:41:24 vultraz: I assume you tested this, right? It looks okay at a glance though. 20160321 03:05:44< shadowm> Is it a statement like this? condition ? expr_if_true : expr_if_false; 20160321 03:05:54< shadowm> No matter how legal it is, it's bad form and should be changed. 20160321 03:06:30< shadowm> Same goes for statements like: condition && expr_if_true; condition || expr_if_false; 20160321 03:06:37 * celticminstrel assumes you quoted the wrong line of mine. 20160321 03:06:40< celticminstrel> Yes, that's what it is. 20160321 03:06:49< shadowm> No, I quoted the correct line. 20160321 03:07:00< shadowm> It may be "okay" but it's not a coding style we want to encourage. 20160321 03:07:01< celticminstrel> condition && expr_if_true doesn't actually work in C/C++, I believe. 20160321 03:07:34< celticminstrel> I was referring to the commit as a whole when I said it looks okay. I agree the conditional should be changed. 20160321 03:08:15< shadowm> It does work. 20160321 03:09:13< shadowm> Given some provisions, at least, which shall go unmentioned on purpose. 20160321 03:15:50< shadowm> And what's the story behind builds being broken? 20160321 03:16:30 * celticminstrel checks the error. 20160321 03:18:53< celticminstrel> ...huh? It's looking for a file that doesn't (and never did) exist... 20160321 03:19:33< celticminstrel> I see, it was an error in updating SConscript. 20160321 03:23:07< celticminstrel> ...uh... what... somehow /CMakeLists.txt has completely changed... 20160321 03:23:32< celticminstrel> By which I mean it's unstaged changes. Even though I didn't touch that file. 20160321 03:25:30< celticminstrel> Somehow /src/CMakeLists.txt got saved over /CMakeLists.txt. 20160321 03:25:43< celticminstrel> Weird. 20160321 03:36:30< irker976> wesnoth: Celtic Minstrel wesnoth:master 040b4ca49a17 / / (178 files in 8 dirs): Consolidate GUI2 widget files https://github.com/wesnoth/wesnoth/commit/040b4ca49a179a005e7d07a9de9815be3abbcea8 20160321 03:36:32< irker976> wesnoth: Celtic Minstrel wesnoth:master 6307b9459ca1 / / (156 files in 20 dirs): Move most of gui/auxiliary to gui/core to reflect its true nature https://github.com/wesnoth/wesnoth/commit/6307b9459ca1f9727ba5b33393224f681ca40774 20160321 03:36:34< irker976> wesnoth: Celtic Minstrel wesnoth:master 620b228fa8ec / / (156 files in 18 dirs): Consolidate related GUI2 dialogs in directories https://github.com/wesnoth/wesnoth/commit/620b228fa8ecc51e18b8e123271546adb4811314 20160321 03:36:36< irker976> wesnoth: Celtic Minstrel wesnoth:master c0afb53a2ffe / / (4 files in 3 dirs): Fix build/project files https://github.com/wesnoth/wesnoth/commit/c0afb53a2ffe54437914ab3000a10f5633a259ed 20160321 03:37:36< celticminstrel> BTW zookeeper: I did, in fact, get approval (from vultraz and Aginor) for the GUI2 consolidation; however, I admit that I got a little carried away and neglected to get approval for the other moving-around-files stuff, so sorry about that. I don't intend to do that anymore in the near future. Regarding your concern about git, to be honest I was a bit worried about rebasing my formula branch onto this too; however, there was no probl 20160321 03:37:37< celticminstrel> at all with the fact that all the touched files had moved, and I just had one minor include block conflict. 20160321 03:39:17-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20160321 03:39:36< celticminstrel> mattsc: Bad timing, but, the AI branch is now updated. 20160321 03:41:08< celticminstrel> Huh, weird, the dwarf guard (or whatever it's called) is flipped in the small portrait. 20160321 03:41:28< celticminstrel> Guardsman. 20160321 03:54:38-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 03:54:39< travis-ci> wesnoth/wesnoth#8984 (master - c0afb53 : Celtic Minstrel): The build is still failing. 20160321 03:54:39< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117368889 20160321 03:54:39-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 04:21:36< irker976> wesnoth: Celtic Minstrel wesnoth:master 917f059500cd / src/gui/dialogs/multiplayer/synced_choice_wait.cpp: Fixup https://github.com/wesnoth/wesnoth/commit/917f059500cddcd914ab5c526dba674970a54b2e 20160321 04:45:37-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 04:45:38< travis-ci> wesnoth/wesnoth#8985 (master - 917f059 : Celtic Minstrel): The build is still failing. 20160321 04:45:38< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117373092 20160321 04:45:39-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 04:50:58< irker976> wesnoth: Celtic Minstrel wesnoth:master f357b588ad00 / src/SConscript: Another fixup https://github.com/wesnoth/wesnoth/commit/f357b588ad0061883e8ea9ddc2ea612aeff38397 20160321 04:51:47-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 260 seconds] 20160321 04:56:35-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20160321 05:19:28-!- _laco [~laco@static.95.25.4.46.clients.your-server.de] has joined #wesnoth-dev 20160321 05:27:44-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 05:27:45< travis-ci> wesnoth/wesnoth#8986 (master - f357b58 : Celtic Minstrel): The build has errored. 20160321 05:27:45< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117375408 20160321 05:27:45-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 05:28:01< celticminstrel> Okay, that's... possibly a slight improvement? 20160321 05:28:17 * celticminstrel looks more closely. 20160321 05:30:30< celticminstrel> Hmm... some X's, some !'. 20160321 05:30:36< celticminstrel> ^!'s 20160321 05:38:59-!- fendrin [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20160321 05:39:34< irker976> wesnoth: Celtic Minstrel wesnoth:master 9ff6d3e110c0 / src/tests/gui/test_gui2.cpp: Yet another fixup https://github.com/wesnoth/wesnoth/commit/9ff6d3e110c0ec18b0dd7a4ac7a057a00aa7213f 20160321 05:42:38< celticminstrel> I wish I didn't have to do these fixups one file at a time though. :/ 20160321 05:42:54-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 260 seconds] 20160321 05:43:47-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20160321 05:47:00< vultraz> [13:40:48] celticminstrel vultraz: Uhh... why the heck did you use the conditional operator as a statement instead of just using an if statement? 20160321 05:47:03< vultraz> bit neater 20160321 05:47:17< celticminstrel> I disagree. 20160321 05:47:19< vultraz> but I see shadowm says I should change it... 20160321 05:47:20< vultraz> dammit 20160321 05:47:28-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev 20160321 05:47:53< celticminstrel> Rule of thumb: Only use the conditional operator if you need to use it in a larger expression. 20160321 05:48:45< celticminstrel> I think I might've violated that rule once or twice in weird circumstances, mind you, but this is definitely not a weird circumstance, so you should use an if statement. 20160321 05:49:17< vultraz> for me it's nice to have stuff on 1/2 lines as opposed to 5 20160321 05:49:25< vultraz> I did test, btw 20160321 05:49:28< celticminstrel> I'm considering scaling all profiles to 300x300 using NN algorithm. 20160321 05:49:49< celticminstrel> Optimally they would be scaled based on your resolution, to fit into the available space. 20160321 05:49:50< vultraz> I think that's too small 20160321 05:49:54< vultraz> and yes, true 20160321 05:50:00< vultraz> I say 350 minimum 20160321 05:50:22< vultraz> and remember, you have to do imagew-n, imageh-n, since not all portraits are perfect squares 20160321 05:50:27< celticminstrel> The main reason for this is so that they're all the same size, BTZ. 20160321 05:50:35< celticminstrel> ^BTW 20160321 05:50:54< celticminstrel> [Mar 21@01:50:23am] vultraz: and remember, you have to do imagew-n, imageh-n, since not all portraits are perfect squares 20160321 05:50:55< celticminstrel> Huh? What? 20160321 05:51:01< vultraz> some are rectangular 20160321 05:51:16< celticminstrel> I know they're not all squares, but the IPF syntax doesn't support anything like that... 20160321 05:52:02< vultraz> you'll need to do the calculation in a variable 20160321 05:52:17< vultraz> optimally we'd have an IPF to scale only one dimension and preserve aspect ratio 20160321 05:52:19< vultraz> but we do not 20160321 05:52:22< celticminstrel> I don't know how to get the image size. 20160321 05:52:31< celticminstrel> Hmm. 20160321 05:52:31< vultraz> get_image 20160321 05:52:42< celticminstrel> Eh? 20160321 05:53:02< vultraz> image::get_image() 20160321 05:53:25< celticminstrel> This seems somehow inefficient. 20160321 05:53:31< vultraz> It is 20160321 05:53:44< vultraz> much better to add a fixed-aspect ratio IPF 20160321 05:53:47< celticminstrel> I have a better idea. I'll implement a new IPF. 20160321 05:53:52< vultraz> BTW 20160321 05:53:57< vultraz> I hope you're hardcoding this in help 20160321 05:54:04< vultraz> and not adding small_profile keys to every unit :P 20160321 05:54:13< celticminstrel> The scaling, yeah, that's being hardcoded. 20160321 05:54:23< celticminstrel> I added small_profile keys to some units. 20160321 05:54:47< celticminstrel> With the general intent of approximately preserving the look of the black-background portraits (minus the black background). 20160321 05:55:00< vultraz> I don't think that's necessary 20160321 05:55:14< vultraz> Again, the cropping was to solve an issue we no longer have 20160321 05:55:26< celticminstrel> Some thus have a pointless ~FL() which I might remove once I've previewed the results. 20160321 05:55:42< celticminstrel> I disagree that that's an issue we no longer have. 20160321 05:56:08< celticminstrel> Unless I'm misunderstanding what the issue is. 20160321 05:56:17< vultraz> *don't* add ~FL() to any unit 20160321 05:56:19< vultraz> do not 20160321 05:56:36< celticminstrel> I already have, but again, I'll likely remove them after previewing. 20160321 05:56:41< vultraz> there's already a hardcoded ~FL() in order to make sure the cropped side of the image faces the dialog edge 20160321 05:56:46< celticminstrel> Particularly since, yeah that. 20160321 05:57:02< vultraz> I guess on ones without a cropped edge that would be alright, but be cautious 20160321 05:58:50< vultraz> you'll be deleting all the small profile images too? 20160321 05:58:55< celticminstrel> Yup. 20160321 05:59:20< vultraz> good, good 20160321 06:01:23< vultraz> that should cut the size of core by a little 20160321 06:01:57< vultraz> currently images/portraits says 40 MB 20160321 06:02:17< celticminstrel> It's really a good thing I'm reviewing every single image. Some had typos and stuff. 20160321 06:02:27< celticminstrel> Like "portrats". 20160321 06:02:41< celticminstrel> (The small_profiles that is) 20160321 06:03:21< vultraz> uh, i thought I removed all the small_profile keys from units 20160321 06:03:28< celticminstrel> The ones I added. 20160321 06:03:32< vultraz> ah 20160321 06:05:18< vultraz> I wonder how easy adding wmllint rules for this will be 20160321 06:05:27< celticminstrel> No idea. 20160321 06:05:45< vultraz> do we have to list every portrait? 20160321 06:06:15< vultraz> or can we do something like portraits/*/transparent/*/*.png -> portraits/*/*.png 20160321 06:06:27< vultraz> not sure why python doesn't have those kind of whateveryoucallthose 20160321 06:06:31< vultraz> pattern matching? 20160321 06:06:33< vultraz> regxp? 20160321 06:06:52< celticminstrel> Oh, you mean for removing "transparent"... if you don't list every file, it would catch addon-local files too, but I dunno, that might be okay. 20160321 06:07:01< celticminstrel> Those are called globs, and Python does have them, somewhere. 20160321 06:07:36< celticminstrel> Globs are a type of regular expression, but they are not regex. 20160321 06:07:45< vultraz> we'll ask Elvish_Hunter 20160321 06:07:50< vultraz> he'll know 20160321 06:07:52< celticminstrel> (Bizarrely, some regexes are not regular expressions.) 20160321 06:08:23< vultraz> celticminstrel: I thought regex was an acronym for 'regular expression' :| 20160321 06:08:30< celticminstrel> It is. 20160321 06:08:46< celticminstrel> When "regex" was initially conceived, it was limited to regular expressions. 20160321 06:08:53< celticminstrel> Over time, more and more extensions were added. 20160321 06:09:15< celticminstrel> The particular extension that breaks regularity is backreferences. 20160321 06:09:25< celticminstrel> Not sure if that's the only one, but it's the main one. 20160321 06:09:47< celticminstrel> "regular" is a technical term in computer science for a category of languages that can be defined by regular expressions. 20160321 06:10:20< vultraz> oh 20160321 06:10:42< celticminstrel> But thanks to backreferences and possibly other features, regex can now describe languages that are not regular. 20160321 06:11:03< vultraz> i thought it was a standard string pattern matching syntax 20160321 06:11:16< celticminstrel> Regex is pretty old, I think. 20160321 06:11:24< celticminstrel> So yeah, it can be considered a standard/ 20160321 06:11:50< celticminstrel> There are many variations of it though. 20160321 06:13:29< celticminstrel> Somehow I always feel like the default goblin impaler portrait looks female. 20160321 06:13:55-!- aeonchild [enchilado@defocus/yummy/enchilado] has quit [Quit: Lost terminal] 20160321 06:14:07-!- aeonchild [enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20160321 06:14:17-!- Kwandulin [~Miranda@p200300760F7D73264516EC38D9590A10.dip0.t-ipconnect.de] has joined #wesnoth-dev 20160321 06:16:35< celticminstrel> So vultraz, is the CB project okay? wedge009, what about the VC project? 20160321 06:16:41< vultraz> looks like it's ok 20160321 06:18:18< vultraz> does build, yes 20160321 06:18:36< celticminstrel> This is the most important thing. 20160321 06:26:10< vultraz> celticminstrel: why did you move things to gui/core 20160321 06:26:13< vultraz> why not just gui/ 20160321 06:26:27< celticminstrel> No particular reason. 20160321 06:28:58< vultraz> i think the latter would be better 20160321 06:29:15< vultraz> but doesn't mattter 20160321 06:29:29< celticminstrel> I think we've had enough moving files around for awhile. 20160321 06:29:46< celticminstrel> I don't personally think either of the two is any better than the other. 20160321 06:34:25< celticminstrel> Whoa, I just discovered that help has navigation history. 20160321 06:38:45 * celticminstrel ponders the math of scaling into a bounding box while preserving aspect ratio... 20160321 06:39:49< Aginor> celticminstrel: it's a min(fit x, fit y) 20160321 06:40:03< Aginor> assuming you scale both to fit in one direction 20160321 06:40:09< Aginor> no 20160321 06:40:13< Aginor> I'm wrong 20160321 06:40:20 * Aginor goes away in shame 20160321 06:40:26< celticminstrel> ... 20160321 06:41:40< celticminstrel> Uh... thanks for trying? 20160321 06:44:28-!- Kwandulin [~Miranda@p200300760F7D73264516EC38D9590A10.dip0.t-ipconnect.de] has quit [Ping timeout: 250 seconds] 20160321 06:45:13-!- Kwandulin [~Miranda@p200300760F191CAA2C3EC0DEE2865EFC.dip0.t-ipconnect.de] has joined #wesnoth-dev 20160321 06:51:32 * Aginor comes back 20160321 06:51:37< Aginor> shame and ice cream 20160321 06:51:38< celticminstrel> Adding an IPF is surprisingly simple. 20160321 06:52:04< celticminstrel> I think I have the math now. Hopefully. 20160321 06:52:50< Aginor> hmm 20160321 06:52:54< celticminstrel> I calculate min(w/old_w, h/old_h) and then multiply both old_w and old_h by the result. 20160321 06:53:15< Aginor> that should work 20160321 06:53:45< celticminstrel> Hard to tell in the help browser, but it seems to. At least, the mermaid enchantress is no longer squashed. 20160321 06:54:34< Aginor> excellent 20160321 07:00:41< celticminstrel> Hmm, I just noticed it's 3:00 am. Abort! Sleep! 20160321 07:00:53< vultraz> :P 20160321 07:01:20-!- celticminstrel is now known as sleepyminstrel 20160321 07:01:57< vultraz> Aginor: so did you have any new insights on the label thing? 20160321 07:06:05< Aginor> vultraz: I've had a long day of work followed with having dinner and a bunch of sports administration 20160321 07:06:10< Aginor> so no 20160321 07:06:12< vultraz> ahh 20160321 07:06:23< vultraz> np 20160321 07:12:52< wedge009> celticminstrel: A new Core filter should be split off from Auxiliary, I think. Also, a typo on gui/gore/point.cpp and portrait.* is still present. 20160321 07:13:12< wedge009> I'm going to recreate the project - how many more changes are you intending to make? 20160321 07:14:05< wedge009> sleepyminstrel: Ah, you're sleeping, fine, I'll make the PR and you can check it when you're next on. 20160321 07:14:07< vultraz> wedge009: delete portrait.*pp's references 20160321 07:14:20-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20160321 07:15:24< vultraz> wedge009: btw, i sent you a project invite the other day 20160321 07:16:03< wedge009> vultraz: ...I don't think I received any invitation. On github? 20160321 07:16:11< vultraz> yes 20160321 07:16:28< vultraz> should see it if you go to gh.. 20160321 07:17:34< wedge009> I just rechecked it - I don't see anything. :/ Where would it show up? 20160321 07:19:16< vultraz> either email or gh 20160321 07:28:46-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20160321 07:47:29< shadowm> vultraz: The ternary operator returns a value. An if-else chain does not. 20160321 07:47:34< shadowm> Think about that. 20160321 07:48:35< wedge009> vultraz: Can you try again, please? 20160321 07:54:52< shadowm> vultraz: More generally, what you want to avoid is using operators* in ways that have side-effects, ternary operator included. 20160321 07:55:21< shadowm> e.g. `foo = bar + (baz = bat)` 20160321 07:56:01< shadowm> There are some situations where this kind of thing is virtually unavoidable but you'll recognize them when you see them. 20160321 07:56:25< shadowm> For the rest, compact code does not necessarily equal clean code. 20160321 07:57:16< shadowm> * (except for those operators that have built-in side-effects, including unary *, ->, ->*, ., .*, (), ++, --.) 20160321 08:37:01-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has joined #wesnoth-dev 20160321 08:41:53< loonycyborg> aquileia: perhaps you have something to comment on http://gna.org/bugs/?24519 ? 20160321 08:52:08-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has quit [Quit: Leaving.] 20160321 08:54:46-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has joined #wesnoth-dev 20160321 09:00:10-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has joined #wesnoth-dev 20160321 09:11:15-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has quit [Ping timeout: 264 seconds] 20160321 09:11:35-!- atarocch [~atarocch@151.64.75.215] has joined #wesnoth-dev 20160321 09:32:15< Elvish_Hunter> Hi all 20160321 09:32:26< Elvish_Hunter> 20160321 06:07:45< vultraz> we'll ask Elvish_Hunter 20160321 09:33:13< Elvish_Hunter> What's your question exactly? 20160321 09:36:05< Elvish_Hunter> 20160321 06:07:01< celticminstrel> Those are called globs, and Python does have them, somewhere. 20160321 09:38:23< Elvish_Hunter> celticminstrel: yes, Python supports globbing through the 'glob' module. It performs Bash-like expansion of these characters: *, ?, [] and (from Python 3.5) ** (this one is recursive) 20160321 09:51:07< vultraz> Elvish_Hunter: we're soon going to move portraits from core/images/portraits/*/transparent/ to just core/images/portraits/* 20160321 09:51:19< vultraz> was wondering how hard the wmllint rule would be 20160321 09:52:23-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has quit [Quit: ChipmunkV] 20160321 09:56:27< irker976> wesnoth: loonycyborg wesnoth:master ec7fcee4d0f0 / src/tests/ (5 files in 3 dirs): Made unit tests compile again https://github.com/wesnoth/wesnoth/commit/ec7fcee4d0f00bb6a79348056d9e1e9e838767db 20160321 09:57:36< Elvish_Hunter> So, for example, 'data/core/images/portraits/woses/transparent/wose.png' is going to become 'data/core/images/portraits/woses/wose.png'? 20160321 09:58:25< vultraz> yes 20160321 09:59:26< Elvish_Hunter> In that case, a string .replace("/transparent/", "/") might be enough. 20160321 10:06:58< Elvish_Hunter> Otherwise, this regex matches: '(.*)\/transparent\/(.*\.png)' and allows using re.sub() or re.subn() to perform the required substitution. 20160321 10:31:17-!- Kwandulin [~Miranda@p200300760F191CAA2C3EC0DEE2865EFC.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20160321 10:33:53-!- travis-ci [~travis-ci@ec2-54-144-82-39.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 10:33:54< travis-ci> wesnoth/wesnoth#8988 (master - ec7fcee : loonycyborg): The build has errored. 20160321 10:33:54< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117410258 20160321 10:33:54-!- travis-ci [~travis-ci@ec2-54-144-82-39.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 10:44:22< irker976> wesnoth: Charles Dang wesnoth:master 4d342447eaac / src/ (13 files in 8 dirs): Cleaned up inclusions of team.hpp https://github.com/wesnoth/wesnoth/commit/4d342447eaac115b8399c551002332f19519cbc9 20160321 10:49:53-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has joined #wesnoth-dev 20160321 10:49:58< vultraz> good idea 20160321 10:50:18< vultraz> I don't think people use transparent/ for anything but portraits, but it'd be a good idea to check 20160321 10:52:24< fendrin> vultraz: Do the paths need to change? I like to see the small versions go away, although the portraits you keep are still transparent. 20160321 10:52:36< vultraz> Yes 20160321 10:52:50< vultraz> Why would you keep them in an extra layer of folders for no reason 20160321 10:53:00< fendrin> Those who use the smaller non transparent ones 20160321 10:53:20< fendrin> will get an error message about missing images 20160321 10:53:43< fendrin> when you move they won't but use a different image silently. 20160321 10:54:17< vultraz> Not going to worry about that. 20160321 10:54:53< vultraz> I've already added compatibility code for type profiles 20160321 10:55:21< vultraz> In cases where they're using the portraits as arbitrary images, they can update the paths as necessary 20160321 10:56:03< fendrin> Maybe wmllint should replace those calls to the non transparent ones 20160321 10:56:29< vultraz> With what? 20160321 10:56:31< fendrin> with a line that does apply them on a black mask and scale into the old size 20160321 10:56:39< fendrin> using imagepath syntax 20160321 10:56:40< vultraz> ....no 20160321 10:57:28< irker976> wesnoth: Charles Dang wesnoth:master e7ea0a88c205 / src/gui/dialogs/ (data_manage.hpp game_load.hpp unit_create.hpp): Forward-declare widget classes in a few dialogs https://github.com/wesnoth/wesnoth/commit/e7ea0a88c2051136b8f5335a9a09aeed4b1342b1 20160321 10:57:33< vultraz> That's way too intrusive a change 20160321 10:58:31< fendrin> I thought quite the opposite. Doesn't it preserve the old behaviour? 20160321 10:59:43< shadowm> 07:33:23 shadowm: can you please do a grep for "transparent" on the 1.12 and 1.10 add-ons servers? I need to check if there are some corner cases where the possible new wmllint rules might fail. 20160321 10:59:49< shadowm> Elvish_Hunter: Am I supposed to take this literally? 20160321 11:00:43< shadowm> I'd prefer if you could hand me a(n extended) regular expression to pass to grep that'd make the output relatively noise-free. 20160321 11:01:06< shadowm> Or I could just go and use just "transparent" but then you don't get to blame me for false positives. 20160321 11:01:24< vultraz> "/transparent" would be better 20160321 11:01:40< Elvish_Hunter> Yes, I'm interested in the false positives. 20160321 11:01:47< shadowm> vultraz has the right idea I think. 20160321 11:02:04< shadowm> Okay, so you actually want it to be as ambiguous as possible? Don't say I didn't warn you. 20160321 11:03:04< Elvish_Hunter> Yes. 20160321 11:07:16< shadowm> :I 20160321 11:08:38< shadowm> Elvish_Hunter: How good is your Internet connection? 20160321 11:08:54< Elvish_Hunter> 8MB ADSL. 20160321 11:09:16< shadowm> There's no such a thing as an 8MB connection. 20160321 11:09:41< Elvish_Hunter> Well, 8 megabit. It was a typo. 20160321 11:09:58< shadowm> Perhaps you mean one of: 8 megabits/second (Mbps, Mb/s), 8 megabytes/second (MB/s), 8 mebibytes/second (MiB/s). 20160321 11:10:16< Elvish_Hunter> Yes, 8 Mbps. 20160321 11:10:36< shadowm> Okay, then I surmise you won't mind downloading a 3.4 MiB file: http://files.wesnoth.org/transparent-1.10-1.12-1.13 20160321 11:11:00< vultraz> holy crap 20160321 11:11:02< shadowm> I can gzip it otherwise. 20160321 11:11:31< shadowm> vultraz: Like, what did you expect dude. 20160321 11:12:23-!- Kwandulin [~Miranda@p200300760F191CAA5053F6E1D38B9A52.dip0.t-ipconnect.de] has joined #wesnoth-dev 20160321 11:12:46< Elvish_Hunter> Already downloaded. 20160321 11:13:00< shadowm> The good news is that you can trivially filter it down further. ;) 20160321 11:13:42< Elvish_Hunter> Heh, that's exactly the reason why I asked for an ambiguous expression. I had a plan :P 20160321 11:14:44-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has joined #wesnoth-dev 20160321 11:14:55< irker976> wesnoth: Charles Dang wesnoth:master cb992e88b05d / / (8 files in 5 dirs): Removed Data Manage dialog https://github.com/wesnoth/wesnoth/commit/cb992e88b05d4d7799a9b7e0fc1370cd4a4990f6 20160321 11:15:03< shadowm> Also, it's worth noting that wesnoth_addon_manager (the Python client) can download add-ons with ids matching a regular expression, which obviously means you can download everything at once if you want. 20160321 11:15:32< vultraz> Whatever that dialog was intended to do, it never did it. 20160321 11:15:54< shadowm> That is, if you don't mind giving baldras a bad time if it's backup time (like right now). 20160321 11:17:10< shadowm> Or downloading several ludicrously-sized add-ons (TLU and its resources add-on amounted to something like 100 MiB last time I checked I think). 20160321 11:17:27 * shadowm out. 20160321 11:22:44-!- travis-ci [~travis-ci@ec2-54-146-28-124.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 11:22:45< travis-ci> wesnoth/wesnoth#8989 (master - 4d34244 : Charles Dang): The build has errored. 20160321 11:22:45< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117418819 20160321 11:22:45-!- travis-ci [~travis-ci@ec2-54-146-28-124.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 11:49:18-!- travis-ci [~travis-ci@ec2-54-161-253-28.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 11:49:19< travis-ci> wesnoth/wesnoth#8990 (master - e7ea0a8 : Charles Dang): The build has errored. 20160321 11:49:19< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117421236 20160321 11:49:19-!- travis-ci [~travis-ci@ec2-54-161-253-28.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 11:53:11-!- Elvish_Hunter [~elvish_hu@wesnoth/developer/elvish-hunter] has left #wesnoth-dev ["Ciao!"] 20160321 11:59:14-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has quit [Quit: ChipmunkV] 20160321 12:19:28-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev 20160321 12:19:59-!- Kwandulin [~Miranda@p200300760F191CAA5053F6E1D38B9A52.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20160321 12:24:19-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 12:24:20< travis-ci> wesnoth/wesnoth#8991 (master - cb992e8 : Charles Dang): The build has errored. 20160321 12:24:20< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117424612 20160321 12:24:20-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 12:26:02-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection] 20160321 12:26:15-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev 20160321 12:32:53-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has quit [Ping timeout: 244 seconds] 20160321 12:52:12-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20160321 13:07:28< sleepyminstrel> wedge009: I've finished the moving-files-around changes, so no need to worry about that. 20160321 13:07:30< sleepyminstrel> vultraz: Do you have any idea what that dialog was even for? 20160321 13:07:38-!- sleepyminstrel is now known as celticminstrel 20160321 13:26:51< wedge009> celticminstrel: PR #634 to cope with your big files move. 20160321 13:27:43-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has joined #wesnoth-dev 20160321 13:29:23-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has joined #wesnoth-dev 20160321 13:29:44< irker976> wesnoth: Wedge009 wesnoth:master e48b74dbb9e9 / projectfiles/VC9/wesnoth.vcproj: VC Project Update https://github.com/wesnoth/wesnoth/commit/e48b74dbb9e9d470467eee2969670854928cf0d1 20160321 13:29:46< irker976> wesnoth: Celtic Minstrel wesnoth:master 72c5abc87e8e / projectfiles/VC9/wesnoth.vcproj: Merge pull request #634 from Wedge009/vc_project https://github.com/wesnoth/wesnoth/commit/72c5abc87e8e3f55548f2491bd0d286a2c68a81a 20160321 13:42:22-!- Kwandulin [~Miranda@p200300760F191C3B1C0BBF9EB3F82D9C.dip0.t-ipconnect.de] has joined #wesnoth-dev 20160321 13:50:16-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20160321 13:57:00-!- gfgtdf [~chatzilla@f054049134.adsl.alicedsl.de] has joined #wesnoth-dev 20160321 13:57:21< gfgtdf> celticminstrel: the file map/utils.hpp seems to be unrelated to maps 20160321 13:57:40< celticminstrel> :/ 20160321 13:58:08< celticminstrel> Oops? 20160321 13:59:04< celticminstrel> I'll revert that one then. 20160321 14:02:39-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20160321 14:03:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20160321 14:06:24< mattsc> Okay, I admit defeat. Too tired to figure it out what I’m not thinking about. Somehow “my branch and master have diverged”. All I want to do is get my local repository and Wesnoth master aligned again, I don’t need to keep anything of my local changes. 20160321 14:06:32< mattsc> What’s the easiest way of doing this? 20160321 14:07:10< celticminstrel> I'm not sure what the easiest way is, but I know one or two ways. 20160321 14:07:36< mattsc> Well, any of them then. 20160321 14:07:48< mattsc> As long as it’s easy enough. :P 20160321 14:07:51< celticminstrel> The first thing I would suggest is using --force with git pull. 20160321 14:08:04< celticminstrel> I've heard that works but never actually remembered to try it. 20160321 14:08:32< mattsc> Just tried, it doesn’t. 20160321 14:08:45< mattsc> Gives me the same merge conflicts as a non-forced pull. 20160321 14:08:50< celticminstrel> Okay. 20160321 14:09:16< celticminstrel> First 'git fetch' from wherever you were pulling from. 20160321 14:10:07< celticminstrel> Then... I think 'git reset --hard FETCH_HEAD' should get your current branch to that point; or 'git checkout -B whatever_branch FETCH_HEAD" if it's a different branch. 20160321 14:10:18< celticminstrel> I've had problems with the former before, not sure why. 20160321 14:11:16< mattsc> Ah, yes, thank you! The first worked. 20160321 14:11:31< mattsc> I’d tried that without the FETCH_ ... 20160321 14:11:42< mattsc> I really should spend half an hour sometime actually learning git. :P 20160321 14:12:00< celticminstrel> Without the FETCH_ it would just discard any local changes. 20160321 14:12:13< celticminstrel> Since HEAD is automatically whatever your current checkout is. 20160321 14:12:36< celticminstrel> That makes it sound like it works the opposite of how it does. 20160321 14:13:16< mattsc> I see. 20160321 14:13:45< mattsc> Thanks, celticminstrel 20160321 14:17:01< mattsc> celticminstrel: have you updated the Xcode build yet? It just failed (on master) with a ‘file not found’. (gui/dialogs/data_manage.cpp) 20160321 14:17:16< celticminstrel> mattsc: That was vultraz since. 20160321 14:17:24< celticminstrel> Not my fault. 20160321 14:18:07< mattsc> It doesn’t really matter to me whose fault it is ;) , just wondering if it’s something that you usually do or who does these days? 20160321 14:18:25< celticminstrel> I usually update the XCode project, yeah. 20160321 14:18:48< celticminstrel> But feel free to do it yourself in this case. 20160321 14:19:03< mattsc> Okay. I’ll leave it to you then. 20160321 14:19:56< mattsc> I can do it too, if you prefer, but right now I’m off again. 20160321 14:20:13< celticminstrel> I don't particularly care either way. 20160321 14:23:28< zookeeper> wedge009, so what did you have to do to make that project file update? is there some kind of smart thingy that can locate moved files or something? because i hope you didn't have to do it by hand. 20160321 14:24:05-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20160321 14:24:35< celticminstrel> zookeeper: I'd already done most of the work in updating file references. 20160321 14:24:55< celticminstrel> The VC project can be edited without having Visual Studio. It's just an XML file. 20160321 14:30:57-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 14:30:58< travis-ci> wesnoth/wesnoth#8993 (master - 72c5abc : Celtic Minstrel): The build has errored. 20160321 14:30:58< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117449457 20160321 14:30:58-!- travis-ci [~travis-ci@ec2-54-145-124-147.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 14:31:50< celticminstrel> Whoa, Northern Rebirth's portraits are kinda bad. 20160321 14:34:06< zookeeper> yes they are 20160321 14:34:16< celticminstrel> ...UtBS's are worse. o.o 20160321 14:34:20< zookeeper> no they aren't! 20160321 14:34:26< zookeeper> how can you even say that 20160321 14:34:48< celticminstrel> Because... they are... 20160321 14:35:14< celticminstrel> Well... okay, at least they're more consistent though. 20160321 14:35:16< zookeeper> they're all nice, except maybe zhul since she looks like she's a few screws loose 20160321 14:36:22< celticminstrel> Is LordBob redoing those in addition to the new desert elf portraits? 20160321 14:36:46< zookeeper> of course 20160321 14:37:23< celticminstrel> The only campaign with non-transparent portraits was Dead Water. 20160321 14:38:30< celticminstrel> Maybe I should check MP, but I doubt they'd have portraits. 20160321 14:38:44< celticminstrel> Yeah. 20160321 14:38:49< celticminstrel> Nothing. 20160321 14:48:57< celticminstrel> Once I've pushed, my project for the day is updating the wiki. 20160321 14:50:43< celticminstrel> I kinda like box=yes, but I'm guessing vultraz would disagree. 20160321 14:50:53< celticminstrel> And it does look fine without it, as well. 20160321 14:52:36< celticminstrel> Ah, using box=yes is bad because it makes it obvious when the portraits are different sizes due to being non-square. Great for testing though. 20160321 14:54:21-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20160321 14:55:33< celticminstrel> Huh, Royal Warrior has no portrait. 20160321 14:59:18< celticminstrel> There's a fire dragon portrait in SoF but not in core. 20160321 14:59:51-!- prkc [~prkc@192.40.89.11] has quit [Ping timeout: 264 seconds] 20160321 15:01:30< vultraz> celticminstrel: no no no don't use box 20160321 15:01:57< celticminstrel> vultraz: Yeah, not planning to. Tried it, discovered it did bad things. 20160321 15:02:24< vultraz> :) 20160321 15:02:25< vultraz> also 20160321 15:02:27< vultraz> [00:07:26] sleepyminstrel vultraz: Do you have any idea what that dialog was even for? 20160321 15:02:32< vultraz> as far as I could tell, nothing 20160321 15:02:42< vultraz> you actually could access it in-game via ;manage 20160321 15:02:55< vultraz> but all it was was a list of savegames and three buttons, only one of which worked 20160321 15:03:04< vultraz> that one being one which deleted the save 20160321 15:03:20< celticminstrel> What were the other two buttons? 20160321 15:04:19< vultraz> they were labeled Backup and uh.. something else 20160321 15:04:24< vultraz> weren't implemented 20160321 15:05:25< celticminstrel> Hmm. How do I get current resolution... 20160321 15:05:44< vultraz> of the window? 20160321 15:05:52< celticminstrel> Whoa whoa whoa what's with the indentation in this file. 20160321 15:05:54< celticminstrel> Yes. 20160321 15:06:18< vultraz> CVideo::current_resolution() 20160321 15:07:52-!- noy_ [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20160321 15:08:04-!- mjs-de [~mjs-de@x5ce42577.dyn.telefonica.de] has joined #wesnoth-dev 20160321 15:10:25-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 244 seconds] 20160321 15:10:26-!- noy_ is now known as noy 20160321 15:13:10-!- prkc [~prkc@gateway/vpn/privateinternetaccess/prkc] has joined #wesnoth-dev 20160321 15:15:10-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20160321 15:25:01< vultraz> celticminstrel: FYI, after UtBS's portraits are done, we'll see about commissioning NR's 20160321 15:25:21< vultraz> Finances determined UtBS has priority 20160321 15:25:28< vultraz> and I do agree 20160321 15:35:42< celticminstrel> BTW vultraz, in removing "transparent/" you missed Dead Water. 20160321 15:35:50< vultraz> oh? 20160321 15:36:24< celticminstrel> Yeah, it had a non-transparent brawler and (for some reason) king. 20160321 15:36:38< vultraz> do include that 20160321 15:36:48< celticminstrel> ...oh, I guess there's a unique leader unit, so the non-transparent king would've been used. 20160321 15:37:01< celticminstrel> Anyway, yeah, I fixed them. 20160321 15:37:02-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20160321 15:43:49-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20160321 15:43:57-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection] 20160321 15:44:04-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20160321 15:50:18-!- Kwandulin [~Miranda@p200300760F191C3B1C0BBF9EB3F82D9C.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20160321 15:58:36< gfgtdf> celticminstrel: s ther a reason why you used '1.0d' literals in your formula functions ? 20160321 15:58:47< gfgtdf> celticminstrel: '1.0l' i mean 20160321 15:58:57< celticminstrel> Uh. I don't remember. 20160321 15:59:10< celticminstrel> "1.0l" would be of type long double. 20160321 15:59:16< celticminstrel> What's the context? 20160321 16:00:20< gfgtdf> forula.cpp 20160321 16:00:23< gfgtdf> formula.cpp 20160321 16:00:30< celticminstrel> Line? 20160321 16:02:16< celticminstrel> "Not found" 20160321 16:02:44< gfgtdf> celticminstrel: my bad, its formula/function.cpp 20160321 16:02:51< celticminstrel> Oh, found it. 20160321 16:03:19< celticminstrel> I think I just wanted to specify that it used the maximum precision available, or something. 20160321 16:03:38< celticminstrel> 1/3 especially is unrepresentable in IEEE floating-point. 20160321 16:04:13< celticminstrel> Then again, it's passed to pow, which takes a double, so I guess it's pointless. 20160321 16:04:20< gfgtdf> celticminstrel: hmm it breaks msvc compilation, i think the reason is that the first parmeter id youble and teh secind is long adouble. 20160321 16:04:42< celticminstrel> Oh hey, powl exists. 20160321 16:05:20< celticminstrel> gfgtdf: So are you saying that your version of pow is a template? 20160321 16:05:26< celticminstrel> That would be... kind of weird. 20160321 16:05:53< gfgtdf> celticminstrel: no it says i doesn'T know which overloaded version to choose 20160321 16:06:26< celticminstrel> Oh, so your pow is overloaded for long double while mine (for some reason) isn't. 20160321 16:15:21-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20160321 16:19:58-!- louis94 [~~louis94@91.178.242.13] has joined #wesnoth-dev 20160321 16:29:57-!- irker976 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20160321 16:35:27-!- irker771 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20160321 16:35:27< irker771> wesnoth: gfgtdf wesnoth:master 1094db6871c0 / src/ (formula/formula.cpp formula/function.cpp lua/ldo.cpp): fix msvc build https://github.com/wesnoth/wesnoth/commit/1094db6871c0deb74dbdc365d30938b0bf425483 20160321 16:36:43-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has quit [Remote host closed the connection] 20160321 16:37:50-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev 20160321 16:40:07< celticminstrel> If that issue is what I think it is, I would've instead used #undef CAT and #undef IN. 20160321 16:51:42-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai] 20160321 16:54:24-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20160321 16:54:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20160321 16:55:26-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20160321 16:55:54< irker771> wesnoth: Celtic Minstrel wesnoth:master 633b0d7d4c1e / changelog src/image_modifications.cpp src/image_modifications.hpp: Add new ~SCALE_INTO(w,h) IPF https://github.com/wesnoth/wesnoth/commit/633b0d7d4c1e4c13b98275c596178c9b4addc82d 20160321 16:55:56< irker771> wesnoth: Celtic Minstrel wesnoth:master 60a819f17e0d / data/ (415 files in 40 dirs): Remove all non-transparent portrait images https://github.com/wesnoth/wesnoth/commit/60a819f17e0dd9be0fe231a825971c4032ac3e52 20160321 16:55:58< irker771> wesnoth: Celtic Minstrel wesnoth:master c2e216be5a8d / data/core/units/ (11 files in 6 dirs): Tweak some small_profiles https://github.com/wesnoth/wesnoth/commit/c2e216be5a8dce7abc6f5ed3b4226599c7203b00 20160321 16:56:00< irker771> wesnoth: Celtic Minstrel wesnoth:master c55d7cb50a41 / src/help/help_topic_generators.cpp: Reformat unit_topic_generator https://github.com/wesnoth/wesnoth/commit/c55d7cb50a41d53497ffb1610bed02fcc5d1039c 20160321 16:56:02< irker771> wesnoth: Celtic Minstrel wesnoth:master 2449dcf65b7a / src/help/help_topic_generators.cpp: Scale portraits to uniform size in help https://github.com/wesnoth/wesnoth/commit/2449dcf65b7afab02e32aa889cc4070b8e67a7e6 20160321 16:56:04< irker771> wesnoth: Celtic Minstrel wesnoth:master e805a387357d / src/ (events.cpp events.hpp gui/dialogs/preferences_dialog.cpp): Fix preferences not recentering on resolution switch https://github.com/wesnoth/wesnoth/commit/e805a387357dc428d27cc3adf7fb7219e97e5237 20160321 16:56:06< irker771> wesnoth: Celtic Minstrel wesnoth:master d49ef6be41d2 / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Update XCode project https://github.com/wesnoth/wesnoth/commit/d49ef6be41d235543a3ba9c5c1d04354876ee933 20160321 16:56:08< irker771> wesnoth: Celtic Minstrel wesnoth:master 931376954bdb / / (6 files in 6 dirs): Remove map_utils.hpp https://github.com/wesnoth/wesnoth/commit/931376954bdb08087c1cd19106ce150152e5ba98 20160321 16:57:08< celticminstrel> Aginor: Please review e805a387357d 20160321 16:57:24< matthiaskrgr> -7 MB, hmm 20160321 16:57:37< celticminstrel> ? 20160321 16:57:47-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection] 20160321 16:58:05< celticminstrel> Is that the result of removing the non-transparent portraits? 20160321 16:58:06< matthiaskrgr> your last push reduces data size by 7 MB :p 20160321 16:58:11< matthiaskrgr> likely, yes 20160321 16:58:11< celticminstrel> Fun. 20160321 16:58:24< matthiaskrgr> ( c0afb53..9313769 ) 20160321 16:58:37-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 248 seconds] 20160321 16:58:38-!- wedge010 is now known as wedge009 20160321 16:59:02< matthiaskrgr> 370 binary files changed 44100551 b (42 Mb) -> 36686308 b (34 Mb) => [-7414243 b (-7 Mb)] 20160321 17:12:02-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20160321 17:12:22< vultraz> I've sent a PM to LB informing him he no longer needs to provide small profile images 20160321 17:13:44< celticminstrel> We can probably let zookeeper decide whether small profiles should be cropped. 20160321 17:13:54-!- travis-ci [~travis-ci@ec2-54-158-81-19.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 17:13:55< travis-ci> wesnoth/wesnoth#8994 (master - 1094db6 : gfgtdf): The build has errored. 20160321 17:13:55< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117495596 20160321 17:13:56-!- travis-ci [~travis-ci@ec2-54-158-81-19.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 17:14:10< celticminstrel> Keeping in mind that they'll be scaled as small as 200x200. 20160321 17:14:30< celticminstrel> And no larger than 400x400. 20160321 17:16:53< vultraz> hmmmm 20160321 17:16:58< vultraz> what scaling algo did you use? 20160321 17:17:06< celticminstrel> Nearest neighbour. 20160321 17:17:30< vultraz> I'm noticing some small distortions in the scaled portraits 20160321 17:17:55< celticminstrel> Maybe my math was a bit off... 20160321 17:18:10< celticminstrel> Or rather, maybe it's not sufficiently precise. 20160321 17:18:47< celticminstrel> Note that it's technically impossible to exactly preserve aspect ratio since we're limited to integer dimensions. 20160321 17:19:00< celticminstrel> Though I don't think that would cause any noticeable distortions. 20160321 17:19:24< vultraz> integer dimensions? 20160321 17:19:38< celticminstrel> Yes, you can't have an image that is 2.7 pixels wide, for example. 20160321 17:19:49< vultraz> why would you want such a thing 20160321 17:19:56< celticminstrel> I dunno. 20160321 17:20:33< celticminstrel> But exactly preserving aspect ratio in all cases would require it. I don't think the inexactness would be noticeable though, except maybe with very small sizes (like, sprite sizes). 20160321 17:21:34< vultraz> celticminstrel: using scale_surface as opposed to scale_surface_sharp results in much better-looking images 20160321 17:21:37< celticminstrel> If you want, you can look for scale_into in image_modifications.cpp to see what I'm doing to preserve aspect ratio. 20160321 17:21:44< celticminstrel> Oh, you already found it. 20160321 17:21:53< vultraz> I wasn't referring to distortions of ratio 20160321 17:22:10< celticminstrel> vultraz: If you want to do that, then I suggest adding an additional image mod so that both regular and NN have an _into version. 20160321 17:22:49< celticminstrel> I figured "NN is probably better, not much point adding both", but I guess maybe they both have advantages. 20160321 17:22:58< vultraz> celticminstrel: I'm wondering, shouldn't this sort of thing respect the preference set in preference 20160321 17:23:10< vultraz> preferences 20160321 17:23:36< vultraz> then again, if we did that, we'd be using xbrz+nn which doesn't work... 20160321 17:23:43< vultraz> those preferences are misleading 20160321 17:24:28< vultraz> either way, I don't think a new ipf is needed 20160321 17:24:36< celticminstrel> I suggest moving ImagePathFunctionWML to ImagePathFuntions - they have nothing to do with WML. 20160321 17:25:01< celticminstrel> vultraz: SCALE_SHARP is new in 1.13.0. We should probably check the rationale for adding it. 20160321 17:25:04-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection] 20160321 17:25:11< vultraz> ask iceiceice 20160321 17:25:14< vultraz> he added it, I believe 20160321 17:25:33< celticminstrel> If there's a reason to have separate SCALE and SCALE_SHARP, there may be a reason to do the same for SCALE_INTO and SCALE_SHARP_INTO. 20160321 17:27:38< vultraz> good point 20160321 17:27:46< vultraz> so you want me to duplicate the IPF? 20160321 17:27:55< celticminstrel> That's what I was suggesting, yes. 20160321 17:28:04< vultraz> alright 20160321 17:28:34< celticminstrel> And update the changelog, because I've already got an entry for the new IPF. 20160321 17:31:50< vultraz> why does each modification get its own class o_O 20160321 17:32:54< vultraz> how come none of this is templated 20160321 17:33:32< celticminstrel> Why would it be templated? 20160321 17:33:52< wedge009> zookeeper: Had to replicate all the file movements in VC9. 20160321 17:34:20< celticminstrel> ...even though I updated most of them? 20160321 17:34:34< celticminstrel> Or you mean moving files from one filter to another? 20160321 17:34:35< vultraz> I dunno, but it seems inefficient to replicate the entire IPF just to have one line different 20160321 17:35:04< celticminstrel> Sure. 20160321 17:36:05< celticminstrel> Perhaps a small improvement could be made by making the various scaling ones inherit from a common superclass, but I don't think that would affect the IPF registration system as a whole. 20160321 17:37:46< zookeeper> wedge009, O.o okay... 20160321 17:39:54< wedge009> Mainly moving to the new filters, yes. Plus there were some mistakes. 20160321 17:41:43< irker771> wesnoth: Charles Dang wesnoth:master 23be0d74f39b / changelog src/image_modifications.cpp src/image_modifications.hpp: Change SCALE_INTO() to use BI and added SCALE_INTO_SHARP() which uses NN https://github.com/wesnoth/wesnoth/commit/23be0d74f39bc3ec407f13d7b8d47a3d9894b768 20160321 17:42:08< zookeeper> and what was that about NN on portraits? why would anyone do that 20160321 17:42:08< vultraz> will look into simplifying the scaling IPFs 20160321 17:42:40< vultraz> zookeeper: celticminstrel implemented SCALE_INTO using NN, but it looked bad for portraits, so I made it use BI instead 20160321 17:42:43 * celticminstrel doesn't really understand the difference between the scaling algorithms. 20160321 17:42:50< celticminstrel> What does BI stand for... 20160321 17:43:20< vultraz> Bilinear Interpolation 20160321 17:43:26< zookeeper> vultraz says it's "bilinear interlopation scaling" :p 20160321 17:43:30< celticminstrel> Ah. 20160321 17:43:54-!- louis94 [~~louis94@91.178.242.13] has quit [Ping timeout: 260 seconds] 20160321 17:44:16< vultraz> so yeah, portraits look good now :) 20160321 17:44:26< zookeeper> as for NR, i question the judgement of anyone who'd rather commission a full portrait set for it instead of finally dropping it from mainline :p 20160321 17:44:54-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 17:44:55< travis-ci> wesnoth/wesnoth#8995 (master - 9313769 : Celtic Minstrel): The build has errored. 20160321 17:44:55< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117501133 20160321 17:44:55-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 17:45:13< celticminstrel> What's the difference between ~ADJUST_ALPHA() and ~O()? 20160321 17:47:32 * zookeeper doesn't know 20160321 17:48:05< zookeeper> ~O isn't said to be limited to <=1, so maybe you can use values >1 with that 20160321 17:49:14< zookeeper> but aside from that they sure seem to be described as doing the same thing, just with different input values 20160321 17:49:16< celticminstrel> Based on the descriptions, I think they are in fact different, but it's not obvious how. 20160321 17:49:43< celticminstrel> Though they might actually be the same. 20160321 17:49:48< zookeeper> "or an integer from 0 to 255, in which case it is divided by 255 and reinterpretted as a %" <- so if you use 255 that results in 1%? :p 20160321 17:50:12< celticminstrel> Probably not. :P 20160321 17:50:43< zookeeper> ImagePathFunctionWML has an annoying problem though in that the functions are not named in the contents table 20160321 17:51:38< celticminstrel> I'm doing a bit of cleanup there, so I can fix that (or you can if you want). 20160321 17:51:51< zookeeper> i wouldn't mind if you do 20160321 17:53:35< zookeeper> format should probably be something like "10 Color-shift function" -> "10 ~CS: Color-shift function" 20160321 17:54:24< celticminstrel> I was going to group them into categories, too. 20160321 17:54:25-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20160321 17:54:30< zookeeper> yeah, that's good 20160321 17:54:58-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20160321 17:56:03< irker771> wesnoth: Charles Dang wesnoth:master 596a52922999 / README.md: Small README text update https://github.com/wesnoth/wesnoth/commit/596a529229997e70002b1260cd6d49f30f16e219 20160321 17:57:11-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20160321 17:58:00< vultraz> I'm going to try to make the scaling IPFs work on one class 20160321 17:58:37-!- louis94 [~~louis94@91.178.242.13] has joined #wesnoth-dev 20160321 18:00:11< vultraz> eh.. hm.. might not be so simple 20160321 18:01:39 * vultraz isn't sure what to do with the virtual () operator 20160321 18:02:19< celticminstrel> It's the same as any other function. 20160321 18:04:17-!- Kwandulin [~Miranda@p200300760F191C3BC8E4E1FB713D00C4.dip0.t-ipconnect.de] has joined #wesnoth-dev 20160321 18:07:16< celticminstrel> Heh, typo in changelog. 20160321 18:07:46< celticminstrel> Do you want me to do the IPF consolidation? 20160321 18:17:40-!- gfgtdf [~chatzilla@f054049134.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 45.0.1/20160315153207]] 20160321 18:19:11-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection] 20160321 18:20:39-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 18:20:40< travis-ci> wesnoth/wesnoth#8996 (master - 23be0d7 : Charles Dang): The build has errored. 20160321 18:20:40< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117511684 20160321 18:20:40-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 18:21:55-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20160321 18:25:33-!- louis94 [~~louis94@91.178.242.13] has quit [Ping timeout: 240 seconds] 20160321 18:29:21-!- mjs-de [~mjs-de@x5ce42577.dyn.telefonica.de] has quit [Ping timeout: 244 seconds] 20160321 18:43:00< vultraz> celticminstrel: eh, why not 20160321 18:44:51-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 248 seconds] 20160321 18:47:26-!- ancestral [~ancestral@209.181.254.220] has joined #wesnoth-dev 20160321 18:51:08-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20160321 18:52:30-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 18:52:31< travis-ci> wesnoth/wesnoth#8997 (master - 596a529 : Charles Dang): The build has errored. 20160321 18:52:31< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117515471 20160321 18:52:31-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 18:55:13-!- ancestral [~ancestral@209.181.254.220] has quit [Quit: i go nstuf kthxbai] 20160321 18:55:39-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 260 seconds] 20160321 19:05:25-!- louis94 [~~louis94@91.178.242.13] has joined #wesnoth-dev 20160321 19:09:54-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20160321 19:13:56< irker771> wesnoth: Charles Dang wesnoth:master 2f8f3af61b0f / data/gui/ (macros/_initial.cfg widget/combobox_default.cfg widget/window_default.cfg): More design tweaks to windows and borders https://github.com/wesnoth/wesnoth/commit/2f8f3af61b0f5a13a00e0281f86aa5ce09d61903 20160321 19:16:51< irker771> wesnoth: Charles Dang wesnoth:master 594af9e15afc / data/gui/widget/toggle_panel_default.cfg: Added a hovered effect to toggle panels https://github.com/wesnoth/wesnoth/commit/594af9e15afc6fa60c878817f33c2b96dffc1446 20160321 19:17:02< vultraz> celticminstrel: ^ tell me if you think that looks good 20160321 19:22:46< irker771> wesnoth: Charles Dang wesnoth:master a3bae34562d7 / data/gui/window/game_version.cfg: tgame_version: very slight layout fix https://github.com/wesnoth/wesnoth/commit/a3bae34562d7da2f0e741c4f47ff1116211e196a 20160321 19:25:13< celticminstrel> You'll need to give me an easy way to find a toggle panel. 20160321 19:25:28< vultraz> uhhh... 20160321 19:25:29< vultraz> any listbox? 20160321 19:25:32< vultraz> campaigns? 20160321 19:25:34< vultraz> prefs? 20160321 19:25:35< vultraz> load game? 20160321 19:25:37< celticminstrel> 'kay 20160321 19:28:49< celticminstrel> Any other little things for me to do? 20160321 19:29:09< vultraz> nope 20160321 19:29:40< celticminstrel> I suppose there's always the Lua unit thing. 20160321 19:31:40-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20160321 19:34:01< celticminstrel> Hover effect looks good to me. Portraits do look better with BI. 20160321 19:34:07-!- mjs-de [~mjs-de@wh.Uni-Dortmund.DE] has joined #wesnoth-dev 20160321 19:34:28< vultraz> :D 20160321 19:35:36< vultraz> celticminstrel: I do notice a few problems with scaling certain effects, sadly 20160321 19:35:41< vultraz> but that's hopefully minor 20160321 19:35:53< vultraz> (see: Mage of Light) 20160321 19:36:35< vultraz> I wonder if I we can fix that, though... 20160321 19:38:18< vultraz> DAMMIT 20160321 19:38:18< celticminstrel> Okay, so yeah, ~ADJUST_ALPHA() does the exact same thing as ~O(). 20160321 19:38:22< vultraz> clicked Rebuild :| 20160321 19:38:48< vultraz> celticminstrel: remove the former? 20160321 19:39:00< celticminstrel> zookeeper: It's new in 1.13.0, do you think it's safe to remove it? Or should I leave it in and just clean out the duplicate code? 20160321 19:39:15 * celticminstrel is talking about ~ADJUST_ALPHA() here, of course. 20160321 19:39:24< vultraz> it's a dev cycle, we can remove stuff at will 20160321 19:39:37< zookeeper> ask whoever added it what the rationale was 20160321 19:40:27< celticminstrel> I think that's iceiceice. 20160321 19:40:36< vultraz> yes 20160321 19:40:44< vultraz> but he's not here 20160321 19:40:51 * celticminstrel just did a git blame to find out. 20160321 19:41:36< vultraz> celticminstrel: er... wait a sec 20160321 19:41:40< vultraz> (OT to alpha) 20160321 19:41:44< celticminstrel> ? 20160321 19:42:18< vultraz> scale_surface_sharp: "Scale a surface using *modified* nearest neighbour algorithm. Use only if preserving sharp edges is a priority (e.g. minimap)." 20160321 19:42:29< vultraz> don't we want scale_surface_nn? 20160321 19:42:56< vultraz> of is it deliberate to scale with sharp when using SCALE_SHARP 20160321 19:42:58< vultraz> or* 20160321 19:43:05< celticminstrel> I think it's in the name. 20160321 19:44:36< vultraz> alright, let's assume that 20160321 19:45:04< zookeeper> yeah i can't find any further description or rationale for ADJUST_ALPHA anywhere 20160321 19:48:59< zookeeper> but think of it this way: maybe it was added because it's a tiny bit clearer or more intuitive in some way and it was supposed to supercede ~O. like, progress and stuff. 20160321 19:49:38< celticminstrel> Well, it does take its input slightly differently. ~O() takes a float or a percentage, ~ADJUST_ALPHA() takes an int or a percentage. 20160321 19:49:42< vultraz> you're the only who is always against such things 20160321 19:50:11< celticminstrel> So, when it's not a percentage, ~O() is in the range [0,1] while ~ADJUST_ALPHA() is in the range [0,256). 20160321 19:51:52< zookeeper> i can only assume that the point was to get an equivalent of ~O which works with 0-255. as to why, i don't have any idea. 20160321 19:52:17< celticminstrel> I'll wait and see what iceiceice has to say about it. 20160321 19:52:49< zookeeper> since it's so new, i don't mind if it goes, but there's no hurry either so might as well wait to hear from him. 20160321 19:52:54-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 19:52:55< travis-ci> wesnoth/wesnoth#8998 (master - 2f8f3af : Charles Dang): The build has errored. 20160321 19:52:55< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117533789 20160321 19:52:55-!- travis-ci [~travis-ci@ec2-54-198-16-208.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 19:54:03< zookeeper> celticminstrel, if you want a bigger IPF-related task, i have one 20160321 19:54:10< celticminstrel> Oh? 20160321 19:54:41< zookeeper> fix ~BL so that the RGB value of fully transparent pixels won't affect the output 20160321 19:54:57< zookeeper> that's something that's very problematic with sprites or other images with transparency 20160321 19:54:59< celticminstrel> That's blur, right?? 20160321 19:55:01< celticminstrel> Hmm. 20160321 19:55:02< zookeeper> yes 20160321 19:55:16< celticminstrel> I'll look at it, but not sure. 20160321 19:55:20< zookeeper> i looked at the code myself at some point but i don't think it's very easy to fix 20160321 19:55:27< celticminstrel> Right now I'm doing wiki editing though. 20160321 19:55:35< zookeeper> wiki editing is good 20160321 19:55:58< vultraz> disabiling optimization does not fix the weird artifacts 20160321 19:56:01< vultraz> disabling 20160321 19:56:03< vultraz> dammit 20160321 19:59:08< celticminstrel> Hmm, I suspect I forgot to add "in" to the operator precedence table... 20160321 20:00:09< celticminstrel> Yup. Whoops. 20160321 20:05:08< vultraz> I don't understand this code at all 20160321 20:07:59-!- louis94 [~~louis94@91.178.242.13] has quit [Ping timeout: 260 seconds] 20160321 20:13:14< vultraz> weird 20160321 20:13:27< vultraz> the effect does not appear for every transparent effect in a portrait 20160321 20:13:30< vultraz> just some 20160321 20:28:28< celticminstrel> Is the wiki broken? :( 20160321 20:29:20< celticminstrel> Hmm... 20160321 20:29:55< shadowm> Three of these processes are taking up 100% CPU: 20160321 20:29:58< shadowm> python2 /home/wesnoth/mw-wesnoth-pygmentize/Pygments-2.1.3/pygmentize -l wfl -f html -O cssclass=mw-highlight,encoding=utf-8 20160321 20:31:04< celticminstrel> Okay, so it's my fault. 20160321 20:32:10-!- atarocch [~atarocch@151.64.75.215] has quit [Remote host closed the connection] 20160321 20:32:10< shadowm> You might want to tell me right now how to attach to a Python instance for debugging. 20160321 20:32:45< celticminstrel> I'm... not quite sure. I know there's a Python debugger program (pdb), though I'm not sure how good it is. 20160321 20:34:05< shadowm> Looks like there isn't a way to do this without modifying the program. 20160321 20:34:27< vultraz> Spectre, Mage of Light, Arch Mage 20160321 20:35:09< shadowm> celticminstrel: If you were editing any pages recently then you probably know what snippets caused this, so you should try to debug this locally. 20160321 20:35:16< celticminstrel> I will. 20160321 20:35:23< celticminstrel> I think I just figured out which snippet caused it. 20160321 20:35:27< vultraz> Lich 20160321 20:36:28< shadowm> celticminstrel: Well, yeah, I guess it's somewhat evident from the command line: `-l wfl` 20160321 20:36:32< celticminstrel> I'll save the page first with that snippet not highlighted. 20160321 20:36:34< celticminstrel> Yeah. 20160321 20:36:37< shadowm> It was the same for all three. 20160321 20:37:08< shadowm> (Was, because I killed them.) 20160321 20:41:21< vultraz> Sylph 20160321 20:41:45< vultraz> celticminstrel: you didn't check all the small_profiles :| 20160321 20:41:50< celticminstrel> ? 20160321 20:43:00< vultraz> Lich, Orcish Soverign, Wose 20160321 20:43:04< vultraz> am fixing 20160321 20:43:11< celticminstrel> What are you talking about? 20160321 20:43:25< vultraz> those have not very nice small profiles 20160321 20:43:38< celticminstrel> So, what are you fixing? 20160321 20:44:03< vultraz> making them look nicer 20160321 20:44:10< celticminstrel> How so? 20160321 20:44:10< vultraz> Lich as a stray ~FL() 20160321 20:44:12 * celticminstrel curious 20160321 20:44:13< vultraz> other two have bad crops 20160321 20:44:54< celticminstrel> Eh, I just cropped them to look like the original small portrait. I'm not really strongly attached to it, though maybe we should also get zookeeper's opinion. 20160321 20:45:55< vultraz> We're not trying to emulate those crops :| 20160321 20:46:00< celticminstrel> Just for the record, I added a ~FL() on purpose to a few of them: https://github.com/wesnoth/wesnoth/commit/c2e216be5a8dce7abc6f5ed3b4226599c7203b00 20160321 20:46:38< celticminstrel> So don't remove any ~FL() in that commit (unless it's one where the small_profile didn't exist before the commit). 20160321 20:46:41< zookeeper> what do you want my opinion on? 20160321 20:46:54< zookeeper> i can't test any of your recent changes right now. 20160321 20:47:01< celticminstrel> Oh. 20160321 20:47:42< celticminstrel> Oh, the ~FL() on the scorpion was also on purpose, so don't remove that. 20160321 20:48:12< celticminstrel> For any L2 small_profile you change, make sure you do the same to the L3 unit if it uses the same portrait. 20160321 20:48:22< vultraz> celticminstrel: those are fine 20160321 20:50:34< celticminstrel> Hmm. It seems like the infinite loop resulted from not automatically terminating on end of input... I would've thought the lexer superclass would handle that... :| 20160321 20:50:55< celticminstrel> (I get the same result when trying to parse the string ' as WFL.) 20160321 20:52:18< shadowm> Make sure to poke me as soon as you get the fix in. 20160321 20:52:28< celticminstrel> Will do. 20160321 20:57:10-!- travis-ci [~travis-ci@ec2-54-158-81-19.compute-1.amazonaws.com] has joined #wesnoth-dev 20160321 20:57:11< travis-ci> wesnoth/wesnoth#9000 (master - a3bae34 : Charles Dang): The build has errored. 20160321 20:57:11< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/117535800 20160321 20:57:11-!- travis-ci [~travis-ci@ec2-54-158-81-19.compute-1.amazonaws.com] has left #wesnoth-dev [] 20160321 20:57:51-!- Kwandulin [~Miranda@p200300760F191C3BC8E4E1FB713D00C4.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20160321 21:42:59< celticminstrel> shadowm: I've pushed a fix. 20160321 21:46:51< shadowm> celticminstrel: Okay, pulled. I had to kill two more rogue processes before pulling as well. 20160321 21:56:12< shadowm> I'm off now. 20160321 21:56:19< celticminstrel> Okay. 20160321 22:12:41-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20160321 22:23:19-!- irker771 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20160321 22:30:21-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has quit [Quit: ChipmunkV] 20160321 22:35:39-!- louis94 [~~louis94@91.178.242.13] has joined #wesnoth-dev 20160321 22:49:23-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20160321 22:49:23-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20160321 22:54:04< celticminstrel> wesnoth.effects is not yet documented, I think. 20160321 22:55:41< celticminstrel> Okay, I have no clue what ~BL() is doing... 20160321 22:55:59< celticminstrel> Maybe Aginor can figure this out? 20160321 22:57:35< celticminstrel> vultraz: Anything else for me to do right now? 20160321 22:58:18-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has joined #wesnoth-dev 20160321 23:04:25-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20160321 23:04:35< celticminstrel> Hi. 20160321 23:05:03-!- gfgtdf [~chatzilla@f054049134.adsl.alicedsl.de] has joined #wesnoth-dev 20160321 23:05:12< mattsc> Hi? 20160321 23:05:24< celticminstrel> Why the question mark. 20160321 23:05:49< mattsc> Just in case it wasn’t meant for me. 20160321 23:05:55< celticminstrel> Ah. 20160321 23:06:11< celticminstrel> I'm sure I wanted to ask gfgtdf something, but now I've forgotten what it was. 20160321 23:06:15< mattsc> I’m not used to people actually noticing me when I walk into a room. ;) 20160321 23:06:39< celticminstrel> I fixed that problem we talked about, but haven't pushed it yet. 20160321 23:06:49< mattsc> Cool. 20160321 23:07:01< mattsc> I haven’t done anything Wesnoth since we talked about that. 20160321 23:07:19 * celticminstrel didn't expect you to have done anything. 20160321 23:07:20< mattsc> I’m a slacker! 20160321 23:07:25< celticminstrel> Heh... 20160321 23:07:26< mattsc> hehe 20160321 23:08:31< mattsc> Btw, somebody (aquileia, maybe) mentioned a while ago while I was traveling that the translation marks should be removed from the MAI test scenarios. 20160321 23:08:59< mattsc> I really don’t care one way or the other. I thought other test scenarios had them too, but I just checked and the don’t. 20160321 23:09:07< mattsc> s/the/they 20160321 23:09:34< mattsc> I guess the reason why they do is that they started as “normal” scenarios in an add-on. 20160321 23:10:18< mattsc> So, I am happy to have it one way or the other (in both master and 1.12), somebody just should let me know. 20160321 23:10:27< mattsc> I don’t know who “somebody” is in this case though. 20160321 23:10:57< mattsc> I think the argument for removing them makes sense, if you want my opinion (but it’s not a very strong opinion) 20160321 23:24:19-!- louis94 [~~louis94@91.178.242.13] has quit [Quit: Konversation terminated!] 20160321 23:44:06-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 250 seconds] 20160321 23:45:56-!- LovCAPONE [~lovens@modemcable184.138-20-96.mc.videotron.ca] has joined #wesnoth-dev --- Log closed Tue Mar 22 00:00:41 2016