--- Log opened Sun May 13 00:00:44 2018 20180513 00:01:25<+discordbot> you can fix it? 20180513 00:04:06<+discordbot> "Custom options don't save settings if id is an array name," 20180513 00:04:07<+discordbot> BLAH 20180513 00:04:11<+discordbot> i forgot to deal with that 20180513 00:04:13<+discordbot> fml 20180513 00:05:50<+discordbot> @Vultraz I can push updated translations to steam 20180513 00:06:01<+discordbot> šŸ‘ 20180513 00:06:13<+discordbot> shadowm already asked me about that 20180513 00:06:20<+discordbot> So, could you do that each weekend? 20180513 00:06:46<+discordbot> probably not without reminders 20180513 00:07:21<+discordbot> celticminstrel: I get the feeling most people are indifferent with hotkeys. 20180513 00:09:08< mattsc> @Vultraz Yes, Iā€™ll fix it. I just want to do a bunch more tests; and I donā€™t have a lot of consecutive time at the computer today 20180513 00:09:28<+discordbot> You have until the 22nd 20180513 00:09:42< mattsc> I should be able to handle that. 20180513 00:10:07<+discordbot> Most games (virtually every AAA title including Civ, XCOM) donā€™t use modifier keys. I never got why Wesnoth uses modifier keys for the most basic commands. 20180513 00:10:25<+discordbot> modifier keys? 20180513 00:10:43<+discordbot> Recruit? 20180513 00:10:54<+discordbot> Uses a modifier key 20180513 00:11:11<+discordbot> oh, yeah 20180513 00:11:21<+discordbot> honestly, there's really no reason this can't change 20180513 00:11:24<+discordbot> I could just be R 20180513 00:11:43<+discordbot> if you want to, open a PR to merge Simple Hotkeys 20180513 00:12:38<+discordbot> Sure, great! though, I want someone who uses planning mode a lot to help with those hot keys 20180513 00:12:53<+discordbot> I have avoided planning mode like the plague 20180513 00:13:10<+discordbot> we could merge the others in the meantime 20180513 00:13:25<+discordbot> I would say this is probably something that should wait until 1.15 20180513 00:13:36<+discordbot> I might be a little upset if the taxis change suddenly without me knowing 20180513 00:13:51<+discordbot> *hotkeys 20180513 00:13:59<+discordbot> It would be prominently noted in the 1.14.2 announcement 20180513 00:14:47< celticminstrel> @ancestral - If they're indifferent then that's no reason not to change them. 20180513 00:14:52<+discordbot> I'm aiming to move us towards a "rolling release" model, so to start, I'm allowing slightly more intrusive changes in stable. 20180513 00:15:01<+discordbot> Maybe youā€™re right 20180513 00:15:03<+discordbot> such as dave's PRNG option 20180513 00:15:24< celticminstrel> ... 20180513 00:15:34< celticminstrel> I really don't think doing it for 1.14.2 is a good idea though. 20180513 00:15:44< celticminstrel> What the heck do you mean by "Daves PRNG option"? 20180513 00:15:55<+discordbot> Dave added a PRNG option 20180513 00:15:58< celticminstrel> Putting intrusive changes in stable entirely defeats the point of stable. 20180513 00:16:06< celticminstrel> That doesn't tell me anything. 20180513 00:16:08<+discordbot> not sure it's wholly wired in properly, but it's there 20180513 00:16:39< celticminstrel> What's @shadowm's opinion on all this BTW? 20180513 00:16:49<+discordbot> on all what? 20180513 00:16:55<+discordbot> imagines battles and scenarios resulting in worse RNG results 20180513 00:16:56< celticminstrel> [May 12@8:14:52pm] discordbot: I'm aiming to move us towards a "rolling release" model, so to start, I'm allowing slightly more intrusive changes in stable. 20180513 00:17:02<+discordbot> (by mistake) 20180513 00:17:15<+discordbot> (If untested) 20180513 00:17:17<+discordbot> Why exactly are you trying to circumvent me? 20180513 00:17:23< octalot> Please keep master stable, before considering intrusive changes to stable. 20180513 00:17:38<+discordbot> I said slightly more intrusive changes. 20180513 00:17:49<+discordbot> There will be no Lua or WML API changes in 1.14 20180513 00:18:02< celticminstrel> Well, "slightly more intrusive" doesn't really say much, admittedly. 20180513 00:18:04<+discordbot> but stuff like map tweaks, hotkey changes, new preferences, etc, can all go in 20180513 00:18:06< celticminstrel> Just... be careful. 20180513 00:19:04<+discordbot> @Vultraz What if Daveā€™s PRNG isnā€™t much better? In other words, maybe more data is needed to determine if itā€™s noticeably an improvement 20180513 00:19:17<+discordbot> He added it so it may be tested 20180513 00:19:25<+discordbot> And improved 20180513 00:19:26<+discordbot> Maybe a more radical approach would be better 20180513 00:19:33<+discordbot> (For example) 20180513 00:19:38<+discordbot> The approach is not set in stone 20180513 00:19:52<+discordbot> I mean 20180513 00:20:01<+discordbot> Isnā€™t that what the development branch is for?? 20180513 00:20:20< celticminstrel> Yeah, exactly. 20180513 00:20:23<+discordbot> This is what I mean by slightly more intrusive changes 20180513 00:20:45<+discordbot> The PRNG option is cordoned off and doesn't affect regular attack calculations. 20180513 00:21:00< celticminstrel> I still have no idea what you mean by "Dave's PRNG" but I imagine it could cause out-of-sync errors using it in MP. 20180513 00:21:03<+discordbot> But having it in stable will allow people to test it now and give is data 20180513 00:21:14<+discordbot> it's not meant to be used in MP 20180513 00:21:22<+discordbot> though I'm not sure he implemented that properly 20180513 00:21:29< celticminstrel> Okay, but really, what is it? 20180513 00:21:37<+discordbot> Uh huh šŸ˜› 20180513 00:22:01<+discordbot> https://forums.wesnoth.org/viewtopic.php?f=6&t=48160 20180513 00:22:29<+discordbot> I'll need to ensure it works before 1.14.2 20180513 00:22:47<+discordbot> right now it only works if you have "random" seed and not "random synced" seed 20180513 00:22:51<+discordbot> but I don't know where we use either 20180513 00:23:02<+discordbot> SP is supposedly always synced 20180513 00:23:12<+discordbot> so his post may be a bit inaccurate 20180513 00:23:36< Ravana_> I support using more single letter hotkeys by default, but planning mode should not be one of them 20180513 00:23:47< celticminstrel> Well, the name PRNG is totally inaccurate for it as well. 20180513 00:23:54< celticminstrel> Because the other option is also a PRNG. 20180513 00:24:07<+discordbot> what? 20180513 00:24:27< celticminstrel> The existing randomness in Wesnoth is already a PRNG, so calling this the "PRNG option" is simply wrong. 20180513 00:24:38<+discordbot> no, it's an RNG 20180513 00:24:43<+discordbot> not a pseudo-RNG šŸ˜ 20180513 00:24:43< celticminstrel> Wesnoth uses a Mersenne twister for its randomness. That's a pseudo-random number generator. 20180513 00:25:11< celticminstrel> (It's seeded with true randomness, admittedly, but the generator itself is a PRNG.) 20180513 00:25:16<+discordbot> now you're arguing semantics 20180513 00:25:23<+discordbot> you always do this 20180513 00:25:42< celticminstrel> I don't see the problem with it? Just give it a better name. 20180513 00:25:55< celticminstrel> And IMO leave it as a hidden preference for 1.14. 20180513 00:26:05<+discordbot> for fuck's sake 20180513 00:26:09<+discordbot> NO 20180513 00:26:31< celticminstrel> And it kinda looks like Dave agrees with me on that, from his posts. 20180513 00:26:44< celticminstrel> Though maybe his time-frame for making it non-hidden is different. 20180513 00:26:55< celticminstrel> But anyway, seriously, just rename it. 20180513 00:27:07<+discordbot> How the hell do you manage to care so much about stuff that doesn't matter AT ALL, like TERRAIN CODES, and then when shit actually matters, like GETTING FEEDBACK ON A NEW PRNG OPTION, you hesitate 20180513 00:27:40< celticminstrel> I don't even know what you're talking about. 20180513 00:28:19<+discordbot> You go on about how we absolutely need to rename the gate terrain codes 20180513 00:28:27<+discordbot> But here you're like ehhhh no leave it hidden. 20180513 00:28:40< celticminstrel> I think you're overstating my stance on the gate terrain codes. 20180513 00:28:50< celticminstrel> I said we should rename them, yeah. 20180513 00:29:10< celticminstrel> But I never meant to imply it to be a high-priority task. 20180513 00:29:20<+discordbot> Well, you did 20180513 00:29:32< celticminstrel> And in this case keeping it hidden until it's known to work makes sense, doesn't it? 20180513 00:29:45<+discordbot> If we leave this hidden maybe 0.5% of players would even know it exists 20180513 00:29:55< celticminstrel> Pretty sure I explicitly said a couple of times that I considered the gate terrain codes low-priority. 20180513 00:30:06<+discordbot> eh true 20180513 00:30:08<+discordbot> you did mention that 20180513 00:30:48<+discordbot> there's no reason we can't add this with a big-ass EXPERIMENTAL label slapped on it 20180513 00:31:52< celticminstrel> I guess it could be dumped into advanced prefs, sure. 20180513 00:32:14<+discordbot> That's what I always intended! 20180513 00:32:38< celticminstrel> Still prefer it to remain hidden until it's undergone some more testing, for at leasdt a month or two. 20180513 00:34:51<+discordbot> How can it undergo testing if no one knows itā€™s there 20180513 00:35:00< celticminstrel> Ravana_ has a good point. Maybe we should just re-expose the preferences to main Lua? 20180513 00:35:13< celticminstrel> Um, we can tell people about it just like Dave did in the opening post. 20180513 00:35:39< celticminstrel> Anwyay, IIRC the main reason not to expose the preferences to the game Lua kernel was because it contains your MP password. That's not the case anymore. Is there any other reason not to expose them? 20180513 00:35:41<+discordbot> How many people read the forums? 20180513 00:36:02< celticminstrel> Once it's in a released version you can post a link to it on the Steam forums. You can even pin it, if you want. 20180513 00:36:53<+discordbot> Itā€™s still not convenient 20180513 00:36:59<+discordbot> People have to find their prefs file 20180513 00:37:03<+discordbot> And edit the prefs file 20180513 00:37:25< celticminstrel> I imagine quite a few people unsatisfied with the existing RNG would be willing to do that though. 20180513 00:37:43<+discordbot> So why not make it easier for them to do so 20180513 00:38:04-!- gallaecio [~quassel@213.99.45.54] has quit [Remote host closed the connection] 20180513 00:41:33<+discordbot> Pretty sure I'm missing something pretty fundamental with pull requests. Anyone got a few minutes to help a n00b out? 20180513 00:42:27<+discordbot> what's the problem? 20180513 00:44:04<+discordbot> So I have an open pull request for some changes in a DW scenario. Then I made some changes to an UtBS scenario and git has gone and put it in the same pull request. Is that normal? 20180513 00:44:28< celticminstrel> You need to do things on separate branches. 20180513 00:45:08<+discordbot> Ah, right. That makes sense. 20180513 00:45:43<+discordbot> So I make my own branch somehow? and if so how? 20180513 00:46:33<+discordbot> https://wiki.wesnoth.org/Git_for_Wesnoth_Crash_Course 20180513 00:46:36<+discordbot> is a good overview 20180513 00:46:41<+discordbot> (maybe slightly out of date) 20180513 00:46:46< celticminstrel> I guess it probably depends on how you use git, I can tell you how to do it on the command-line though. 20180513 00:47:03<+discordbot> Hrmm...I'd missed that. I'll have a read and check back if I'm still confused. 20180513 00:47:50<+discordbot> (I'm using the website, because the more UI the less likely I am to do something stupid like making one big dumb pull request :p ) 20180513 00:48:19< celticminstrel> Ah. In that case, there's a field underneath the commit message that lets you set the branch name. 20180513 00:48:37< celticminstrel> In addition, when editing always make sure you're on master (if you want to make a new PR) or the branch of an existing PR. 20180513 00:48:57< celticminstrel> Your current branch is reflected in the URL and probably somewhere on the page too. 20180513 00:49:34< octalot> I haven't tried the website UI, but a major thing about Git is that almost any command other than "push" doesn't change the remote repository 20180513 00:49:47< octalot> your local repo is a fork of your fork 20180513 00:50:42<+discordbot> Ah. I should be on master not on 1.14? 20180513 00:51:30< celticminstrel> You can substitute master with 1.14 if your PR is 1.14-worthy, sure. 20180513 01:00:31-!- gfgtdf [~chatzilla@x4e32b1f9.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.93 [Firefox 52.8.0/20180430140610]] 20180513 01:01:06<+discordbot> ^ Pretty sure I've gotta try that again... 20180513 01:09:59< celticminstrel> Oh, 2982 hasn't been merged yet... 20180513 01:39:07< irker328> wesnoth: mattsc wesnoth:1.14 09787796161d / data/lua/mapgen_helper.lua: Lua random map generator: fix off-by-one error in flip transforms https://github.com/wesnoth/wesnoth/commit/09787796161d0e9fce5108a4e068dd0ccc2fe535 20180513 01:39:22< mattsc> celticminstrel @Vultraz ^ 20180513 01:40:03<+discordbot> How come to7 didnā€™t change loc to index ? 20180513 01:40:50< mattsc> What? 20180513 01:40:57-!- octalot [~steve@77.119.128.4.wireless.dyn.drei.com] has quit [Ping timeout: 240 seconds] 20180513 01:43:35< irker328> wesnoth: mattsc wesnoth:master 7d0d9e19a5fc / data/lua/mapgen_helper.lua: Lua random map generator: fix off-by-one error in flip transforms https://github.com/wesnoth/wesnoth/commit/7d0d9e19a5fce052e35f866a1d83584dcd8f20bb 20180513 01:45:24<+discordbot> @mattsc I mean how come you didn't drop the -1 in loc_to_index 20180513 01:45:26<+discordbot> instead 20180513 01:46:08<+discordbot> or 20180513 01:46:11<+discordbot> the +1 rather 20180513 01:46:26<+discordbot> but if this is the right fix please add a changelog entry 20180513 01:47:02< mattsc> Because then every other part that uses loc_to_index would be broken. 20180513 01:47:27<+discordbot> i see 20180513 01:47:29<+discordbot> alright 20180513 01:47:44< mattsc> It is clearly set up so that indec starts at 1 (because thatā€™s what Lua does), and x/y start at 0 (because ā€¦ donā€™t know, but itā€™s clearly intentional). 20180513 01:48:25<+discordbot> changelog entry needed tho (both branches) 20180513 01:48:28< mattsc> The flip functions were the only places that were inconsistent with that (only places I found, at least) 20180513 01:48:55< mattsc> @Vultraz: yes, I have a lot of changes to be added to the log 20180513 01:49:02<+discordbot> šŸ‘ 20180513 01:49:09< mattsc> I donā€™t add them to the commits directly, because then I cannot cherry-pick them 20180513 01:49:20< mattsc> well, not without conflicts, I mean 20180513 01:49:48< mattsc> Iā€™ll do all of those together when I am done. 20180513 01:50:15<+discordbot> gud, gud 20180513 01:56:57-!- louis94 [~~louis94@91.176.171.238] has quit [Ping timeout: 240 seconds] 20180513 02:20:05-!- travis-ci [~travis-ci@ec2-54-224-81-10.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 02:20:06< travis-ci> wesnoth/wesnoth#18115 (master - 7d0d9e1 : mattsc): The build is still failing. 20180513 02:20:06< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378248620 20180513 02:20:06-!- travis-ci [~travis-ci@ec2-54-224-81-10.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 02:20:14< irker328> wesnoth/wesnoth:1.14 Severin Glƶckner 70bb133486 NR S2: fixup prose AppVeyor: All builds passed 20180513 02:44:25<+discordbot> is grzywacz around? 20180513 03:01:34< irker328> wesnoth: Fernando Carmona Varo wesnoth:1.14 67e63e825a78 / data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg: tutorial: add labels to villages and keep https://github.com/wesnoth/wesnoth/commit/67e63e825a78f219521d3cbbd71b76ab200df254 20180513 03:02:39< irker328> wesnoth: Fernando Carmona Varo wesnoth:master 026ea6ee780c / data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg: tutorial: add labels to villages and keep https://github.com/wesnoth/wesnoth/commit/026ea6ee780c11859f495983dedaeb4f2e1ebb9f 20180513 03:12:37-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection] 20180513 03:12:43-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20180513 03:22:00<+discordbot> No. 20180513 03:26:57< celticminstrel> Don't forget to add "Ferk" to the credits. 20180513 03:27:52< celticminstrel> I mean unless he's already there under a different name. 20180513 03:30:01<+discordbot> Which reminds me, I have a feeling that since vultraz took over no-one's been taking care of reminding new contributors to add themselves to the credits in their first PR. 20180513 03:30:37< celticminstrel> Yeah, no-one has been. 20180513 03:30:39<+discordbot> Much like no-one's been asking them if they have a forum account. 20180513 03:30:45< celticminstrel> I guess I could start doing it. 20180513 03:30:51<+discordbot> To get added to Code & WML Contributors and eventually Developers. 20180513 03:31:04< celticminstrel> I mean I'm the one who's been scraping the commit log to pick up any missed contributors, after all. 20180513 03:31:16< celticminstrel> But if they can do it themselves, maybe that's better. 20180513 03:38:02-!- travis-ci [~travis-ci@ec2-54-224-81-10.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 03:38:03< travis-ci> wesnoth/wesnoth#18117 (master - 026ea6e : Fernando Carmona Varo): The build is still failing. 20180513 03:38:03< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378258920 20180513 03:38:03-!- travis-ci [~travis-ci@ec2-54-224-81-10.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 03:40:04<+discordbot> It sounds like someone needs to update the Xcode project or something: clang: error: no such file or directory: '/Users/travis/build/wesnoth/wesnoth/src/filesystem_boost.cpp' 20180513 03:40:56<+discordbot> I pinged hrubymar about it earlier 20180513 03:41:13<+discordbot> vultraz renamed that file, which is what caused it. 20180513 03:44:00< irker328> wesnoth/wesnoth:master Charles Dang f34db1b8ac MP Lobby: removed "illegal map" error (s AppVeyor: 1/2 builds failed 20180513 03:44:01< irker328> Details vs2015/Debug: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-3289 20180513 03:47:47<+discordbot> Yeah, I expected that. 20180513 03:47:59<+discordbot> Both the fact that the file was renamed and that he would be the one to do it. 20180513 03:56:33< celticminstrel> Heh. 20180513 03:57:12<+discordbot> My infamy spreads. 20180513 03:58:04< celticminstrel> That's not something to be proud of. 20180513 03:58:54<+discordbot> I jest 20180513 04:16:06<+discordbot> Regarding the OneDrive issue, I don't know what kind of reparse points they are. The only information Boost.Filesystem can give us is that they are reparse points. 20180513 04:16:32< celticminstrel> It can't give information about what they point to? 20180513 04:16:44< celticminstrel> If they point to anywhere, at least. 20180513 04:16:58< celticminstrel> I don't know what a reparse point is. 20180513 04:24:08<+discordbot> It'd be nice if we could get hold of a person experiencing this issue that would be willing to run commands to extract all the needed information then. 20180513 04:24:34<+discordbot> Since it seems to be fairly common and could make a (small but noticeable) dent in reviews later down the line. 20180513 04:25:32<+discordbot> Windows users aren't as much of a "things should just work" audience than Apple users since they're constantly being bitten in their rears by Microsoft's stupidity, but still. 20180513 04:26:19<+discordbot> (And also by countless third-party software vendors like anti-malware developers, etc.) 20180513 04:33:08< irker328> wesnoth: Jyrki Vesterinen wesnoth:master c3d711632e70 / src/game_initialization/lobby_data.cpp: Fix compiler warning about unreferenced variable https://github.com/wesnoth/wesnoth/commit/c3d711632e70857861e081597c4e943688a3a89f 20180513 04:33:49< irker328> wesnoth: Jyrki Vesterinen wesnoth:1.14 b8c305a286e5 / src/game_initialization/lobby_data.cpp: Fix compiler warning about unreferenced variable https://github.com/wesnoth/wesnoth/commit/b8c305a286e5d50def185b32d643ac1dc47d8e6d 20180513 04:48:56< irker328> wesnoth: Charles Dang wesnoth:master 74f86aea1d34 / src/ (ai/formula/ai.cpp ai/formula/ai.hpp wml_exception.cpp wml_exception.hpp): Mark wml_exception::show const and formula_ai::handle_exception's argument const https://github.com/wesnoth/wesnoth/commit/74f86aea1d3447f66b121489d5adfd38d80d9468 20180513 04:48:59< irker328> wesnoth: Charles Dang wesnoth:master 2bf4d68c87b6 / src/ (101 files in 30 dirs): Catch all exceptions (where possible) as const references https://github.com/wesnoth/wesnoth/commit/2bf4d68c87b69256266b7745a9e3453693794e35 20180513 04:55:27-!- travis-ci [~travis-ci@ec2-54-205-245-66.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 04:55:28< travis-ci> wesnoth/wesnoth#18118 (master - c3d7116 : Jyrki Vesterinen): The build is still failing. 20180513 04:55:28< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378270064 20180513 04:55:28-!- travis-ci [~travis-ci@ec2-54-205-245-66.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 05:13:32<+discordbot> @Vultraz Wesnoth requires SDL >= 2.0.4 on Windows, right? 20180513 05:13:38<+discordbot> celticminstrel: I can confirm that the reparse point for the affacted players do point somewhere. 20180513 05:13:41<+discordbot> On all 20180513 05:13:58< irker328> wesnoth: Charles Dang wesnoth:1.14 60b1124d8bf3 / src/ (ai/formula/ai.cpp ai/formula/ai.hpp wml_exception.cpp wml_exception.hpp): Mark wml_exception::show const and formula_ai::handle_exception's argument const https://github.com/wesnoth/wesnoth/commit/60b1124d8bf351b1935f38392a8ec4f16f32e2c8 20180513 05:14:01< irker328> wesnoth: Charles Dang wesnoth:1.14 0bf09c82a51b / src/ (101 files in 30 dirs): Catch all exceptions (where possible) as const references https://github.com/wesnoth/wesnoth/commit/0bf09c82a51b7a1e0ba414ffb59dbcebda1c3340 20180513 05:14:08<+discordbot> I created a directory junction, deleted the target directory, and told Wesnoth to store userdata in the junction. 20180513 05:14:28<+discordbot> Okay, I'm going to add a bit to the bi dump to inform us of the display set-up (inspired by enclave's post in the 1.14.1 release thread). 20180513 05:14:32<+discordbot> What do you guys think is a better message to indicate a required yet not installed addon - "missing" or "not installed"? 20180513 05:14:44<+discordbot> Not installed. 20180513 05:14:50<+discordbot> The resulting behavior was different: bfs::exists(fs) returned false, and thus Wesnoth attempted to create the directory. 20180513 05:15:07<+discordbot> When I wrote the previous incarnation of the manager UI I used "missing" to refer to add-ons required but not present on the add-ons server. 20180513 05:15:39<+discordbot> @jyrkive isn't that what that SO answer I found said? 20180513 05:16:22<+discordbot> No, it's not. 20180513 05:16:57< irker328> wesnoth: Charles Dang wesnoth:1.14 929a689f204a / src/gui/dialogs/multiplayer/lobby.cpp: MP Lobby: used "not installed" instead of "missing" https://github.com/wesnoth/wesnoth/commit/929a689f204a9925b3aa013e09f4e06e8a5857e6 20180513 05:16:59<+discordbot> What the SO answer said that bfs::is_directory() isn't required to return true for symbolic links which point to directories. 20180513 05:17:10<+discordbot> Also, my own testing contradicts with that claim. 20180513 05:17:19< celticminstrel> Ehh? 20180513 05:17:27< irker328> wesnoth: Charles Dang wesnoth:master 0d1571a0b2df / src/gui/dialogs/multiplayer/lobby.cpp: MP Lobby: used "not installed" instead of "missing" https://github.com/wesnoth/wesnoth/commit/0d1571a0b2df0b4ae11708e3a92e7c1af2aa44df 20180513 05:17:29<+discordbot> For me, bfs::is_directory() does return true for junctions. 20180513 05:17:38<+discordbot> šŸ¤” hm 20180513 05:24:03<+discordbot> @Vultraz By the way, did you use a Unicode-safe function for limiting the character count for MP game names? 20180513 05:24:47<+discordbot> I used GUI2's max_input_length functionality 20180513 05:25:27< celticminstrel> I wonder if that's Unicode-safe. 20180513 05:25:43< celticminstrel> Could be though. 20180513 05:25:59< celticminstrel> As long as it uses utf8::length or whatever it was called. 20180513 05:26:25<+discordbot> cpp if(length_ > maximum_length_) { std::string tmp = text_; this->set_text(utf8::truncate(tmp, maximum_length_), false); } 20180513 05:26:34< celticminstrel> ...actually wait, is that enought to make it Unicode-safe, or should it somehow know about combining characters too... 20180513 05:26:35<+discordbot> (in pango_text) 20180513 05:26:43< celticminstrel> Well, that's probably good enough. 20180513 05:27:13<+discordbot> * @note This implementation does not check for valid UTF-8. Don't use it * for user input. 20180513 05:27:21<+discordbot> šŸ¤” šŸ¤” šŸ¤” šŸ¤” šŸ¤” 20180513 05:27:38<+discordbot> I wonder if a game title set by the user counts as user input? 20180513 05:27:49<+discordbot> What do you think, vultraz? 20180513 05:28:02<+discordbot> !())(@(&#^@%^&@$#^% 20180513 05:28:26<+discordbot> Note the documentation for utf8::truncate_as_ucs4(), declared immediately below that one. 20180513 05:28:50< celticminstrel> Oh. 20180513 05:28:51<+discordbot> (Which begs the question of why we have both.) 20180513 05:29:00<+discordbot> it does šŸ¤” 20180513 05:29:29< celticminstrel> But more to the point... why would someone add a truncate function for utf8 that DOESN'T CHECK THAT IT'S VALID! 20180513 05:29:41<+discordbot> who the hell knows 20180513 05:30:11< celticminstrel> So yeah, either remove the existing truncate and rename the other to just truncate, or fix the existing truncate to know about valid UTF-8. 20180513 05:30:22< celticminstrel> Which means making it a linear operation instead of (I assume) constant. 20180513 05:30:31<+discordbot> I guess the thing is truncate_as_ucs4 converts the input to a std::u32string 20180513 05:30:47<+discordbot> Yeah, it can be more demanding. 20180513 05:30:47< celticminstrel> But still slightly faster than converting to UCS4 and then truncating (though whether that added speed matters, I have no clue). 20180513 05:31:09<+discordbot> But I'm not sure what the point of taking shortcuts is when dealing with UTF-8 that is almost always user input in some form. 20180513 05:31:13< celticminstrel> It should be possible though to iterate through the UTF-8 string as a byte array and count code points that way. 20180513 05:31:19<+discordbot> (Whether it be actual user input, or input from translators.) 20180513 05:31:54<+discordbot> (tangentially related, I'm not sure what I think about people being able to have giant-ass clickable links in their game titles šŸ˜ ) 20180513 05:32:10< celticminstrel> Something like... 20180513 05:32:58<+discordbot> especially when they say "[link] to joi" 20180513 05:33:42< celticminstrel> if(c & 0b11110) count += 4; else if(c & 0b1110) count += 3; else if(c & 0b110) count += 2; else if(!(c & 0b10)) count++; 20180513 05:34:11< celticminstrel> That's not exactly right though, because the proper test isn't bitwise and, it's more like matching prefix. 20180513 05:34:48<+discordbot> @Vultraz Can you disable linkification? 20180513 05:35:01<+discordbot> I can. 20180513 05:35:08< celticminstrel> ie, if the bit representation starts with 11110, it's the start of a four-byte character; if it starts with 1110, it's the start of a three-byte character; and if it starts with 110, it's the start of a two-byte character. Then if it starts with 10 it's the continuation of a multibyte character and thus shouldn't be counted. 20180513 05:35:12<+discordbot> I suppose you still get a prompt asking if you want to proceed, but I feel like this can interfere with the list selection operation somehow. 20180513 05:35:40< celticminstrel> https://en.wikipedia.org/wiki/UTF-8#Description 20180513 05:36:12< celticminstrel> So basically you can easily get string length by iterating over the string as a byte array (you just need to work out the proper bitwise math first). 20180513 05:36:21<+discordbot> celticminstrel: Your proposed implementation doesn't take into account combining character.s 20180513 05:36:28< celticminstrel> True. 20180513 05:36:45< celticminstrel> But aren't those still valid even if they have nothing to combine to? 20180513 05:36:48<+discordbot> Don't combining characters juct make the string shorter? 20180513 05:37:35<+discordbot> As an extreme example, if the whole string consists entirely of combining characters (i.e. extreme Zalgo text), then it would be rendered as one character. 20180513 05:37:51<+discordbot> I think (DO NOT QUOTE ME ON THIS) most non-combining and combining characters are supposed to be coalesced during normalization. 20180513 05:38:24< celticminstrel> That depends on the normalization form. 20180513 05:38:55<+discordbot> For example a and U+0301 COMBINING ACUTE ACCENT might be supposed to end up as Ć” (U+00E1 LATIN SMALL LETTER A WITH ACUTE). 20180513 05:39:48<+discordbot> It's probably even more complicated for non-Latin 1 scripts. 20180513 05:41:20< celticminstrel> I think the proper test would need to combine & with &~ 20180513 05:41:56< celticminstrel> So for the 4-byte code point initial byte, if((c & 0b11110000) && (c &~ 0b00001000)) 20180513 05:42:08< celticminstrel> (Also those trailing zeros that I didn't include previously are important. 20180513 05:42:09< celticminstrel> ) 20180513 05:46:18< irker328> wesnoth: Iris Morelle wesnoth:master ba64a502e1b2 / src/build_info.cpp: bi: Refactor report headers generation https://github.com/wesnoth/wesnoth/commit/ba64a502e1b26bd9ccb679152ebbbef32c8707cc 20180513 05:46:22< irker328> wesnoth: Iris Morelle wesnoth:1.14 a6425a1a7765 / src/build_info.cpp: bi: Refactor report headers generation https://github.com/wesnoth/wesnoth/commit/a6425a1a7765585d6a0311c709ecd23a0f38f133 20180513 05:49:24<+discordbot> we can probably drop utf8::size actually 20180513 05:49:32< celticminstrel> Can we though? 20180513 05:49:42<+discordbot> it should be no different from std::string::size 20180513 05:49:48<+discordbot> Uhhhhhhh. 20180513 05:49:58<+discordbot> since std::string can hold utf8 20180513 05:50:11< celticminstrel> You're totally wrong there. 20180513 05:50:18<+discordbot> std::string is a std::basic_string. 20180513 05:50:20-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 05:50:21< travis-ci> wesnoth/wesnoth#18120 (master - 2bf4d68 : Charles Dang): The build is still failing. 20180513 05:50:21< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378271958 20180513 05:50:21-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 05:50:29< celticminstrel> std::string::size returns the number of bytes in the string. 20180513 05:50:33<+discordbot> char doesn't hold UTF-8 characters. Its size is usually smaller. 20180513 05:50:38< celticminstrel> utf8::size returns the number of code points in the string. 20180513 05:51:04<+discordbot> So, for example, std::string("Ć”").size() will return at least 2. 20180513 05:51:06<+discordbot> char - type for character representation which can be most efficiently processed on the target system (has the same representation and alignment as either signed char or unsigned char, but is always a distinct type). Multibyte characters strings use this type to represent code units. The character types are large enough to represent any UTF-8 code unit (since C++14). 20180513 05:51:10< celticminstrel> The only guarantee is that std::string::size >= utf8::size for a given string. They won't be equal. 20180513 05:51:22< celticminstrel> @shadowm I'd expect that example to return 3. 20180513 05:51:31< celticminstrel> Whereas utf8::size would return 2. 20180513 05:51:41<+discordbot> @shadowm char DOES hold utf8 characters 20180513 05:51:45< celticminstrel> Neither of which is the expected value mind you, but at least utf8::size is counting the code points. 20180513 05:51:50<+discordbot> utf8::size("Ć”") should return 1 unless we use the combining form. 20180513 05:51:58< celticminstrel> @Vultraz, char cannot hold an arbitrary utf8 character. 20180513 05:52:08<+discordbot> @Vultraz It does not. 20180513 05:52:15<+discordbot> oh nevermind 20180513 05:52:20<+discordbot> It can only hold individual bytes of an UTF-8 character. 20180513 05:52:21< celticminstrel> @shadowm Oh right I was assuming the separate combining character, if you use the precomposed one then what you said is correct. 20180513 05:53:00< celticminstrel> But yeah, basically std::string::size doesn't do the same thing as utf8::size. 20180513 05:53:01<+discordbot> What that text you pasted is saying is basically that char is guaranteed to be at least 8 bits in size. 20180513 05:53:20< celticminstrel> It might be the case that std::u8string::size does the same thing as utf8::size but I wouldn't make any assumptions on that. 20180513 05:53:25<+discordbot> (UTF-8 is encoded using sequences of bytes that are all 8 bits in size.) 20180513 05:53:58<+discordbot> there is NO u8string 20180513 05:53:58<+discordbot> (In particular, the ASCII section is just 7 bits.) 20180513 05:54:03<+discordbot> because that's just std::string 20180513 05:54:24< celticminstrel> @Vultraz, also note that std::string::size is a simple subtraction s.end() - s.begin(), while utf8::size needs to iterate over the entire string to determine the size. 20180513 05:55:22<+discordbot> In our own codebaseutf8::string was just an alias for std::string 20180513 05:55:28<+discordbot> So I've removed the former 20180513 05:55:45<+discordbot> Yeah, I was aware of that. 20180513 05:55:47< celticminstrel> (Also there is a UTF-8 string in the standard, though I dunno if the typedef std::u8string actually exists.) 20180513 05:56:05< celticminstrel> (Or even can exist for that matter.) 20180513 05:56:08<+discordbot> utf8::string was basically a lie that can get the unwary to shoot themselvesi n the foot. 20180513 05:56:32<+discordbot> std::string can be used to represent a Unicode string in UTF-8, but the caveat is that you cannot safely use random acces to individual characters. 20180513 05:56:41< celticminstrel> (The only thing I can actually find in the standard is the u8 string constant prefix.) 20180513 05:56:54<+discordbot> You may end up dereferencing part of a character, resulting in an invalid UTF-8 character. 20180513 05:57:32<+discordbot> This is quite admittedly confusing for people from the Unicode generation. 20180513 05:57:52< celticminstrel> String indexing (in UTF-8) is also linear rather than constant. 20180513 05:57:58<+discordbot> I reckon this might be why when Microsoft started working on Win32 they went with ... whatever it is they use. 20180513 05:58:12<+discordbot> (Purportedly UTF-16 but I think it's not actually UTF-16.) 20180513 05:58:53< celticminstrel> UTF-16 has four-byte characters. I think Microsoft's encoding does not. 20180513 05:59:21< celticminstrel> If you want random-access you need UTF-32 / UCS-4. 20180513 05:59:38<+discordbot> so, std::u32string 20180513 05:59:43<+discordbot> Yeah I think Microsoft actually uses UCS-2. 20180513 05:59:50< celticminstrel> @Vultraz, what? 20180513 05:59:57<+discordbot> It tends to call it UTF-16 In some places though. 20180513 06:00:12<+discordbot> UTF-32 is ew. 20180513 06:00:14< celticminstrel> Yes, you would need to convert to u32string if you want the random access, but I think that's probably not worth it in most cases? 20180513 06:00:32< celticminstrel> There are probably cases where it's worth it. 20180513 06:00:36<+discordbot> UTF-32 basically requires every single character to be and int. 20180513 06:00:44<+discordbot> This stuff makes my head hurt >_> 20180513 06:00:46< celticminstrel> If you're jumping around a lot in a string, maybe for parsing or something, I dunno. 20180513 06:01:27<+discordbot> Apparently this is why flag emoji count as 2 characters on Twitter. 20180513 06:01:39-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20180513 06:01:40<+discordbot> There are several emoji that are actually combining characters. 20180513 06:01:44< celticminstrel> I'm not sure about that... 20180513 06:01:52< celticminstrel> What shadowm said. 20180513 06:01:57<+discordbot> The ones that define gender or skin colour in particular. 20180513 06:02:09< celticminstrel> Not all emoji are a single code point, but those that are would only count as one character on Twitter. 20180513 06:02:32<+discordbot> IMO, intuitively, if you have a string of combined emoji, and you tried to access the third one, you'd get the third one. Not the first half of the second one 20180513 06:03:02<+discordbot> are you saying the former is what utf8::size gives you 20180513 06:03:18< celticminstrel> Well, utf8::size counts the total length rather than getting a particular code point. 20180513 06:03:45< celticminstrel> But yes, it gives you the number of code points, not the number of logical characters, if I understand correctly. 20180513 06:03:51<+discordbot> so you're saying the former is what std::string::size gives you 20180513 06:03:55< celticminstrel> ??? 20180513 06:04:04<+discordbot> std::string is NOT A UTF-8 STRING. 20180513 06:04:12<+discordbot> Does that make sense now? 20180513 06:04:16<+discordbot> It's just a string of bytes. 20180513 06:04:31< celticminstrel> string::size gives the number of bytes, which is greater than or equal to the number of code points given by utf8::size, which in turn is greater than or equal to the number of logical characters. 20180513 06:04:31<+discordbot> The bytes may or may not be used to encode UTF-8 text. 20180513 06:04:53<+discordbot> blahhh 20180513 06:05:01< celticminstrel> A string of combining characters make a single logical character. I think there's a technical word for this but I'm not sure what it is. 20180513 06:05:10<+discordbot> this is annoying 20180513 06:05:11<+discordbot> The only reason we had the utf8::string alias is because we already use std::string to hold UTF-8 strings. 20180513 06:05:21<+discordbot> The alternative would be... to not use UTF-8. 20180513 06:05:30<+discordbot> Qt uses UTF-16, for example, Windows uses UCS-2 (?). 20180513 06:05:42< celticminstrel> The most sensible length calculation is to count logical characters, so ā for example is always a single character. 20180513 06:05:48<+discordbot> yes 20180513 06:05:54< celticminstrel> (No idea if that has a precomposed form.) 20180513 06:05:55<+discordbot> I agree with that 20180513 06:06:05<+discordbot> But using anything other than UTF-8 requires increasing the memory footprint of simple ASCII strings. 20180513 06:06:18< celticminstrel> But to do that you need access to a character properties database, which is basically what ICU gives you. 20180513 06:06:25<+discordbot> (E.g. all non-UI text and most English UI text.) 20180513 06:06:33< celticminstrel> IIRC "combining" is one of the properties? 20180513 06:06:59<+discordbot> so you're saying only with an ASCII string does string::size equal displayed logical characters 20180513 06:07:03< celticminstrel> So IOW it's relatively difficult to count logical characters, while it's relatively easy to count code points. 20180513 06:07:06< celticminstrel> Yes, exactly. 20180513 06:07:07<+discordbot> @Vultraz yes. 20180513 06:07:12<+discordbot> šŸ¤” 20180513 06:07:23< celticminstrel> Or with a non-Unicode string in most encodings. 20180513 06:07:27<+discordbot> ASCII is the only subset of Unicode that can be represented in 7 bits. 20180513 06:07:38< celticminstrel> (Shift-JIS IIRC is one of the few non-Unicode multibyte encodings.) 20180513 06:07:59<+discordbot> No, there are more multibyte encodings. 20180513 06:08:04< celticminstrel> I said few, not only. 20180513 06:08:11<+discordbot> (Any bytes with the 8 bit set are part of a UTF-8 sequence past U+007F basically.) 20180513 06:08:13< irker328> wesnoth/wesnoth:1.14 Severin Glƶckner 78821696c8 UtBS utils: add female string (fixup) AppVeyor: All builds passed 20180513 06:08:15<+discordbot> For example, ISO Latin 15 uses two bytes per character. 20180513 06:08:24< celticminstrel> I mean, I don't know of very many multibyte encodings. 20180513 06:08:26< celticminstrel> Huh... 20180513 06:11:43< celticminstrel> So anyway, after all this talk, is anyone going to do something about the incorrect utf8::truncate? 20180513 06:11:58<+discordbot> not me 20180513 06:13:27-!- gallaecio [~quassel@213.99.45.54] has joined #wesnoth-dev 20180513 06:59:11< celticminstrel> Help I can't stop responding to ColdSteel. :( 20180513 06:59:39-!- celticminstrel is now known as celmin|sleep 20180513 07:13:08-!- travis-ci [~travis-ci@ec2-54-205-245-66.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 07:13:09< travis-ci> wesnoth/wesnoth#18125 (master - ba64a50 : Iris Morelle): The build is still failing. 20180513 07:13:09< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378278463 20180513 07:13:09-!- travis-ci [~travis-ci@ec2-54-205-245-66.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 07:15:21-!- gallaecio [~quassel@213.99.45.54] has quit [Remote host closed the connection] 20180513 07:16:07<+discordbot> @Vultraz , same as loonycyborg, if you remind us, then I can do that. No problem šŸ˜ƒ 20180513 07:16:21<+discordbot> ok, then would you mind doing so today? 20180513 07:16:32<+discordbot> or tomorrow 20180513 07:17:11<+discordbot> I can do it in 2 hours 20180513 07:18:15<+discordbot> ok no hurry 20180513 07:19:37<+discordbot> @loonycyborg too if you could do so 20180513 07:31:49<+discordbot> @loonycyborg 20180513 07:32:30-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 07:32:31< travis-ci> wesnoth/wesnoth#18126 (1.14 - a6425a1 : Iris Morelle): The build passed. 20180513 07:32:31< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378278486 20180513 07:32:31-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 07:38:28<+discordbot> [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\de\LC_MESSAGES\wesnoth-lib.mo" 117 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\de\LC_MESSAGES\wesnoth-manpages.mo" 50 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\de\LC_MESSAGES\wesnoth-nr.mo" 265 kB [2018-05-13 09:36:46]: Changed: 20180513 07:38:29<+discordbot> "Wesnoth.app\Contents\Resources\translations\de\LC_MESSAGES\wesnoth-sota.mo" 123 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\en_GB\LC_MESSAGES\wesnoth-editor.mo" 7 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\en_GB\LC_MESSAGES\wesnoth-help.mo" 192 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\en_GB\LC_MESSAGES\wesnoth-lib.mo" 109 kB 20180513 07:38:29<+discordbot> [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\en_GB\LC_MESSAGES\wesnoth-manpages.mo" 45 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\it\LC_MESSAGES\wesnoth-help.mo" 160 kB [2018-05-13 09:36:46]: Changed: "Wesnoth.app\Contents\Resources\translations\it\LC_MESSAGES\wesnoth-units.mo" 224 kB [2018-05-13 09:36:46]: Changed: 20180513 07:38:30<+discordbot> "Wesnoth.app\Contents\Resources\translations\it\LC_MESSAGES\wesnoth.mo" 214 kB 20180513 07:41:32<+discordbot> And on for macOS whole update is 6.2MB (Because it also includes newly signed executables and libs) 20180513 07:46:40<+discordbot> ok, updated translations for macOS package are up 20180513 07:46:41< irker328> wesnoth/wesnoth:1.14 mattsc fe9f2bcc96 Do not load helper.lua where it is not u AppVeyor: All builds passed 20180513 08:02:07-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20180513 08:04:10<+discordbot> VULTRAZ 20180513 08:05:24<+discordbot> oui? 20180513 08:06:58< irker328> wesnoth: Iris Morelle wesnoth:master c8c3625e3a86 / src/server/forum_user_handler.cpp: wesnothd: Fix typo introduced recently causing build errors https://github.com/wesnoth/wesnoth/commit/c8c3625e3a86b61b592f19bf80d2410d46e8187c 20180513 08:07:03< irker328> wesnoth: Iris Morelle wesnoth:1.14 bbb17fc2df7f / src/server/forum_user_handler.cpp: wesnothd: Fix typo introduced recently causing build errors https://github.com/wesnoth/wesnoth/commit/bbb17fc2df7fae5d80cf4b2f7daa57978a1b71d9 20180513 08:07:11<+discordbot> At least do us the favour of trying to compile your patches before pushing them. 20180513 08:08:37<+discordbot> but I did 20180513 08:08:47<+discordbot> No, you did not build with fuh. 20180513 08:08:57<+discordbot> oh 20180513 08:08:58<+discordbot> no fuh 20180513 08:10:32< zookeeper> @UnwiseOwl, you might want to make sure you're indenting your WML with spaces instead of tabs. 20180513 08:18:27<+discordbot> Hmmm. https://pastebin.com/g6gTTqmp 20180513 08:19:49<+discordbot> Notably SDL uses the physical measurements from X11 instead of the actual dpi. 20180513 08:25:43-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 08:25:44< travis-ci> wesnoth/wesnoth#18127 (master - c8c3625 : Iris Morelle): The build is still failing. 20180513 08:25:44< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378298150 20180513 08:25:44-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 08:42:20-!- louis94 [~~louis94@91.176.171.238] has joined #wesnoth-dev 20180513 08:43:27<+discordbot> I uploaded translation update to steam 20180513 08:59:05< irker328> wesnoth/wesnoth:1.14 mattsc 18fd87ff04 Do not load helper.lua where it is not u AppVeyor: All builds passed 20180513 09:16:13< irker328> wesnoth: Jyrki Vesterinen wesnoth:1.14 f40220005ac1 / src/gui/dialogs/multiplayer/lobby.cpp: MP lobby: don't attempt to restore player list scroll position too early https://github.com/wesnoth/wesnoth/commit/f40220005ac19184ebb456cfaecac008b676bcf5 20180513 09:16:52< irker328> wesnoth: Jyrki Vesterinen wesnoth:master 91e60267bac3 / src/gui/dialogs/multiplayer/lobby.cpp: MP lobby: don't attempt to restore player list scroll position too early https://github.com/wesnoth/wesnoth/commit/91e60267bac39c6ae160d4c944c7e2bbd339962a 20180513 09:28:34< irker328> wesnoth: Nils Kneuper wesnoth:master adb4c511e232 / po/ (wesnoth-did/fr.po wesnoth-lib/fr.po): updated French translation https://github.com/wesnoth/wesnoth/commit/adb4c511e232ba93e6c23575760c6f0f647159e5 20180513 09:28:36< irker328> wesnoth: Nils Kneuper wesnoth:master 4918a6234e20 / data/ (14 files in 14 dirs): updated Italian translation (images) https://github.com/wesnoth/wesnoth/commit/4918a6234e208d60817e49571c72dcefaaabba9e 20180513 09:28:38< irker328> wesnoth: Nils Kneuper wesnoth:master f9b9d5018f5b / data/ (14 files in 14 dirs): remove executable flag from italian translation images https://github.com/wesnoth/wesnoth/commit/f9b9d5018f5b15451bd5a8761d6849a6500fed56 20180513 09:28:41< irker328> wesnoth: Nils Kneuper wesnoth:1.14 1615e699cbb2 / changelog.md players_changelog.md po/wesnoth-did/fr.po po/wesnoth-lib/fr.po: updated French translation https://github.com/wesnoth/wesnoth/commit/1615e699cbb2c885273bc5b38125880c5e79b805 20180513 09:28:43< irker328> wesnoth: Nils Kneuper wesnoth:1.14 23d71dc1e729 / data/ (14 files in 14 dirs): updated Italian translation (images) https://github.com/wesnoth/wesnoth/commit/23d71dc1e7297dd2518bcb10319fcbb62978c24f 20180513 09:29:14< irker328> wesnoth: Nils Kneuper wesnoth:1.14 fd46b9af6273 / data/ (14 files in 14 dirs): remove executable flag from italian translation images https://github.com/wesnoth/wesnoth/commit/fd46b9af6273aecccc767c6244bf717aa47fafb0 20180513 09:29:19<+discordbot> Oh no, I can no longer execute that translation! šŸ˜¢ 20180513 09:53:04-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 09:53:05< travis-ci> wesnoth/wesnoth#18131 (master - f9b9d50 : Nils Kneuper): The build is still failing. 20180513 09:53:06< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378311503 20180513 09:53:06-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 10:05:22-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 10:09:21-!- louis94 [~~louis94@91.176.171.238] has quit [Ping timeout: 264 seconds] 20180513 10:22:17<+discordbot> TFW you discover if you quit skype with your profile open and immediately try to scroll in chrome your computer will emit 5 loud BEEPS like it's straight out of Sherlock Holmes 20180513 10:22:20<+discordbot> P_P 20180513 10:24:32<+discordbot> @shadowm how are you getting that number? 20180513 10:25:35<+discordbot> SDL_GetDisplayDPI() 20180513 10:26:00<+discordbot> Hmmmmmmmmmmmmmmm 20180513 10:26:59<+discordbot> What's that supposed to mean? 20180513 10:28:21<+discordbot> Yeah, I'm not sure what to do about that 20180513 10:28:33<+discordbot> You're not supposed to do anything. 20180513 10:29:01<+discordbot> I was thinking it might have to do with the lack of a SDL_WINDOW_ALLOW_HIGHDPI window flag, but you said it's a measurement from X11 20180513 10:29:24<+discordbot> It's based on the screens' physical dimensions. 20180513 10:30:15<+discordbot> It's actually requesting that from X.org and not the effective DPI, which is 96 DPI because I overrode NVIDIA's autodetection in the server config. 20180513 10:32:58<+discordbot> I assume you're also utilizing SDL_GetWindowWMInfo to get some of this data? 20180513 10:33:07<+discordbot> No. 20180513 10:33:43<+discordbot> oh? 20180513 10:33:49<+discordbot> Yep. 20180513 10:34:05<+discordbot> Huh. That's what I intended to use. 20180513 10:34:34<+discordbot> specifically since it lists the WML subsystem 20180513 10:34:38<+discordbot> https://gist.github.com/shikadiqueen/1c5bd9e894f99b3edd12f3db8167d0f8 20180513 10:35:36<+discordbot> It's not usable right now because it'll do this with --report: 20180513 06:35:04 error general: Could not enumerate displays: Video subsystem has not been initialized 20180513 10:37:51<+discordbot> --report would need to be moved after CVideo initialization, then. 20180513 10:38:13<+discordbot> Yes, I know how this stuff works. 20180513 10:39:01<+discordbot> It's annoying though. 20180513 10:43:20<+discordbot> Ok, so, GCC 8 has std::filesystem.... and Clang has it not 20180513 10:47:18< irker328> wesnoth: Charles Dang wesnoth:master 1e84ec2b94b8 / src/filesystem.cpp: Added the appropriate check to enable std::filesystem when using GCC 8 https://github.com/wesnoth/wesnoth/commit/1e84ec2b94b831d47b998496ae9751da006f1732 20180513 11:05:21-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection] 20180513 11:05:27-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20180513 11:06:44-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 11:06:45< travis-ci> wesnoth/wesnoth#18134 (master - 1e84ec2 : Charles Dang): The build is still failing. 20180513 11:06:45< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378327676 20180513 11:06:45-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 11:09:41< irker328> wesnoth: Martin HrubyĢ (hrubymar10) wesnoth:master e16373bada5a / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Fix Xcode project after e0192b1b1fe71b98403bad6f0df3c115adbb2291 https://github.com/wesnoth/wesnoth/commit/e16373bada5aa65bc2bd741ebc03193b4ddd9314 20180513 11:13:01<+discordbot> ty 20180513 11:28:53< irker328> wesnoth: Charles Dang wesnoth:master ccbb736a180d / src/ (44 files in 10 dirs): Use std::time_t instead of plain C time_t https://github.com/wesnoth/wesnoth/commit/ccbb736a180d37f2640cd56331b91f855c728464 20180513 11:28:56< irker328> wesnoth: Charles Dang wesnoth:master d26824901de8 / src/ (33 files in 13 dirs): Use std::time() instead of plain C time() https://github.com/wesnoth/wesnoth/commit/d26824901de8c76a32742ebf1d1c3331fe082a60 20180513 11:28:59< irker328> wesnoth: Charles Dang wesnoth:master 00bea6494ff7 / src/ (4 files in 3 dirs): Use std::localtime() instead of plain C localtime() https://github.com/wesnoth/wesnoth/commit/00bea6494ff7ac84f569bc568267fd630aded83e 20180513 11:29:02< irker328> wesnoth: Charles Dang wesnoth:master 36e83e646c01 / src/ (4 files in 3 dirs): Use std::tm instead of plain C tm https://github.com/wesnoth/wesnoth/commit/36e83e646c01906bf1b2ae4694f840f25ee7f349 20180513 11:39:13-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 11:39:14< travis-ci> wesnoth/wesnoth#18135 (master - e16373b : Martin HrubyĢ (hrubymar10)): The build was fixed. 20180513 11:39:14< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378332454 20180513 11:39:14-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 11:57:34< irker328> wesnoth/wesnoth:1.14 doofus-01 fe2fa88970 outrider defense animation AppVeyor: All builds passed 20180513 12:01:08< irker328> wesnoth: Charles Dang wesnoth:master 0dc5656c328c / src/ (43 files in 20 dirs): Convert C-style casts to static_cast https://github.com/wesnoth/wesnoth/commit/0dc5656c328cdd02eebb4dbd10dbab3eb4553b57 20180513 12:03:47<+discordbot> Thanks for removing the C-style casts. šŸ˜ƒ 20180513 12:08:47-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection] 20180513 12:08:53-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20180513 12:16:17<+discordbot> Been meaning to get to it for a long time. In the end it took like 5 minutes šŸ˜¬ 20180513 12:20:22< matthiaskrgr> story of my life 20180513 12:33:30-!- travis-ci [~travis-ci@ec2-54-205-245-66.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 12:33:32< travis-ci> wesnoth/wesnoth#18136 (master - 36e83e6 : Charles Dang): The build is still failing. 20180513 12:33:32< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378336571 20180513 12:33:32-!- travis-ci [~travis-ci@ec2-54-205-245-66.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 12:57:24-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection] 20180513 12:57:30-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20180513 13:02:25< irker328> wesnoth/wesnoth:1.14 doofus-01 2ba8615e0e outrider defense animation AppVeyor: All builds passed 20180513 13:02:27-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20180513 13:03:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 13:04:06< irker328> wesnoth: Charles Dang wesnoth:master cc865027008c / src/server/forum_user_handler.hpp: Fixup ccbb736 https://github.com/wesnoth/wesnoth/commit/cc865027008c1b7012f5d003e5e4375339567fc7 20180513 13:15:36< irker328> wesnoth: Charles Dang wesnoth:master 2c57dc37053d / src/ (13 files in 9 dirs): Convert a bunch more C-style casts I missed in 0dc5656 to static_cast https://github.com/wesnoth/wesnoth/commit/2c57dc37053d844089631c9f6a4737935bf0d7e0 20180513 13:15:39< irker328> wesnoth: Charles Dang wesnoth:master 0d15c1e19e65 / src/ (5 files in 5 dirs): Formatting cleanup: convert remaining cases of > > to >> https://github.com/wesnoth/wesnoth/commit/0d15c1e19e65fd558f200b2300d1ef3ba3617d02 20180513 13:52:33-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 13:52:34< travis-ci> wesnoth/wesnoth#18139 (master - 0d15c1e : Charles Dang): The build passed. 20180513 13:52:34< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/378358682 20180513 13:52:34-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 14:02:00< irker328> wesnoth: gfgtdf wesnoth:1.14 2e27f6ec81e5 / src/whiteboard/recruit.cpp: wb: add a assertion https://github.com/wesnoth/wesnoth/commit/2e27f6ec81e5122a99d466ff1797702b203c2fa0 20180513 14:02:02< irker328> wesnoth: gfgtdf wesnoth:1.14 121361d302bc / src/whiteboard/ (manager.cpp move.cpp): wb: fix incorrect handling of skirmisher. https://github.com/wesnoth/wesnoth/commit/121361d302bcacc3bacb01ae16de7ad761546959 20180513 14:02:04< irker328> wesnoth: gfgtdf wesnoth:1.14 918da0acd4ce / src/fake_unit_ptr.cpp: wb: fix segfault when ending the game https://github.com/wesnoth/wesnoth/commit/918da0acd4cec3067b2bcc5b653ccd2a0d53fc7b 20180513 14:02:06< irker328> wesnoth/wesnoth:master Charles Dang 0d15c1e19e Formatting cleanup: convert remaining ca AppVeyor: vs2015/Debug Failed 20180513 14:02:07< irker328> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-3320 20180513 14:12:11< irker328> wesnoth: gfgtdf wesnoth:master 5c278a39364e / src/editor/palette/location_palette.cpp: editor: don't allow bad location id strings https://github.com/wesnoth/wesnoth/commit/5c278a39364ed1a7d04892f6c33ede3d64961cc8 20180513 14:12:13< irker328> wesnoth: gfgtdf wesnoth:master 5884aa27ea9d / src/whiteboard/side_actions.cpp: wb: don't clear undo stack when dsu is active https://github.com/wesnoth/wesnoth/commit/5884aa27ea9d5a18203e2618c1c0a55321f5dc9e 20180513 14:12:15< irker328> wesnoth: gfgtdf wesnoth:master 6a9e2c260d8d / src/whiteboard/recruit.cpp: wb: add a assertion https://github.com/wesnoth/wesnoth/commit/6a9e2c260d8dd6a3a476f91768547ec7e2afff71 20180513 14:12:17< irker328> wesnoth: gfgtdf wesnoth:master eaabf1648d9d / src/whiteboard/ (manager.cpp move.cpp): wb: fix incorrect handling of skirmisher. https://github.com/wesnoth/wesnoth/commit/eaabf1648d9d200c2f44b7170efcba67bc724061 20180513 14:12:19< irker328> wesnoth: gfgtdf wesnoth:master fd48bad8d929 / src/fake_unit_ptr.cpp: wb: fix segfault when ending the game https://github.com/wesnoth/wesnoth/commit/fd48bad8d929a5ec48d0eeeae063a07b046ea1b4 20180513 14:14:06< matthiaskrgr> \o/ 20180513 14:14:19< matthiaskrgr> will test in a couple 20180513 14:14:24< irker328> wesnoth: gfgtdf wesnoth:master e88a73fc2a5b / src/units/filter.cpp: fix uncaught stoi exception https://github.com/wesnoth/wesnoth/commit/e88a73fc2a5b4deb4c67650b419d0ef528088a65 20180513 14:14:38-!- gfgtdf [~chatzilla@x4e32b1f9.dyn.telefonica.de] has joined #wesnoth-dev 20180513 14:14:39< gfgtdf> better test it on 1.14 20180513 14:14:41-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has joined #wesnoth-dev 20180513 14:14:42< travis-ci> gfgtdf/wesnoth#1118 (1.14 - 918da0a : gfgtdf): The build was fixed. 20180513 14:14:42< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth/builds/378358052 20180513 14:14:42-!- travis-ci [~travis-ci@ec2-54-160-229-24.compute-1.amazonaws.com] has left #wesnoth-dev [] 20180513 14:14:56-!- gfgtdf [~chatzilla@x4e32b1f9.dyn.telefonica.de] has quit [Client Quit] 20180513 14:16:08-!- gfgtdf [~chatzilla@x4e32b1f9.dyn.telefonica.de] has joined #wesnoth-dev 20180513 14:23:01<+discordbot> btw gfgtdf i think you said recently we can probably changed unit to use shared_ptr/shared_from_this instead of intrusive_ptr? 20180513 14:24:44< gfgtdf> hmm, i don't remember saying that, iirc(not sure that part) the main reasion why it uses instrusive_ptr is performance. why woudl you want to maek it use shard_ptr instead 20180513 14:25:49<+discordbot> For one thing, using shared_ptr would allow us to have weak_ptrs which point to units. 20180513 14:26:10<+discordbot> It would allow some parts of the game (such as the whiteboard) to have non-owning references to units. 20180513 14:28:39< gfgtdf> hmm ye that's a point. (althogh i don't think the whiteboard code in partuclkar woudl profit much from it), we coudl them maybe maybe make the lua units obejct use weak_ptrs as an optimisation though. 20180513 14:29:48< celmin|sleep> type(value) is not a C-style cast. 20180513 14:29:56< celmin|sleep> A C-style cast is (type)value. 20180513 14:30:08<+discordbot> Right now, we need the function wb::manager::on_kill_unit() to tell the whiteboard to release its owning reference when an unit is killed. 20180513 14:30:24<+discordbot> Otherwise, the unit's halo (if any) will stay behind. 20180513 14:30:27< celmin|sleep> TBH I prefer constructor-style casts over static_cast, but I guess it's okay for you to convert them... 20180513 14:30:38<+discordbot> Since the halo is removed in the unit's destructor. 20180513 14:30:44< celmin|sleep> But I wonder now, are there any actual C-style casts still around? 20180513 14:31:53< gfgtdf> hmm ye that's the wb::highlighter i didn't had to deal with that part ye,the other part all use units ids as refernces 20180513 14:32:12<+discordbot> celticminstrel: see http://stackoverflow.com/a/32224 20180513 14:32:33<+discordbot> The correct name is function-style cast, but it's semantically identical to C-style cast. 20180513 14:33:09< celmin|sleep> I still prefer it in some cases, particularly numerical casts. 20180513 14:33:43< celmin|sleep> And it's more searchable than the C-style cast. 20180513 14:35:14< celmin|sleep> Though admittedly still not as searchable as the C++ casts. 20180513 14:37:32-!- celmin|sleep is now known as celticminstrel 20180513 15:07:40< gfgtdf> @jyrkive did you see the discussion in #3042 ? 20180513 15:08:59< celticminstrel> I wonder if we should actually sprinkle some dirt patches through the HTTT caves to make them slightly less bad for humans and elves. 20180513 15:09:32< celticminstrel> I did that in my campaign and am doing it for the cave random map that I plan to include in the game. 20180513 15:10:48<+discordbot> gfgtdf: No, I hadn't seen it. 20180513 15:12:29<+discordbot> I'll need to check whether what you say is really true (that the engine generates units with negative HP). 20180513 15:13:33< matthiaskrgr> gfgtdf: looks good, seems the bugs are fixed :) 20180513 15:13:42<+discordbot> And if it's a problem, I'll try to find a way to still treat negative HP as an error if it doesn't originate from the engine. 20180513 15:14:33<+discordbot> i think you can easily trigger it by having a last breath event 20180513 15:14:45<+discordbot> you'll see the unit has negative hp 20180513 15:14:58-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 256 seconds] 20180513 15:24:09< gfgtdf> matthiaskrgr: nice thx 20180513 15:24:33< gfgtdf> matthiaskrgr: so people can finally use planning mode without fear :) 20180513 15:24:54<+discordbot> Good work gfgtdf 20180513 15:26:19< gfgtdf> it still not perfect (for example #3100) but i main goal was realyl to prevent crashes (& the resulting dataloss) from plannign mode 20180513 15:30:12< matthiaskrgr> yeh :) 20180513 15:51:01<+discordbot> Please ensure everything is forward/Back ported 20180513 15:51:17< gfgtdf> dids that 20180513 15:56:48<+discordbot> What about the stoi commit 20180513 16:11:28<+discordbot> Yeah, I can't work out commits just yet (something something old dogs). Is there someone I can send my changes files to who can post the couple I want to do while I try to puzzle this one? 20180513 16:12:06< gfgtdf> that is actually the lastest commit on master 20180513 16:12:35< celticminstrel> It's possible. 20180513 16:12:49< gfgtdf> vultraz: not 100% what the question was. 20180513 16:13:02< celticminstrel> If you want to send changes by email though, the preferred format is an actual diff, rather than the full affected files. 20180513 16:13:55< celticminstrel> And AFAIK you need to be able to use the command-line to do that (though who knows, maybe there are git UIs that support it, but you'd need to download them in that case). 20180513 16:14:02< celticminstrel> @UnwiseOwl ^ 20180513 16:14:25< celticminstrel> Alternatively we can help you with figuring out how to use git. 20180513 16:15:28<+discordbot> I mean, that would be ideal, but you might have to be...very patient with me. 20180513 16:15:35-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 16:16:08< celticminstrel> I can probably manage that as long as you actually try. 20180513 16:17:19<+discordbot> I shall try not to be offended by the implication :P I am about to rush off, though, so thanks for the offer but can I take you up on it a little later on/make a time? 20180513 16:18:32< celticminstrel> I guess? 20180513 16:18:37< celticminstrel> I'm here all day. 20180513 16:18:47< celticminstrel> Though I might not be paying attention all day. 20180513 16:18:54< celticminstrel> Planning to work on my campaign a bit later. 20180513 16:19:12<+discordbot> Seems fair enough to me. I'll hit you up later. Cheers. 20180513 16:20:22-!- louis94 [~~louis94@91.176.171.238] has joined #wesnoth-dev 20180513 16:30:29-!- gfgtdf [~chatzilla@x4e32b1f9.dyn.telefonica.de] has quit [Remote host closed the connection] 20180513 16:35:11-!- gfg [~androirc@port-13581.pppoe.wtnet.de] has joined #wesnoth-dev 20180513 16:41:33-!- gfgt [~androirc@port-13581.pppoe.wtnet.de] has joined #wesnoth-dev 20180513 16:43:16-!- gfg [~androirc@port-13581.pppoe.wtnet.de] has quit [Ping timeout: 268 seconds] 20180513 16:46:21-!- gfgt [~androirc@port-13581.pppoe.wtnet.de] has quit [Ping timeout: 268 seconds] 20180513 16:52:47-!- gfg [~androirc@tmo-106-17.customers.d1-online.com] has joined #wesnoth-dev 20180513 17:12:39< Ravana_> is there any solution for https://forums.wesnoth.org/viewtopic.php?p=628111#p628111 ? As far as I see, workaround is disabling translations and changing name. 20180513 17:15:13-!- irker328 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20180513 17:20:59<+discordbot> @loonycyborg Did you update the translations for the Linux version as well? 20180513 17:21:31<+discordbot> I updated data repo that is used by both windows and linux 20180513 17:23:47<+discordbot> Oh, okay, found a few .mo files with mtime from today. I must've missed it somehow. 20180513 17:23:57<+discordbot> 6:08 am, no wonder I missed it. 20180513 17:24:23<+discordbot> it's small download, so it seems it happened lightning fast 20180513 17:31:59-!- nnarol [~ideapad@catv-89-133-104-233.catv.broadband.hu] has joined #wesnoth-dev 20180513 17:33:06< nnarol> Hi! I did a game development workshop on 2 weekends, and I used a couple of assets from the Wesnoth project. I always gave credit to Wesnoth, but I don't exactly know who created the particular sprites. 20180513 17:33:47< nnarol> Am I allowed to distribute some sprites to the participants along with an example project now that the workshop is finished? 20180513 17:34:10< nnarol> If yes, how do I find out who I give credit for them? 20180513 17:39:55-!- irker612 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20180513 17:39:55< irker612> wesnoth/wesnoth:1.14 Nils Kneuper fd46b9af62 remove executable flag from italian tran AppVeyor: All builds passed 20180513 17:44:56< celticminstrel> Um... 20180513 17:45:55< celticminstrel> Well, you could check the game credits on the wiki, I suppose. It does mention in some cases who did what art, though I'm not sure how reliable that is if their art was later replaced... 20180513 17:46:07< celticminstrel> (It'd have to be on the wiki because IIRC the in-game credits leave out that information.) 20180513 17:46:36< celticminstrel> I guess you could also point to the specific assets you used and ask around here. 20180513 17:47:04< celticminstrel> Not sure who's likely to know, though. 20180513 17:57:16< nnarol> celticminstrel: Thanks! 20180513 17:57:41< nnarol> So does anyone know who did the sprites for the Giant Mud Golem and the Fireghost? 20180513 17:59:03< celticminstrel> So the Giant Mudcrawler and the Fire Elemental, I presume... 20180513 18:00:15< nnarol> Sorry, yeah. 20180513 18:00:27< nnarol> Althought the file is fireghost.png 20180513 18:00:34< celticminstrel> Is it? Huh. 20180513 18:00:41< nnarol> The mudgolem indeed is giant-mudcrawler. 20180513 18:01:04< celticminstrel> I think the fire elemental is one of the older sprites. The mudcrawler IIRC is more recent, but as for who did it... I'm not sure. 20180513 18:01:31< celticminstrel> I feel like I should know this one but I don't. 20180513 18:02:27-!- louis94 [~~louis94@91.176.171.238] has quit [Ping timeout: 240 seconds] 20180513 18:02:37< irker612> wesnoth/wesnoth:master gfgtdf e88a73fc2a fix uncaught stoi exception AppVeyor: vs2017/Debug Failed 20180513 18:02:38< irker612> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-3036 20180513 18:07:59< nnarol> celticminstrel: Do you know by any chance if I have to ask for permission from the respective creators or if I'm only required to credit them? 20180513 18:08:42< celticminstrel> I think crediting them would be sufficient. Technically even that may be unnecessary, but it's polite. 20180513 18:12:15< nnarol> celticminstrel: I want to make sure because I not only really like this game, but also find it amazing that the community is creating it for free and I think this deserves even more recognition than someone doing this for a business. 20180513 18:18:28< celticminstrel> The images are GPL, and there are plans to switch to something like CC-BY-SA slowly, so I think just crediting should be enough. 20180513 18:18:40< mattsc> nnarol: for reference, you can go to the image on github, e.g.: https://github.com/wesnoth/wesnoth/blob/master/data/core/images/units/monsters/giant-mudcrawler.png 20180513 18:18:48< mattsc> Then click on ā€˜Historyā€ 20180513 18:18:58< celticminstrel> Yeah, sometiems that'll get you the answer. 20180513 18:19:00< celticminstrel> ^sometimes 20180513 18:19:05< celticminstrel> But I don't think it'll always work? 20180513 18:19:14< mattsc> That will at least tell you who committed the image, and then you could ask that person whether they did it or got it from somebody. 20180513 18:19:38< mattsc> It doesnā€™t always work (at least not easily), for example if the file got renamed or moved or something. 20180513 18:19:46< celticminstrel> Actully, looks like that's the case with this one. 20180513 18:20:00< celticminstrel> Or wait, no. 20180513 18:20:10< nnarol> Or "git log --follow " 20180513 18:20:13< celticminstrel> The first commit isn't always the relevant one. 20180513 18:20:29< mattsc> Right. On both of those. 20180513 18:20:59< mattsc> Another possibility is to go to the forums and search there. 20180513 18:21:16< mattsc> Often (but not always) images are discussed there before they are committed. 20180513 18:21:32< celticminstrel> Looks like LordBob did the mudcrawler? But I didn't think he did sprites? 20180513 18:21:48< celticminstrel> He committed it at least, so he should probably know who did it if it wasn't him. 20180513 18:21:56< mattsc> Exactly. 20180513 18:22:10< celticminstrel> Isn't he on Discord? 20180513 18:22:51<+discordbot> @LordBob ^ 20180513 18:24:07< celticminstrel> I keep putting off working on my campaign... 20180513 18:24:53 * mattsc keeps putting of work on his AI. 20180513 18:24:59< mattsc> offff 20180513 18:25:06< celticminstrel> I think the AI part works now, at least. 20180513 18:25:25< celticminstrel> Decided to stick with giving human control to side 3 after the negotiations, for now. 20180513 18:25:25< mattsc> Good. Thatā€™s not the AI I was talking about though. 20180513 18:25:31< celticminstrel> I know. 20180513 18:25:33< mattsc> Okay. 20180513 18:25:44< celticminstrel> Now considering whether I can give the elves more arcane somehow. 20180513 18:26:06< mattsc> ā€œā€¦ and then a miracle occurred.ā€ 20180513 18:26:23< celticminstrel> Without a literal deus ex machina preferably. 20180513 18:26:43< celticminstrel> Also decided to give the queen leadership. 20180513 18:27:18< celticminstrel> For some reason I found I couldn't use my potions, too. Wonder why that is... 20180513 18:27:48< celticminstrel> Maybe it's okay though, the potions might've just been left with the main group. 20180513 18:28:11< celticminstrel> Giving them more impact might work too... 20180513 18:28:18< celticminstrel> ... 20180513 18:28:31< celticminstrel> Elvish Hunter. 20180513 18:28:40< celticminstrel> That's impact, right? 20180513 18:28:42< celticminstrel> The bolas? 20180513 18:28:48< celticminstrel> Maybe I should use that... 20180513 18:32:43< mattsc> You have a lot of undead to deal with there ā€¦ 20180513 18:37:43-!- louis94 [~~louis94@91.176.171.238] has joined #wesnoth-dev 20180513 18:48:25-!- Bhoren [~Bhoren_wh@2a01:e0a:c:2150:5cb5:5bca:425f:d881] has joined #wesnoth-dev 20180513 18:49:28< celticminstrel> Yeah. 20180513 19:02:03< irker612> wesnoth/wesnoth:master Charles Dang 0d15c1e19e Formatting cleanup: convert remaining ca AppVeyor: 1/2 builds failed 20180513 19:02:04< irker612> Details vs2015/Debug: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-3320 20180513 19:11:24-!- commavir [vir@2604:180::502b:135a] has joined #wesnoth-dev 20180513 19:29:51-!- TheJJ [~rofl@ipbcc05d72.dynamic.kabel-deutschland.de] has quit [Read error: Connection reset by peer] 20180513 19:31:10-!- TheJJ [~rofl@ipbcc05d72.dynamic.kabel-deutschland.de] has joined #wesnoth-dev 20180513 19:31:15-!- gfg [~androirc@tmo-106-17.customers.d1-online.com] has quit [Ping timeout: 255 seconds] 20180513 19:40:09-!- Grickit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev 20180513 19:44:57-!- Grickit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection] 20180513 20:07:59<+discordbot> @shadowm refering to your post in the forum about IfTU and the RNG mods.... Maybe status.unvulnerable=yes sutvives them? 20180513 20:08:27<+discordbot> (I don't think it's worthy the effort to support these mods though) 20180513 20:14:26<+discordbot> Is that new in 1.14.x? 20180513 20:14:51-!- Bhoren [~Bhoren_wh@2a01:e0a:c:2150:5cb5:5bca:425f:d881] has quit [Quit: Leaving] 20180513 20:15:52-!- louis94 [~~louis94@91.176.171.238] has quit [Ping timeout: 250 seconds] 20180513 20:17:12<+discordbot> Now that you state it.. yes. And it's acutally called invulnerable. I use it for debugging 20180513 20:17:51<+discordbot> Hm, I'll keep this in mind, thanks. 20180513 20:23:42< zookeeper> about time to merge the dustbok PR, i suppose... 20180513 20:23:56< celticminstrel> Invulnerable status makes the chance to it 0%. 20180513 20:24:10< celticminstrel> Which also seems to cause AI to not target them at all because they know they can't defeat them. 20180513 20:32:50< irker612> wesnoth: doofus-01 wesnoth:1.14 982407847843 / data/campaigns/Under_the_Burning_Suns/ (3 files in 3 dirs): [UtBS] replacing horses with dustboks (#3049) https://github.com/wesnoth/wesnoth/commit/982407847843f96e387b30783becf983a25dd7c4 20180513 20:33:52-!- ancestral [~anonymous@71-34-19-123.mpls.qwest.net] has joined #wesnoth-dev 20180513 20:34:21< celticminstrel> \o/ 20180513 20:36:55< zookeeper> good grief, git, why can't you let me cherry-pick with an unclean working tree? so annoying. 20180513 20:37:56< celticminstrel> Your working tree doesn't have a commit hash... 20180513 20:38:09< celticminstrel> But maybe I'm misunderstanding what you want. 20180513 20:46:18< irker612> wesnoth: doofus-01 wesnoth:master fa59b1084c44 / data/campaigns/Under_the_Burning_Suns/ (3 files in 3 dirs): [UtBS] replacing horses with dustboks (#3049) https://github.com/wesnoth/wesnoth/commit/fa59b1084c44140b4d244eaf699c7de90adb8c47 20180513 20:54:21-!- gfg [~androirc@tmo-106-17.customers.d1-online.com] has joined #wesnoth-dev 20180513 21:00:37-!- louis94 [~~louis94@91.176.171.238] has joined #wesnoth-dev 20180513 21:00:45< irker612> wesnoth: catagent101 wesnoth:master 743be1522cfe / data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg: TSG S07a: Fix dialogue not triggering in TSG 'Into the Depths' (#3048) https://github.com/wesnoth/wesnoth/commit/743be1522cfe101da31744f9718f1563354eedee 20180513 21:03:39< irker612> wesnoth: catagent101 wesnoth:1.14 abbcad42c225 / data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg: TSG S07a: Fix dialogue not triggering in TSG 'Into the Depths' (#3048) https://github.com/wesnoth/wesnoth/commit/abbcad42c2250a2cca12fc69f594d7f89fc29181 20180513 21:04:44< irker612> wesnoth/wesnoth:1.14 gfgtdf 918da0acd4 wb: fix segfault when ending the game AppVeyor: All builds passed 20180513 21:10:10< loonycyborg> in my experience a good was to satisfy git commands that complain about unclean working copy is git stash 20180513 21:10:21< loonycyborg> though still annoying 20180513 21:11:34< loonycyborg> I think it refuses to work because cherry-pick has potential to cause conflict both with current branch and working copy changes 20180513 21:11:47< loonycyborg> and resolving that would be insane 20180513 21:12:53< celticminstrel> Oh right, that's what he was talking about. 20180513 21:13:53< zookeeper> yeah, it could just fail _if_ there would be a conflict with working copy changes. 20180513 21:18:33-!- nnarol [~ideapad@catv-89-133-104-233.catv.broadband.hu] has quit [Quit: Leaving] 20180513 21:20:55-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20180513 21:21:04-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 21:21:20-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20180513 21:21:25-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 21:22:12-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20180513 21:22:25-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 21:24:59-!- gfg [~androirc@tmo-106-17.customers.d1-online.com] has quit [Remote host closed the connection] 20180513 21:26:59< irker612> wesnoth: ln-zookeeper wesnoth:1.14 24eee52d08c6 / data/core/terrain-graphics.cfg: Fixed a remaining glitch with off-map<->water transitions https://github.com/wesnoth/wesnoth/commit/24eee52d08c64a69a324602c655ef0afab725738 20180513 21:27:18< zookeeper> duh. dunno why i didn't see that one before (i know i had looked, possibly several times). 20180513 21:28:30< irker612> wesnoth: ln-zookeeper wesnoth:master 9c6503507592 / data/core/terrain-graphics.cfg: Fixed a remaining glitch with off-map<->water transitions https://github.com/wesnoth/wesnoth/commit/9c65035075928f7b10d24ff8534873ca4815759b 20180513 21:31:33-!- gfg [~androirc@tmo-106-17.customers.d1-online.com] has joined #wesnoth-dev 20180513 21:32:58-!- sevu [~Shiki@p548547E5.dip0.t-ipconnect.de] has joined #wesnoth-dev 20180513 21:33:28< sevu> Feeling like fixing terrain glitches? Maybe you could have a look at the top right castle in #2061. Happens with any castle type in that constellation. 20180513 21:41:20< zookeeper> hmh... 20180513 21:44:42-!- louis94 [~~louis94@91.176.171.238] has quit [Ping timeout: 276 seconds] 20180513 21:45:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20180513 21:45:53-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 21:46:25-!- louis94 [~~louis94@91.176.171.238] has joined #wesnoth-dev 20180513 21:46:27< zookeeper> sevu, it's... tricky. 20180513 21:49:28<+discordbot> I belive terrain rules are a minefield ... 20180513 21:50:05<+discordbot> abandon all hope, ye who enter here 20180513 21:54:10< zookeeper> oh, hmm, maybe i got it after all. 20180513 21:55:01< zookeeper> sevu, you wouldn't want to whip up a test map that comprehensively features all those possible castle<->wall interactions? :p 20180513 21:55:35< zookeeper> (using one castle type) 20180513 21:56:27< EliDupree> LOL, I just had an amusing error resulting from using [do_command] from wesnoth.game_events.on_mouse_action and having the click also be interpreted as telling the selected unit to move. Is there a way to suppress the default behavior of the click? 20180513 21:57:13-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 265 seconds] 20180513 21:57:31<+discordbot> zookeeper, I would 20180513 22:00:20< zookeeper> that'd be convenient, since i'd like to be sure that my fix doesn't cause any new problems 20180513 22:01:03< zookeeper> besides, i need to spend some time thinking of how to comment the fix so that it's somehow understandable... :p 20180513 22:01:23< mattsc> Blargh. git just produced a merge commit that I donā€™t care about ā€¦ 20180513 22:07:43<+discordbot> There is a different issue for Km instead of the other casles/keeps in that location 20180513 22:16:09< zookeeper> there is? 20180513 22:17:02< zookeeper> oh, Km. yeah. 20180513 22:17:36< zookeeper> can't fix that, really. 20180513 22:17:51< celticminstrel> Not you too. 20180513 22:17:59< celticminstrel> Vultraz is bad enough with his declarations of impossibility. 20180513 22:18:11< zookeeper> prove me wrong 20180513 22:18:29<+discordbot> Speaking of impossible, celmin, you still up for teaching me how to make PRs? 20180513 22:18:34< celticminstrel> Well. That's too much work, so whatever. Maybe someday. 20180513 22:18:37< celticminstrel> @UnwiseOwl Sure 20180513 22:19:05< zookeeper> besides, "can't fix that, really" doesn't read as a declaration of impossibility to me. 20180513 22:19:17< celticminstrel> Really? Well, if you say so. 20180513 22:19:21< zookeeper> whereas something like "cannot be fixed" would 20180513 22:19:37< celticminstrel> Uh. I don't see the difference? 20180513 22:19:45<+discordbot> I'm with zook, it says "I can't do this" not "noone can do this" 20180513 22:20:01< celticminstrel> Oh, hm. I guess I can see that. 20180513 22:20:07< celticminstrel> ...also, zook, really? 20180513 22:20:19<+discordbot> I don't know, typing is hard. 20180513 22:20:27< celticminstrel> That it is. 20180513 22:20:32<+discordbot> Sorry, zookeeper 20180513 22:20:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 22:21:00< zookeeper> for what? 20180513 22:21:10< celticminstrel> I just thought it was somehow an amusing shortening. >_> 20180513 22:22:38<+discordbot> Anyways. I have a fork of wesnoth, a local clone, some files I want to update. What's my next step? Assume zero understanding of how to use the command line (I have the github website and sourcetree if those are workable) 20180513 22:23:16<+discordbot> Those files are for two different prs. You said something about having to make a branch. 20180513 22:23:33< zookeeper> if you only want to edit text files, i suppose you could make do with the github web interface alone (you'd end up with a commit per file, but PR's can be squash-merged...). 20180513 22:24:12< celticminstrel> Oh SourceTree, nice. 20180513 22:24:17< celticminstrel> I forgot how to use it though. >_> 20180513 22:24:28<+discordbot> That is all that I want to do, I'm pretty sure. I have a map edit and changes to a couple of scenarios to respond to bugs. 20180513 22:24:34 * celticminstrel opens it up... 20180513 22:24:56<+discordbot> I don't really know it, but I use it for Imperial Era stuff where it doesn't matter if I screw up someone elses repository. 20180513 22:25:04< celticminstrel> Though this is probably an old version. 20180513 22:25:12< celticminstrel> But I doubt it has changed appreciably. 20180513 22:25:23< celticminstrel> Okay, so it looks like there's a branch button. 20180513 22:25:41< celticminstrel> And there's also a checkout button. 20180513 22:25:42< celticminstrel> SO 20180513 22:25:53< celticminstrel> First click checkout and make sure you're on the right branch (either 1.14 or master). 20180513 22:26:24<+discordbot> Don't have checkout, I don't think. I have a checkout textbox in the branch menu? 20180513 22:26:42< zookeeper> aaanyway, the way castles now connect with adjacent walls is really just a clever hack (even if i do say so myself) that happens to work in almost cases, but the walls for the merfolk keep (and orcish keep) in particular are simply so tall that the hackery shows. only solutions are to cut all castles differently to allow that one special case to work better, or to pile on more hacks. 20180513 22:26:44< celticminstrel> I dunno, but the checkout command has to be somewhere... 20180513 22:26:56< celticminstrel> I also see it in the Repository menu? 20180513 22:26:58<+discordbot> I shall search. 20180513 22:27:13<+discordbot> got it. 20180513 22:27:25-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20180513 22:27:29< celticminstrel> I'm guessing you want to be on 1.14 not master, but not sure. 20180513 22:27:35< irker612> wesnoth: mattsc wesnoth:1.14 bf81191b2199 / data/ai/micro_ais/scenarios/ (18 files): MAI test scenarios: remove uses of deprecated MESSAGE macro https://github.com/wesnoth/wesnoth/commit/bf81191b2199710574f3dbfc9739ed0969437c3d 20180513 22:27:40-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 22:27:49<+discordbot> checkout remote branch ->master 20180513 22:28:00<+discordbot> Oh, 1.14? I honestly have no idea which. 20180513 22:28:06< celticminstrel> What were you doing again? 20180513 22:28:21<+discordbot> minor fixes to mainline campains 20180513 22:28:30< celticminstrel> Yeah, probably 1.14 then. 20180513 22:28:36<+discordbot> gfgtdf's last commit isn't on 1.14 right 20180513 22:28:42< celticminstrel> Don't ask me. 20180513 22:29:17< celticminstrel> It's nice how SourceTree shows all your stashes in a nice convenient list, maybe I should get back into using it (maybe even download it for Windows)... 20180513 22:29:25<+discordbot> Hrmm...can't checkout since I already have something called master (took a fork just earlier) 20180513 22:29:39< celticminstrel> I thought you were checking out 1.14? 20180513 22:29:51<+discordbot> ...good point. 20180513 22:29:56< celticminstrel> When I click checkout it gives be a choice to checkout existing or new branch, you may want the latter. 20180513 22:30:02< celticminstrel> ^gives me 20180513 22:30:21<+discordbot> Yup. 20180513 22:30:23<+discordbot> looks like it is 20180513 22:30:37-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20180513 22:30:40< celticminstrel> Henceforth you'll want checkout existing, though. 20180513 22:30:46< celticminstrel> ANYWAY 20180513 22:30:59< celticminstrel> You've got 1.14 checked out now? It should be shown in bold in the sidebar or something. 20180513 22:31:05<+discordbot> yes. 20180513 22:31:11< celticminstrel> Then you need to create a new branch. 20180513 22:31:26< celticminstrel> That's also in the repository menu or a toolbar button. 20180513 22:32:00<+discordbot> yeah, but wait on, it's still got my own attempt at these commits in here... 20180513 22:32:05< celticminstrel> Current branch should be 1.14 (that'll probably be filled in already) and you can use anything for the new branch name (no spaces though). 20180513 22:32:09< celticminstrel> Hm? 20180513 22:32:21< celticminstrel> Is that on 1.14 or on master? 20180513 22:32:34< celticminstrel> As long as your previous attempt is not currently checked out there should be no problem. 20180513 22:33:00< celticminstrel> Log view should be able to answer this question. 20180513 22:33:44<+discordbot> If it's checked out, what will it look like? 20180513 22:34:18< celticminstrel> There should be no line connecting it to the commit tagged 1.14. 20180513 22:34:35< celticminstrel> That is, 1.14 and your previous attempt should be on different branches of the graph. 20180513 22:34:47<+discordbot> oh god....gimme a minute 20180513 22:35:08< celticminstrel> ? 20180513 22:36:05< mattsc> Uh ā€¦ Iā€™ll take that minuteā€¦ 20180513 22:36:24<+discordbot> go ahead, mattsc 20180513 22:36:41< mattsc> Why does a git cherry-pick of that commit bf81 up there tell me ā€œunknown revisionā€ on master? 20180513 22:36:50< mattsc> I did do a ā€˜git pull upstream masterā€™ first. 20180513 22:37:10< mattsc> As in, what might I be missing? 20180513 22:38:26< celticminstrel> Eh? 20180513 22:38:29< celticminstrel> I don't get it. 20180513 22:38:33< mattsc> Me neither. 20180513 22:38:35< celticminstrel> What tells you "unknown revision"? 20180513 22:38:39<+discordbot> Not sure which transistions are to be tested, could you point me to the code? On this one is also visible that Cme_se does noit fit if the castle at se is not having a high tower, but that's specific to Cme. Map code so far https://bpaste.net/show/825f82e5d92d 20180513 22:38:40<+discordbot> https://cdn.discordapp.com/attachments/259976436490829825/445354212851712000/Bildschirmfoto_der_Karte_006.png 20180513 22:38:42<+discordbot> ^ zookeper, if you could link me to the transition rules I can look what test cases are really needed 20180513 22:38:44< celticminstrel> Oh waiut! 20180513 22:38:50< celticminstrel> ^wait 20180513 22:38:57< celticminstrel> You're saying it won't let you cherry-pick it... 20180513 22:39:02< mattsc> When I do ā€˜git cherry-pick bf81191b2199710574f3dbfc9739ed0969437ā€™ I get: 20180513 22:39:07< mattsc> fatal: bad revision 'bf81191b2199710574f3dbfc9739ed0969437' 20180513 22:39:16< celticminstrel> bf81 is not on master, that could be why. 20180513 22:39:29< mattsc> So itā€™s not a merge conflict. Somehow it does not that hash. 20180513 22:39:34< celticminstrel> Oh wait, but you pushed it... 20180513 22:39:37< celticminstrel> So you should have it, right? 20180513 22:39:44< mattsc> Right. But thatā€™s how Iā€™ve always been doing it. 20180513 22:39:49< mattsc> Right. 20180513 22:40:07< celticminstrel> ... 20180513 22:40:17< celticminstrel> What happens if you "git cherry-pick 1.14"? 20180513 22:40:34< mattsc> Actually, let me try something different quickly. 20180513 22:40:38< celticminstrel> That's how I usually do it, so I don't have to copypaste all the commit hashes. 20180513 22:41:34< irker612> wesnoth: mattsc wesnoth:master 5e5a9e69e5e3 / data/ai/micro_ais/scenarios/ (18 files): MAI test scenarios: remove uses of deprecated MESSAGE macro https://github.com/wesnoth/wesnoth/commit/5e5a9e69e5e3b0323e39ebfb090cc060347f4516 20180513 22:41:41< mattsc> Ah. Hmm. 20180513 22:41:51< mattsc> Iā€™ll explain later. Minor family emergency ... 20180513 22:41:51<+discordbot> When my minute is up... So this seems like a lot of pushes/pulls but as long as that's ok I think I'm in the right place so far? 20180513 22:41:52<+discordbot> https://cdn.discordapp.com/attachments/259976436490829825/445355005445406721/unknown.png 20180513 22:45:32-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20180513 22:45:47-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20180513 22:46:08<+discordbot> ^ celmin? 20180513 22:46:52< celticminstrel> So the three pink commits are on the 1.14 branch. 20180513 22:47:10< celticminstrel> Wow your toolbar looks different. 20180513 22:47:19< celticminstrel> But I suppose I shouldn't be too surprised. 20180513 22:47:33< celticminstrel> The basic layout seems the same, at least. 20180513 22:47:53< celticminstrel> Are those three commits the ones you wanted to merge? 20180513 22:47:53<+discordbot> But I can ignore them and go to my tirigaz branch all good, though? 20180513 22:48:16< celticminstrel> Well it seems the tirigaz branch is the same as the 1.14 branch... 20180513 22:48:36< celticminstrel> How many of those pink commits are your work? 20180513 22:48:44<+discordbot> You're talking about the NRS2 commits? No those aren't mine. 20180513 22:48:57< celticminstrel> Which one is yours? 20180513 22:49:04< celticminstrel> DW5 Tirigaz? 20180513 22:49:08<+discordbot> The one of the blue line only was my previous attempt, yes. 20180513 22:49:13< celticminstrel> Okay. 20180513 22:49:42< celticminstrel> Interesting that that's on origin/1.14. That'll need to be fixed, I guess, but anyway... yeah, go to your tirigaz branch. 20180513 22:49:56<+discordbot> ok 20180513 22:49:58< celticminstrel> Ideally you could just cherry-pick the commit that you've already made, not sure how to do that in SourceTree though... 20180513 22:50:13< celticminstrel> Ah, right-click it and select Cherry Pick. 20180513 22:50:29< celticminstrel> Make sure the tirigaz branch is checked out (in bold) first. 20180513 22:50:36<+discordbot> gotcha 20180513 22:50:44< celticminstrel> (I think you can also check out a branch by double-clicking it on the sidebar BTW.) 20180513 22:50:57<+discordbot> Yeah, that's how I've been doing it; 20180513 22:50:59< celticminstrel> Cherry-pick basically copies the commit to another branch. It's very useful. 20180513 22:51:00<+discordbot> Ok. 20180513 22:51:07<+discordbot> Yeah, that's sweet 20180513 22:51:40< celticminstrel> Once you've done that I suggest making another new branch (also based on 1.14, not on tirigaz) and then cherry-picking the UtBS commit to that. 20180513 22:51:49< celticminstrel> Then you can push everything. 20180513 22:52:08< celticminstrel> And force-push 1.14 to delete the spare copy of those two commits from your fork. 20180513 22:52:41< celticminstrel> Probably best to verify that the commits on their own branches were correctly pushed first, though. 20180513 22:52:44<+discordbot> ok, made that force and picked. 20180513 22:52:50<+discordbot> *fork 20180513 22:53:02< celticminstrel> Otherwise the only way to get the commit back is to go into the reflog which is... kinda advanced I believe... 20180513 22:53:19<+discordbot> Those two branches look good to me. 20180513 22:53:22-!- ancestral [~anonymous@71-34-19-123.mpls.qwest.net] has quit [Quit: ancestral] 20180513 22:53:26< celticminstrel> So then, push them. 20180513 22:53:47< celticminstrel> Then on GitHub's site you can open a PR against 1.14 (maybe you can even do that from SourceTree, not sure). 20180513 22:54:02<+discordbot> push back to my local 1.14? 20180513 22:54:12< celticminstrel> First push the two new branches. 20180513 22:54:28<+discordbot> push to origin? 20180513 22:54:43< celticminstrel> Uh, depends, what's origin? Like, the URL or whatever. 20180513 22:55:03< celticminstrel> You probably want a URL that includes your username. 20180513 22:55:18< celticminstrel> ie, you want to push to your fork, not the main Wesnoth repo. 20180513 22:55:40<+discordbot> yeah. I think that's origin...guess we'll find out. 20180513 22:56:01<+discordbot> to 1.14 on there, yes? 20180513 22:56:07< celticminstrel> It does tell you what the URL is when you push, at least on my version, but if it's wrong it'll just fail, so... 20180513 22:56:14< celticminstrel> You're pushing the branches, not 1.14. 20180513 22:56:18<+discordbot> yes 20180513 22:56:21< celticminstrel> The 1.14 branch isn't involved at all. 20180513 22:56:39< celticminstrel> So for example, you want to push the tirigaz branch so that it becomes a tirigaz branch on your fork. 20180513 22:56:57<+discordbot> Yes, but I am struggling to do that. 20180513 22:57:21<+discordbot> https://cdn.discordapp.com/attachments/259976436490829825/445358908090089482/unknown.png 20180513 22:57:46< celticminstrel> I think that setup looks good. 20180513 22:57:54<+discordbot> oh dear...invalid username and password...no it's not, behave you stupid thing 20180513 22:57:58< celticminstrel> Local branch tirigazattempt, remote branch tirigazattempt. 20180513 22:58:06< celticminstrel> And the URL looks correct too. 20180513 22:58:49< celticminstrel> (Normally I'd recommend using ssh instead of https, but perhaps for SourceTree it doesn't actually matter.) 20180513 22:58:56< celticminstrel> (And it's certainly harder to set up.) 20180513 22:59:27<+discordbot> git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --set-upstream origin subterranean:subterranean tirigazattempt:tirigazattempt remote: Invalid username or password. fatal: Authentication failed for 'https://github.com/UnwiseOwl/wesnoth.git/' Pushing to https://github.com/UnwiseOwl/wesnoth.git Don't see why it would decide I'm not authenticated... 20180513 22:59:54< celticminstrel> It should be prompting you for a password... 20180513 23:00:05<+discordbot> nope 20180513 23:00:12< celticminstrel> Hmm. 20180513 23:00:41< celticminstrel> Try going into repository settings and changing the URL to https://UnwiseOwl@github.com/UnwiseOwl/wesnoth.git ? 20180513 23:01:01< celticminstrel> Basically adding your username in front of the domain name. 20180513 23:01:13< celticminstrel> As if it were an email address. 20180513 23:01:41<+discordbot> same problem I'm afraid. 20180513 23:01:47< celticminstrel> :| 20180513 23:02:25<+discordbot> do you have ssh auth set up? 20180513 23:02:30< celticminstrel> Seems like it also has a separate area to add your username and the fact that it's GitHub... 20180513 23:02:35< celticminstrel> @Vultraz He doesn't. 20180513 23:02:37< irker612> wesnoth/wesnoth:master gfgtdf e88a73fc2a fix uncaught stoi exception AppVeyor: 2/4 builds failed 20180513 23:02:38< irker612> Details vs2017/Debug: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-3036 20180513 23:02:39<+discordbot> https auth is a PITA for Git 20180513 23:02:39< irker612> Details vs2015/Debug: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-3323 20180513 23:03:06<+discordbot> Pita sounds delicious but I suspect it is bad 20180513 23:03:16< celticminstrel> Pitas are delicious. ^_^ 20180513 23:03:36<+discordbot> So I need to change my auth settings somehow. There's a thing that says SSH here but now I'm scared. 20180513 23:03:56<+discordbot> It's not the hard to set up 20180513 23:03:59< celticminstrel> My settings are set up for ssh RCA authentication, so I dunno, maybe SourceTree just isn't set up to handle HTTPS authentication... which is kinda disappointing TBH... 20180513 23:04:00<+discordbot> But I don't know how 20180513 23:04:14<+discordbot> I only know how to do it with TortoiseGit 20180513 23:04:17< celticminstrel> You need to generate an RCA key-pair. 20180513 23:04:27<+discordbot> Yeah, can do that here. 20180513 23:04:33< celticminstrel> And register the public key with GitHub. 20180513 23:04:39<+discordbot> add the public key to github 20180513 23:04:49<+discordbot> and then you need to somehow do a thing with the private key somewhere something 20180513 23:04:57< celticminstrel> Uh, what? 20180513 23:05:03<+discordbot> here that's a little app called Pageant 20180513 23:05:09< celticminstrel> Uhhh... what? 20180513 23:05:17<+discordbot> uh what what? 20180513 23:05:21< celticminstrel> The private key just needs to be in your .ssh folder. 20180513 23:05:41< celticminstrel> (Looks like UnwiseOwl is on Mac, right?) 20180513 23:05:52<+discordbot> i dunno, that's not how it works for me? 20180513 23:06:01< celticminstrel> Well, you're on Windows, it could be a little different. 20180513 23:06:02<+discordbot> on windows 20180513 23:06:22< celticminstrel> But for UNIX users the private key just needs to be at ~/.ssh/id_rsa 20180513 23:06:25< celticminstrel> Which is a file. 20180513 23:06:29< celticminstrel> Plaintext file. 20180513 23:06:32< Ravana_> for windows it is in .ssh as well 20180513 23:06:34<+discordbot> like I said there's a little app called Pageant that has my git private ssh key loaded 20180513 23:06:36< celticminstrel> (The key is hex-encoded.) 20180513 23:06:45<+discordbot> Have made one, will mess with sourcetree for a bit and see if I can work out where to plug it 20180513 23:06:51<+discordbot> it's IN the ssh folder but i don't think it works with tgit otherwise 20180513 23:07:10< celticminstrel> @UnwiseOwl - You need to register the public key on Github's website. 20180513 23:07:31< celticminstrel> There are instructions on how to do this somewhere in the GitHub help. 20180513 23:07:39<+discordbot> I did that bit :) 20180513 23:07:57<+discordbot> i still don't know how to get ssh auth working with VS Code 20180513 23:08:08< celticminstrel> Ah, in that case all you need to do is to change the URL in SourceTree (Repository Settings) to use the git: URL instead of the https: URL. 20180513 23:08:43< celticminstrel> (Which can be copied from your fork's main page.) 20180513 23:08:47<+discordbot> what's going on about public key pairs and git and https? I didn't have to do anything with that when setting up my fork locally besides remote set-url and remote add. it even told me to use https: rather than git: 20180513 23:09:22<+discordbot> github.com/UnwiseOwl/wesnoth? 20180513 23:09:23<+discordbot> https is a pain in the ass because you need to enter your password every single time 20180513 23:09:26< celticminstrel> @Pentarctagon He's using SourceTree and can't figure out how to get it to prompt him for the https password. 20180513 23:09:37< celticminstrel> So I guess he just decided setting up the ssh auth was easier. 20180513 23:10:04<+discordbot> git@github.com:UnwiseOwl/wesnoth.git 20180513 23:10:09<+discordbot> well, I dunno how GUI apps do it, but from the command line: git config --global user.name "pentarctagon" git config --global user.email "pentarctagon@tutamail.com" git config credential.helper store 20180513 23:10:20<+discordbot> never have to enter you username/password a second time 20180513 23:10:30< celticminstrel> Uh what. 20180513 23:10:32< celticminstrel> o.o 20180513 23:10:35<+discordbot> be gentle, pentarctagon, I'm new to this 20180513 23:10:38<+discordbot> o_o 20180513 23:10:39<+discordbot> šŸ˜› 20180513 23:10:43< celticminstrel> I have no idea what that even does. 20180513 23:10:54<+discordbot> guess it stores his password 20180513 23:11:01< celticminstrel> "credential.helper store" I guess is the key here 20180513 23:11:13<+discordbot> ok i have no idea how to change the url in sourcetree right now 20180513 23:11:22< celticminstrel> Repository Settings 20180513 23:11:25< celticminstrel> Select origin 20180513 23:11:28< celticminstrel> Click Edit 20180513 23:11:38<+discordbot> no you want to add a new remote 20180513 23:11:40<+discordbot> doesn't he 20180513 23:11:46< celticminstrel> No he already has the remote. 20180513 23:11:51<+discordbot> options are all greyed out right now tbh celmin was doing fine :) 20180513 23:12:01< celticminstrel> It's just pointing to the https instead. 20180513 23:12:04< celticminstrel> What's greyed out? 20180513 23:12:08<+discordbot> is he making origin the fork 20180513 23:12:12<+discordbot> all the options in the menu 20180513 23:12:15< celticminstrel> Seems like it. 20180513 23:12:16< celticminstrel> ... 20180513 23:12:21< celticminstrel> What? 20180513 23:12:41<+discordbot> gimme a sec I'll just click around for a bit :p 20180513 23:14:23<+discordbot> I with TGit would get a modern UI refresh 20180513 23:14:28<+discordbot> it looks quite dated 20180513 23:14:34 * celticminstrel sigh 20180513 23:14:58< celticminstrel> I wish people would stop giving things modern UI refreshes, they tend to end up worse off for it. 20180513 23:15:05< celticminstrel> Firefox Quantum for example. 20180513 23:15:10<+discordbot> That's your opinion 20180513 23:15:23< celticminstrel> It's not just my opinion, but sure, it is an opinion. 20180513 23:15:25<+discordbot> git remote set-url origin https://github.com/Pentarctagon/wesnoth.git git remote add upstream https://github.com/wesnoth/wesnoth.git praise be the command line šŸ™ƒ 20180513 23:16:47<+discordbot> or at least give it a new icon set 20180513 23:17:06< celticminstrel> Eh, I guess just changing the icon set can't hurt anything. 20180513 23:17:19<+discordbot> they're very blurry 20180513 23:17:26<+discordbot> and dated 20180513 23:17:49< celticminstrel> But dates are delicious, so that's fine. 20180513 23:18:06<+discordbot> oh hey wait a minute i can choose icon sets 20180513 23:18:12< celticminstrel> XD 20180513 23:18:44<+discordbot> ok, it's pushing 20180513 23:18:49<+discordbot> oh but wait that's just for the file overlays 20180513 23:18:51<+discordbot> which never work anyway 20180513 23:19:17<+discordbot> not the ones in the context menu 20180513 23:19:18<+discordbot> or the dialogs 20180513 23:19:19<+discordbot> taking a long time, thoug 20180513 23:19:21<+discordbot> still 20180513 23:19:35< zookeeper> instead of dated, my TGit looks exactly like any other windows app. 20180513 23:19:41<+discordbot> changes from XPStyle overlays to Win10 overlays 20180513 23:20:37<+discordbot> mother... 20180513 23:20:38<+discordbot> https://cdn.discordapp.com/attachments/259976436490829825/445364767742361600/unknown.png 20180513 23:20:51<+discordbot> See I told you Pageant was needed 20180513 23:21:37<+discordbot> Ok! 20180513 23:21:45<+discordbot> Successfully pushed... 20180513 23:21:58<+discordbot> What was next again? Something on the website. 20180513 23:22:07<+discordbot> go to your fork on GH 20180513 23:22:17<+discordbot> you shall see the PR button 20180513 23:22:55<+discordbot> indeed i do...but wait, you're not celmin! 20180513 23:23:14<+discordbot> I really appreciate all the help, everyone. Cheers. 20180513 23:23:35<+discordbot> I'm gonna press it! 20180513 23:24:17<+discordbot> You have bad indent 20180513 23:24:18<+discordbot> šŸ˜¦ 20180513 23:24:20<+discordbot> Now you're going to tell me that the edits were rubbishj :) 20180513 23:24:32<+discordbot> but it's alright 20180513 23:24:41<+discordbot> we can fix that with wmlindent 20180513 23:24:49<+discordbot> Oh fudge this is the early version before I fixed it after zookeeper complained last night 20180513 23:24:58<+discordbot> Same substance, though 20180513 23:26:20<+discordbot> So now I should hold onto my branches pending action on those, or should I just purge my fork somehow? 20180513 23:26:30<+discordbot> do NOT purge your fork 20180513 23:26:50<+discordbot> i assume you meant delete these branches or something 20180513 23:26:54<+discordbot> you can't do that until they're merged 20180513 23:26:58<+discordbot> or else the commits disappear 20180513 23:27:22<+discordbot> makes sense. 20180513 23:27:30<+discordbot> you can add more commits to the sam PR by pushing to the same branch 20180513 23:27:39<+discordbot> whooo gimp 2.10 is out šŸ˜³ 20180513 23:27:45<+discordbot> oh? 20180513 23:27:54<+discordbot> let me see this 20180513 23:28:18<+discordbot> " initial HiDPI support" 20180513 23:28:21<+discordbot> good enough 20180513 23:28:23<+discordbot> downloads 20180513 23:29:26<+discordbot> So do I need to resubmit #3094 or is it okay as is? 20180513 23:29:57<+discordbot> you can edit it if you want to fix the indent 20180513 23:30:16<+discordbot> do you know about squashing and force-pushing 20180513 23:30:20<+discordbot> Different PR, actually. Although I will go and do that. 20180513 23:30:24<+discordbot> (no I do not) 20180513 23:30:41<+discordbot> I know...only what can be read in this thread, basically. 20180513 23:30:57<+discordbot> celmin has been very patient 20180513 23:31:00<+discordbot> ok... basically squashing is combining multiple commits into one 20180513 23:31:14<+discordbot> i know the concept, just not how to do it. 20180513 23:31:21<+discordbot> I don't know either 20180513 23:31:28<+discordbot> sine you have a different 20180513 23:31:30<+discordbot> UI 20180513 23:31:44<+discordbot> I was actually asking about this guy: https://github.com/wesnoth/wesnoth/pull/3094 Should I resubmit or is this one workable? 20180513 23:32:26<+discordbot> "wesnoth:master from unknown repository" 20180513 23:32:28<+discordbot> oh my 20180513 23:32:40<+discordbot> Yeah. I done goofed pretty good. 20180513 23:32:54<+discordbot> i guess it's alright 20180513 23:33:02<+discordbot> lol ok, cheers 20180513 23:33:08< zookeeper> the person merging the PR can choose to squash all of it into one commit, so you don't necessarily have to do it yourself. 20180513 23:33:31< celticminstrel> Unless the state of that PR is exactly how you want it, you should close it and open a new one. 20180513 23:33:36< zookeeper> but you'll want to mention in the comments or wherever that it should be squashed. 20180513 23:34:14< celticminstrel> If you want to squash commits, you'll need to do an interactive rebase (which can even be done in SourceTree). 20180513 23:34:14<+discordbot> I think it is exactly as desired. It is just a map edit 20180513 23:34:22< celticminstrel> (Though the one time I tried it didn't go so well.) 20180513 23:35:12< celticminstrel> (You probably need to have the join commit selected in the log view? That is, the one where your branch and 1.14 diverge.) 20180513 23:36:22<+discordbot> I think I'm just gonna sit on it for now and call it job done at this point. Any change would only be for indenting. I think. 20180513 23:37:03<+discordbot> I am keen to explore git more, but I'll try to restrict myself to screwing around with my IE repository now that you've given me a good leg-up 20180513 23:37:33< celticminstrel> So @Vultraz, is it okay to merge? 20180513 23:39:11<+discordbot> I guess the follow-up is should I/do I have to make changelog updates. 20180513 23:39:32< celticminstrel> You should. Also you should add yourself to the credits under "miscellaneous contributors". 20180513 23:40:15< celticminstrel> IMO it's acceptable to do the changelog (and credits) updates as a batch in a separate PR. 20180513 23:40:33<+discordbot> That was my follow-up question, yes. 20180513 23:40:44< celticminstrel> Probably after everything's merged, unless a release needs to be tagged in which case getting things added to the changelog asap becomes important. 20180513 23:40:49<+discordbot> Will wait to see if these guys get accepted then so that, then. 20180513 23:41:00<+discordbot> *do 20180513 23:41:06 * celticminstrel pokes @Vultraz on 3094. 20180513 23:42:33< celticminstrel> I think you messed up slightly in the 3103 PR summary? Maybe edit it a bit? 20180513 23:43:04<+discordbot> yep 20180513 23:43:06<+discordbot> got it 20180513 23:44:21<+discordbot> Well, it's getting late and I have work tomorrow. Cheers again. 20180513 23:44:34-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 248 seconds] 20180513 23:54:13< celticminstrel> BTW @Pentarctagon, what happened to the new dunefolk units you were going to add? 20180513 23:55:13<+discordbot> the L2 roc still needs a sprite, and I never got around to make the unit cfg files. 20180513 23:55:22< celticminstrel> I see... 20180513 23:55:41< celticminstrel> For L2 you could probably use a placeholder, even just scaling up the L1 by like 20%. 20180513 23:57:19< irker612> wesnoth: mattsc wesnoth:1.14 32170543fde2 / data/lua/ (backwards-compatibility.lua wml-flow.lua wml-utils.lua wml/objectives.lua): Lua code: replace deprecated wesnoth.tovconfig() calls https://github.com/wesnoth/wesnoth/commit/32170543fde2fab86966f2f5bcb3c589c8082e7c 20180513 23:57:22< irker612> wesnoth: mattsc wesnoth:1.14 2922b198020d / data/ (15 files in 8 dirs): Lua code: replace deprecated wesnoth.get_variable() calls https://github.com/wesnoth/wesnoth/commit/2922b198020df5440c9bd889da87d51a72f7c1d4 20180513 23:57:23< irker612> wesnoth: mattsc wesnoth:1.14 bf711024ff48 / data/lua/core.lua: Prevent definition of wml.variables to cause deprecation warnings https://github.com/wesnoth/wesnoth/commit/bf711024ff48d7f032bb4bb18174136ed2ee6d6a 20180513 23:57:25< irker612> wesnoth: mattsc wesnoth:1.14 51b2dbec199a / data/ (26 files in 6 dirs): Lua code: replace deprecated wesnoth.set_variable() calls https://github.com/wesnoth/wesnoth/commit/51b2dbec199ae3ac0f45b15fef8acf86ddddacab 20180513 23:57:26< celticminstrel> \o/ 20180513 23:57:27< irker612> wesnoth: mattsc wesnoth:1.14 acf4269f6a79 / data/ (lua/core.lua test/scenarios/test_clear.cfg): Lua code: replace deprecated wesnoth.get_all_vars() calls https://github.com/wesnoth/wesnoth/commit/acf4269f6a790b46a1e91e0316d6f6385e16df15 20180513 23:57:30< irker612> wesnoth: mattsc wesnoth:1.14 39ed118ce2a9 / data/scenario-test.cfg: Lua code: replace deprecated helper.get_variable_proxy_array() call https://github.com/wesnoth/wesnoth/commit/39ed118ce2a967f892825ff65253056a6dd84975 20180513 23:57:32< irker612> wesnoth: mattsc wesnoth:1.14 a5bd46e1724b / / (40 files in 5 dirs): Lua code: replace deprecated helper.get_child() calls https://github.com/wesnoth/wesnoth/commit/a5bd46e1724b5b614d908bf8c8452210cd82197a 20180513 23:57:34< irker612> wesnoth: mattsc wesnoth:1.14 c7f32b1ed54a / data/ (14 files in 5 dirs): Lua code: replace deprecated helper.child_range() calls https://github.com/wesnoth/wesnoth/commit/c7f32b1ed54ac93739e354b17cdc025f926d13ef 20180513 23:57:36< irker612> wesnoth: mattsc wesnoth:1.14 8ff8acea7297 / data/ (5 files in 4 dirs): Lua code: replace deprecated helper.[gs]et_variable_array() calls https://github.com/wesnoth/wesnoth/commit/8ff8acea7297569a500f631c765f9470c13d2267 20180513 23:57:38< irker612> wesnoth: mattsc wesnoth:1.14 8262d8273fbe / data/ai/scenarios/scenario-AI_Arena_small.cfg: Lua code: remove deprecated helper.set_wml_var_metatable() call https://github.com/wesnoth/wesnoth/commit/8262d8273fbe2f469e1e1ab27bbe6eb8932a9e55 20180513 23:57:40< irker612> wesnoth: mattsc wesnoth:1.14 039646130980 / data/ (8 files in 5 dirs): Remove unnecessary inclusions of helper.set_wml_action_metatable {} https://github.com/wesnoth/wesnoth/commit/039646130980cdf7d638e524db48643012cd06bf 20180513 23:57:41< irker612> wesnoth: mattsc wesnoth:1.14 c9ef14ad54a3 / / (38 files in 12 dirs): Do not load helper.lua where it is not used any more https://github.com/wesnoth/wesnoth/commit/c9ef14ad54a3b3c76b1391c4d60fdf5203739b1f 20180513 23:57:43< irker612> wesnoth: mattsc wesnoth:1.14 2f611a9c2e09 / / (88 files in 17 dirs): Merge pull request #3079 from mattsc/lua_deprecation_fixes https://github.com/wesnoth/wesnoth/commit/2f611a9c2e0912d24b09c5da5aac6cec578b5b43 20180513 23:57:48<+discordbot> I'll see about finishing those up tomorrow then. 20180513 23:58:07< celticminstrel> I wonder if you can cherry-pick a merge commit... probably not, right? 20180513 23:58:10< mattsc> celticminstrel is quick! 20180513 23:58:13< celticminstrel> ? 20180513 23:58:22< mattsc> I donā€™t think so. 20180513 23:58:34< mattsc> I could probably try to merge the branch? 20180513 23:58:48< celticminstrel> I think you'll probably need to cherry-pick each commit individually... 20180513 23:58:58< mattsc> But itā€™s probably less time/effort to just copy/paste those hashes. 20180513 23:59:05< mattsc> Yeah. 20180513 23:59:16< celticminstrel> But maybe you could somehow get it to work by rebasing the branch onto master (interactively so as to exclude any 1.14-only commits) and then merge to master. 20180513 23:59:26< celticminstrel> But cherry-picking each commit individually is likely easier. 20180513 23:59:45< mattsc> Iā€™d expect so also. --- Log closed Mon May 14 00:00:22 2018