--- Log opened Wed Apr 06 00:00:03 2016
20160406 00:05:16< celticminstrel> This [on_undo] thing feels a little bit hacky... :/
20160406 00:06:21< celticminstrel> I wonder if it'll work in a recruit event...
20160406 00:10:08< celticminstrel> ...maybe I could do that slightly differently...
20160406 00:10:55< celticminstrel> BTW vultraz, I'm considering re-ordering the loading screen a little, either bar/dots/words or bar/words/dots, so if you have any opinions, let me hear them.
20160406 00:16:09< celticminstrel> The bar just seems to take up a ridiculous amount of vertical space... :|
20160406 00:16:22< celticminstrel> Grow factor settings maybe?
20160406 00:23:08< fabi> celticminstrel: Remove undo/redo from the game entirely. It can be exploited to scout ambushes and shouldn't have made it in the game from the beginning.
20160406 00:30:41-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20160406 00:31:05< aeth> too easy to misclick without undo
20160406 00:31:15< celticminstrel> ...no fabi.
20160406 00:31:37< celticminstrel> Actually I'd prefer it if you could undo even when shroud is uncovered.
20160406 00:32:02< aeth> then if you had a good enough memory you'd be able to scout too much at once
20160406 00:32:05< celticminstrel> I don't really mind not being able to undo attacks (it's pretty uncommon to accidentally attack).
20160406 00:32:15< fabi> :-)
20160406 00:32:25< aeth> Undoing attacks makes no sense, and I don't think is even allowed. There's a confirmation, isn't there?
20160406 00:32:49< celticminstrel> But the inability to undo misclicks just because they happened to uncovered shroud or fog is really annoying.
20160406 00:33:02< aeth> well in SP just saveload
20160406 00:33:20< celticminstrel> Oh yeah, you're right, there's a confirmation when you attack, so almost impossible to attack accidentally.
20160406 00:33:30< fabi> aeth: I agree that it is too easy to misclick. But then undo/redo only saves you when no fog/shroud is cleared. This is an interface issue. And needs to be safed at interface level.
20160406 00:33:34< celticminstrel> ...do you seriously expect me to save after every move? That's just ridiculous.
20160406 00:33:59< aeth> celticminstrel: I do that sometimes
20160406 00:34:06< aeth> celticminstrel: isn't it just Ctrl+S and then return?
20160406 00:34:34< aeth> plus it's rare when there's lots of units... usually going back to the side turn start is good enough
20160406 00:34:55< celticminstrel> The fact that you have to press return is actually annoying too. It should remember your last save and automatically overwrite that when you press Cmd+S (use Cmd+Shift+S to force a new save).
20160406 00:35:26< celticminstrel> Excluding autosaves of course, those should never be overwritten by Cmd+S.
20160406 00:36:07< celticminstrel> Basically I think the undo restrictions are currently too restrictive.
20160406 00:36:18< celticminstrel> I forget, do they even apply in singleplayer?
20160406 00:36:41-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 00:37:04< celticminstrel> I think undo in singleplayer should be even less restrictive than in multiplayer.
20160406 00:37:12< aeth> if you could undo shroud reveal in SP it would be way too easy to abuse scouting
20160406 00:37:19< celticminstrel> If "delay shroud updates" were the default setting, I suppose that could help a little.
20160406 00:37:27< celticminstrel> Well sure, you could abuse scouting a bit.
20160406 00:37:54< celticminstrel> But I don't think it's feasible or desirable to shut out every possible chance for abuse.
20160406 00:38:16< aeth> an easy to abuse feature will be abused regularly
20160406 00:38:33< fabi> undo/redo is a huge complexity booster and just snakeoil to cover a broken UI which should be make more misclick proven.
20160406 00:38:34< aeth> it's a game, the point is to break it
20160406 00:38:38< celticminstrel> If someone is playing singleplayer, who cares if they abuse it?
20160406 00:38:54< aeth> fabi: no, it's because it's turn based rather than real time
20160406 00:39:03< aeth> so each mistake costs more
20160406 00:39:39< fabi> I don't think it has anything to do with real time vs turn based.
20160406 00:40:18< aeth> if you make a mistake in an RTS, it doesn't really matter as long as you keep playing quickly (most of the time), and some movement can be changed rather quickly
20160406 00:40:29< fabi> I don't care.
20160406 00:40:38< aeth> if you put your mage in water instead of on the mountain next to the water, you're doomed
20160406 00:40:39< fabi> The UI needs to make safe.
20160406 00:41:25-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 268 seconds]
20160406 00:41:30< celticminstrel> I can never seem to find the delay shroud updates option, either.
20160406 00:41:41< celticminstrel> Something so essential should be easier to find.
20160406 00:41:54< celticminstrel> I don't think it's in prefs anywhere.
20160406 00:42:17< aeth> didn't it used to be in the right click menu?
20160406 00:42:24< celticminstrel> Is that where it is?
20160406 00:42:29< celticminstrel> That's not at all an obvious place.
20160406 00:42:46< aeth> fabi: you can't make the UI safe when the difference between doom and success is one hex, and hexes are small
20160406 00:42:47< celticminstrel> You don't expect something unrelated to clicking to be put in the right-click menu.
20160406 00:43:20< aeth> The strongest spots are usually right next to the weakest spots
20160406 00:43:26< celticminstrel> Oh, by the way, aeth, what do you think of the undocumented Lua map locations API? (I can describe it if necessary, or point you to the C++ source file.)
20160406 00:43:58< celticminstrel> Ugh, the loading screen still looks bad that way... :|
20160406 00:44:40< fabi> aeth: Planning mode is a safe UI for example.
20160406 00:44:47-!- gfgtdf [~chatzilla@x4e3683e7.dyn.telefonica.de] has joined #wesnoth-dev
20160406 00:44:57< aeth> who uses planning mode?
20160406 00:44:59< celticminstrel> Planning mode is confusing.
20160406 00:45:02< gfgtdf> celticminstrel: iirc it was removed from the right click menu exactly becasue it didnt fir there
20160406 00:45:04< fabi> aeth: I am not.
20160406 00:45:16< gfgtdf> celticminstrel: it shoudl be under 'actions' menu
20160406 00:45:17< fabi> It just proves you wrong that UI can't be made safe.
20160406 00:45:29< aeth> gfgtdf: it actually fits perfectly there because it is only useful when it's enabled/disabled repeatedly in one game
20160406 00:45:52< celticminstrel> You're right, it's not in the right-click menu.
20160406 00:45:53< gfgtdf> aeth: hmm most people will use hotkeys anyways
20160406 00:46:06< aeth> and how will they discover that hotkey without it being in the menu?
20160406 00:46:20< gfgtdf> anth: and the rigth clcik menu reall had too much items, it was quite hard to find somewthign there
20160406 00:46:29< celticminstrel> I don't see anything about shroud updates in actions... but I guess that could be because there's no shroud on this map...
20160406 00:46:34< gfgtdf> aeth: it shoudl be in teh 'actions' menu
20160406 00:46:47< gfgtdf> aeth: whcih is easiyl visible
20160406 00:47:18< aeth> speaking of hotkeys, I have never once used "End Turn" from the right click menu
20160406 00:47:29< aeth> Something that important is probably the one hotkey everyone learns or should learn
20160406 00:47:34< gfgtdf> aeth: yes that was removed from the rigth lcik menu too
20160406 00:47:37< gfgtdf> click*
20160406 00:47:43< gfgtdf> in 1.13 that is
20160406 00:47:49< celticminstrel> I think I've used End Turn from the right click menu, though I can't imagine why...
20160406 00:47:50< aeth> when?
20160406 00:48:02< gfgtdf> aeth: not sour but it shoudl be in 1.13.4
20160406 00:48:04< celticminstrel> Probably just because it was there and I happened to have the menu already open for some reason.
20160406 00:48:34< gfgtdf> allowing undo when shroud is uncovered is not really an option
20160406 00:48:43< gfgtdf> afaik dsu was made exactly for that case
20160406 00:48:56< gfgtdf> buf sureeoley you can also use planning mode which is more powerful
20160406 00:49:04< celticminstrel> Uhh. Why (and how?) do I have two copies of the loadscreen image... o.o
20160406 00:49:07< aeth> gfgtdf: Wow I'm so used to ignoring that in the menu I missed it last time I checked, a couple of days ago
20160406 00:49:24< celticminstrel> Oh, I guess it's just Finder being weird, ls only shows one copy.
20160406 00:49:49< celticminstrel> Vultraz broke GUI1 scrollbars.
20160406 00:50:07< celticminstrel> At least, appearance-wise. They still work fine.
20160406 00:50:12< gfgtdf> is there a reason why the horizinal scrollbar weren't ported yet?
20160406 00:50:23< celticminstrel> Eh? I thought he did those.
20160406 00:50:33< gfgtdf> last time i checked it looked quite strange with the different design of horizonal and vertical scrollbars
20160406 00:50:41< gfgtdf> hmm mabye it has change since last time i checked
20160406 00:51:22< aeth> celticminstrel: I haven't seen your API yet, no
20160406 00:51:30< celticminstrel> It's not my API.
20160406 00:51:43< celticminstrel> I'm not sure who made it. I think it's a bit, uh, rough?
20160406 00:51:45< aeth> celticminstrel: the map one you pointed out a long time ago
20160406 00:51:55< aeth> celticminstrel: I didn't miss your message but I got sidetracked by the other discussion
20160406 00:52:13< celticminstrel> Yeah, I know. I didn't make that, just discovered it in the code.
20160406 00:52:36< celticminstrel> How can I force a horizontal scrollbar... typing random gibberish in the lua console isn't working...
20160406 00:52:58< gfgtdf> celticminstrel: hmm campaigsn sleection meneu on low resolution shoudl work
20160406 00:53:36< celticminstrel> Alright, my [on_undo] thing finally works... at least in a moveto event.
20160406 00:53:50< gfgtdf> celticminstrel: note that there are also enter/exit hex events
20160406 00:54:05< celticminstrel> gfgtdf: Nope. I don't see it in campaign selection.
20160406 00:54:22< celticminstrel> Yeah, the enter/exit hex events are not going to work properly with the way I've done this.
20160406 00:54:25< gfgtdf> celticminstrel: you must select a campaigns that has a big image in its description
20160406 00:54:33< celticminstrel> Hmm.
20160406 00:54:50< celticminstrel> I don't seem to have any.
20160406 00:54:55< celticminstrel> Any other ideas?
20160406 00:54:59< celticminstrel> Maybe MP lobby...
20160406 00:55:13< gfgtdf> celticminstrel: 2 brothers shodul work
20160406 00:55:16< celticminstrel> Speaking of which, is vultraz still working on that or is it "finished" UI-wise?
20160406 00:55:18< gfgtdf> celticminstrel: mp lobby is gui1
20160406 00:55:30< celticminstrel> I'm talking about the experimental one.
20160406 00:55:43< celticminstrel> aToTB isn't generating a horizontal scrollbar.
20160406 00:56:03< celticminstrel> ...okay yeah, he hasn't updated the horizontal scrollbars... :(
20160406 00:56:06 * celticminstrel pokes vultraz.
20160406 00:56:26< gfgtdf> celticminstrel: hmm right maybe it onyl happens to be becasue i have addons that has a more text in the left side lis.
20160406 00:56:33< celticminstrel> Maybe.
20160406 00:56:56< celticminstrel> I think ideally I'd like the line thing on the loading screen to be roughly centred...
20160406 01:00:00< celticminstrel> BTW, I'm getting a report of a crash in 1.12.5.
20160406 01:01:07< celticminstrel> When summoning a particular custom unit.
20160406 01:06:16< celticminstrel> Seems to be caused by unbalanced square brackets in a progressive animation string.
20160406 01:14:05< celticminstrel> I just got a weird startup crash.
20160406 01:14:24< celticminstrel> ...silly, I should've paid more attention to the stack. Oh well.
20160406 01:14:41< celticminstrel> Oh wait, now it happened again...
20160406 01:15:24< celticminstrel> It's in the t_string constructor... o.o During loadscreen
20160406 01:19:57-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev
20160406 01:24:07-!- gfgtdf_ [~chatzilla@x4e36aa12.dyn.telefonica.de] has joined #wesnoth-dev
20160406 01:25:01-!- un214 [~un214@2602:306:ce4c:2959:56a0:50ff:fe57:101d] has joined #wesnoth-dev
20160406 01:26:05-!- gfgtdf [~chatzilla@x4e3683e7.dyn.telefonica.de] has quit [Ping timeout: 244 seconds]
20160406 01:26:17-!- gfgtdf_ is now known as gfgtdf
20160406 01:30:44< vultraz> celticminstrel: will get to it
20160406 01:39:07-!- un214 [~un214@2602:306:ce4c:2959:56a0:50ff:fe57:101d] has quit [Quit: No Ping reply in 180 seconds.]
20160406 01:40:40-!- un214 [~un214@2602:306:ce4c:2959:56a0:50ff:fe57:101d] has joined #wesnoth-dev
20160406 01:43:45-!- fendrin [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev
20160406 01:43:53-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Read error: Connection reset by peer]
20160406 01:44:28< vultraz> [09:58:13]	ancestral	vultraz: Still wondering, are you planning on having links to dev builds on the front page of wesnoth.org again?
20160406 01:44:32< vultraz> uh... aren't they?
20160406 01:44:55< ancestral> No, not in the info box at the top
20160406 01:45:35< ancestral> Just a moment
20160406 01:46:20< ancestral> vultraz: https://web.archive.org/web/20141120013658/http://www.wesnoth.org/
20160406 01:47:01< ancestral> One could make an argument that it isn’t necessary
20160406 01:47:09< vultraz> hm
20160406 01:47:13< ancestral> I guess it depends how much visibility you would like for the dev releases
20160406 01:47:18< vultraz> not sure it's strictly necessary
20160406 01:47:45< ancestral> I know nothing about how this is generated, though I thought at one point it read stuff from a wiki page. shadowm probably knows how all that works
20160406 01:48:18< ancestral> (I don’t have strong feelings about it)
20160406 01:54:49-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20160406 01:54:55-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20160406 01:55:11< celticminstrel> I think I said a few things to you vultraz, did you see all of them?
20160406 01:55:26< vultraz> [11:55:15]	celticminstrel	Speaking of which, is vultraz still working on that or is it "finished" UI-wise?
20160406 01:55:34< vultraz> still needs a few bug fixes
20160406 01:55:38< celticminstrel> That was about MP lobby.
20160406 01:55:45< vultraz> [11:10:54]	celticminstrel	BTW vultraz, I'm considering re-ordering the loading screen a little, either bar/dots/words or bar/words/dots, so if you have any opinions, let me hear them.
20160406 01:55:47< vultraz> do not like either
20160406 01:55:53< celticminstrel> I mean, is the WML side finished for the lobby?
20160406 01:56:27< celticminstrel> vultraz: What don't you like about it?
20160406 01:56:42< vultraz> I think the bar looks good on the bottom
20160406 01:56:52< vultraz> as for the lobby WML, I'll probably change some things
20160406 01:57:18< celticminstrel> I really don't like it at the bottom the way it is now...
20160406 01:57:34< celticminstrel> Maybe partly because 800x600.
20160406 01:59:20< celticminstrel> It does look better as the window gets larger, but even at 1280x ... I forget which one I tried now...
20160406 02:00:20< celticminstrel> It doesn't look too good at 1280x720 or 1024x768.
20160406 02:02:05< celticminstrel> I think bar/dots/text looks a lot better.
20160406 02:02:13< celticminstrel> However, only if the bar row is not allowed to grow.
20160406 02:02:27-!- gfgtdf [~chatzilla@x4e36aa12.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 45.0.1/20160315153207]]
20160406 02:02:33 * celticminstrel poke vultraz 
20160406 02:04:06< vultraz> I don't think it takes up that much vertical space
20160406 02:04:24< celticminstrel> It's because of the grow factor.
20160406 02:05:02< vultraz> yes, that can change
20160406 02:05:12< celticminstrel> I'll show you.
20160406 02:05:26< vultraz> yes, I'm trying now
20160406 02:05:30< vultraz> I see what you mean
20160406 02:05:39< vultraz> honestly, I'd like the decoration to get closer to the logo..
20160406 02:05:41< vultraz> hm
20160406 02:06:00< celticminstrel> I'll give you some screenshots, one minute.
20160406 02:08:18< celticminstrel> http://celmin.pwcsite.com/wesnoth/loadscreen_current.png http://celmin.pwcsite.com/wesnoth/loadscreen_nogrow.png http://celmin.pwcsite.com/wesnoth/loadscreen_proposed.png
20160406 02:08:30 * celticminstrel typed those out, hope I spelled everything right.
20160406 02:08:39< celticminstrel> Oh, there's that t_string crash again...
20160406 02:09:40< vultraz> the space formula is different for lower resolutions
20160406 02:09:54< celticminstrel> A bit, yeah.
20160406 02:10:00< vultraz> height = "((screen_height - if(screen_height < 800, 400, 0)) / 4)"
20160406 02:10:29< celticminstrel> It doesn't seem to do anything even if I change it to <= though.
20160406 02:10:58< vultraz> I don't really mind if it takes up more of the screen at lower resolutions
20160406 02:11:16< vultraz> why would it?
20160406 02:11:29< vultraz> *height*
20160406 02:11:31< vultraz> not width
20160406 02:11:34< celticminstrel> I do think it's nicer to have the decoration more centred though.
20160406 02:11:43< celticminstrel> Oh, right.
20160406 02:12:02< celticminstrel> Height, not width, right.
20160406 02:12:47< ancestral> Hmm
20160406 02:12:55< celticminstrel> Based on the nogrow screenshot, I think I'd be satisfied with making the bottom spacer the only element that grows.
20160406 02:12:56< ancestral> I’m having trouble building translations
20160406 02:13:07< ancestral> It should be `scons translations` right?
20160406 02:13:08< vultraz> celticminstrel: try this formula and all 0 grow factors height = "((screen_height - if(screen_height < 800, 200, 0)) / 3.5)"
20160406 02:13:18< celticminstrel> Okay, I have reproduced the GUI crash.
20160406 02:14:04< celticminstrel> I think the issue stems from the fact that it's calling events::pump() on an auxiliary thread...
20160406 02:14:22< vultraz> :/
20160406 02:14:27< vultraz> Aginor won't be pleased
20160406 02:14:35< ancestral> Yes?
20160406 02:14:36< celticminstrel> Hm?
20160406 02:14:43< celticminstrel> What won't he be pleased by?
20160406 02:14:57< celticminstrel> Hmm, that formula seems to look a bit better at 800x600...
20160406 02:15:03< ancestral> Translations?
20160406 02:15:15< celticminstrel> Yeah, I think so, ancestral.
20160406 02:15:20< vultraz> celticminstrel: I think he didn't want to get involved with this thread business
20160406 02:15:50< celticminstrel> The events::pump() might not actually be necessary.
20160406 02:16:11< celticminstrel> I'll try a few things.
20160406 02:16:17< celticminstrel> Anyway, back to loading screen for a moment...
20160406 02:17:05< celticminstrel> Yeah, that formula does look better at 800x600..
20160406 02:17:15< celticminstrel> BTW, did you at least check out my screenshots?
20160406 02:18:31< vultraz> I did
20160406 02:18:44< celticminstrel> And?
20160406 02:18:52< vultraz> the one with the bar at the center looks good
20160406 02:18:57< vultraz> the one with the bar and text all down low does not
20160406 02:19:23< celticminstrel> Obviously, but that was more to show the relative positioning of the bar/text/dots when there's no grow factors.
20160406 02:19:47< celticminstrel> So should I go with your updated formula, or my reordering, or both?
20160406 02:23:36< vultraz> eh, it looks reasonably good, yes
20160406 02:23:42< vultraz> with mine
20160406 02:23:54< celticminstrel> So, both?
20160406 02:24:18< vultraz> Hm
20160406 02:24:25< vultraz> it doesn't look bad with the decor over the text
20160406 02:24:34< vultraz> (and my formula)
20160406 02:24:44< celticminstrel> So, that's a vote for "both", right?
20160406 02:24:52< vultraz> Yeah, let's go with that for now
20160406 02:24:57< vultraz> I might look to making a nicer bar
20160406 02:25:04< vultraz> (and we should really get a better animation)
20160406 02:25:08< celticminstrel> I think the bar is pretty nice already.
20160406 02:25:19< celticminstrel> I think we should get an animation that's not based on text, yeah.
20160406 02:25:46< vultraz> but we'd need a gui animation engine for that
20160406 02:26:34< celticminstrel> Well, you could probably use the same sort of system gfgtdf used (just change the image on each loop), though I suppose that might slow things down a bit (at least for the first loop while the images are loaded... assuming it's a loop).
20160406 02:26:56< celticminstrel> (I still prefer something that's not a loop, though.)
20160406 02:27:48< vultraz> I like loops
20160406 02:29:00< vultraz> But we want something that doesn't look cheap 
20160406 02:29:31< vultraz> The problem with the  text is that it looks cheap
20160406 02:31:39-!- un214 [~un214@2602:306:ce4c:2959:56a0:50ff:fe57:101d] has quit [Remote host closed the connection]
20160406 02:39:02< ancestral> I’m getting wesnothd build errors
20160406 02:39:14< ancestral> variant.hpp
20160406 02:39:43< ancestral> Unused typedef ‘boost_static_assert_typedef_2247’ (and 2254)
20160406 02:41:25< celticminstrel> ancestral: That shouldn't be an error, only a warning...?
20160406 02:42:00< ancestral> My build is failing
20160406 02:42:11< ancestral> I had to add headers into the project file
20160406 02:42:25< celticminstrel> vultraz: I fixed the issue with dialogs at lua init time.
20160406 02:42:43< ancestral> Let me try removing the headers
20160406 02:42:47< celticminstrel> It's maybe a bit hacky (events::pump just returns without doing anything if called on an auxiliary thread), but it works.
20160406 02:43:06< ancestral> Then I need SDL_types.h
20160406 02:44:11< ancestral> If I add that, then I get so many more unused typedefs
20160406 02:44:41< ancestral> Alright, let me try re-checking out the project file from 1.13.4 tagged
20160406 02:46:55< ancestral> Maybe that’ll do it
20160406 02:49:43< celticminstrel> After the popup shows on top of the loadscreen, the missing image reappears.
20160406 02:50:04< celticminstrel> Also, the animation continues even while the popup is there.
20160406 02:50:15< celticminstrel> ^images reappear
20160406 02:50:28< celticminstrel> We should probably try to figure out why they disappear...
20160406 02:59:12< celticminstrel> Someone mispelled "particle" in a type name... :/
20160406 02:59:18< celticminstrel> "particule"
20160406 02:59:28< celticminstrel> Does anyone know where the animation parsing code would be?
20160406 02:59:50< celticminstrel> Oh wait, did I just find it?
20160406 03:00:24< celticminstrel> No, that just parses if/else...
20160406 03:09:04< celticminstrel> I seem to have found it.
20160406 03:15:04< ancestral> celticminstrel: Okay so
20160406 03:15:16< ancestral> I needed to build SDL2 from Homebrew
20160406 03:15:31< ancestral> This gave be libSDL dylibs and not frameworks
20160406 03:16:00< ancestral> Now the project file is complaining because it’s wanting to copy the SDL2 frameworks, which don’t exist
20160406 03:16:08< celticminstrel> That shouldn't be an issue (barring the need to adjust the XCode project a little).
20160406 03:16:34< ancestral> Oh okay I see it
20160406 03:16:40< ancestral> Copy Files step ok
20160406 03:16:46< celticminstrel> You can probably even just select each framework in the files are.
20160406 03:16:48< celticminstrel> ^area
20160406 03:17:01< celticminstrel> Then click the choose file icon on the right sidebar.
20160406 03:17:07< celticminstrel> And select the dylib.
20160406 03:17:23< celticminstrel> (Assuming XCode 7 is still basically similar in layout to XCode 4.)
20160406 03:17:48< celticminstrel> By files area I mean the left sidebar.
20160406 03:18:39< ancestral> I fixed it
20160406 03:18:40< ancestral> Thanks
20160406 03:19:26< celticminstrel> We also need to fix this t_string crash... :|
20160406 03:20:14< celticminstrel> It's possible that it's somehow my fault, since I don't recall seeing it before changing the loadscreen WML around...
20160406 03:20:46< ancestral> Okay so
20160406 03:21:00< vultraz> ive had random crashes on start occasionally still
20160406 03:21:09< ancestral> I’m choosing build for release and now I get that variant.hpp error again
20160406 03:21:23< celticminstrel> What's the error?
20160406 03:21:30-!- irker707 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20160406 03:21:30< irker707> wesnoth: Celtic Minstrel wesnoth:master 4af12203d8e8 / / (8 files in 4 dirs): [on_undo] and [on_redo] now get a snapshot of the event context https://github.com/wesnoth/wesnoth/commit/4af12203d8e829da24b1f2f23b23dfa7ec17636a
20160406 03:21:30< irker707> wesnoth: Celtic Minstrel wesnoth:master 8cbd358baf57 / data/gui/window/loadscreen.cfg: tloadscreen: Minor rearrangement of elements https://github.com/wesnoth/wesnoth/commit/8cbd358baf57b93166b70f339948ffc4b88ae097
20160406 03:21:30< irker707> wesnoth: Celtic Minstrel wesnoth:master 1afa45a53e16 / src/events.cpp: Fix crash if Lua initialization routines put up a dialog during the loading scre https://github.com/wesnoth/wesnoth/commit/1afa45a53e16115811986bcc51d33043259f8d90
20160406 03:21:31< irker707> wesnoth: Celtic Minstrel wesnoth:master 1e5e071734e5 / src/ (7 files in 6 dirs): BOOST_STATIC_ASSERT -> static_assert https://github.com/wesnoth/wesnoth/commit/1e5e071734e551fb81d0bc068535b828ad5a3172
20160406 03:22:20< celticminstrel> Also, about the 1.12.5 crash report I mentioned earlier, it has already been fixed in 1.13, so that's good.
20160406 03:22:39< ancestral> celticminstrel: From before, “Unused typedef ‘boost_static_assert_typedef_2247’ (and 2254)”
20160406 03:22:56< celticminstrel> Ah. Try disabling "treat warnings as errors".
20160406 03:23:00< celticminstrel> Or whatever it's called.
20160406 03:23:04< celticminstrel> In build settings.
20160406 03:24:22< ancestral> Found that
20160406 03:24:25< ancestral> Still same error
20160406 03:24:34< ancestral> It’s for wesnothd
20160406 03:24:49< celticminstrel> Did you check both project level and target level?
20160406 03:24:53< ancestral> “BOOST_STATIC_ASSERT( false && sizeof(U) );” is hte line
20160406 03:25:29< ancestral> Double-checking
20160406 03:26:31< celticminstrel> Your mention of that error was actually the trigger for 1e5e071 that I just pushed, BTW. :P
20160406 03:26:40< celticminstrel> Still, it's only a warning, not an error.
20160406 03:26:50< ancestral> So under Testing
20160406 03:26:55< celticminstrel> I suppose you could also check for -Werror in other flags somewhere...
20160406 03:27:00< ancestral> Treat missing baselines as test failures
20160406 03:27:04< ancestral> It is set to No
20160406 03:27:25< ancestral> Looking for -Werror
20160406 03:30:30< ancestral> celticminstrel: -Werror=format -Werror=missing-braces -Werror=return-type -Werror=missing-field-initializers -Werror=sign-compare -Werror=unused -Werror=switch
20160406 03:30:41< ancestral> Still, that’s under Warning flags
20160406 03:30:53< celticminstrel> Yeah...
20160406 03:31:09< celticminstrel> You could add... what was it... -Wno-unused-typedef I think?
20160406 03:31:15< celticminstrel> Though I thought that was already there by 1.13.4.
20160406 03:31:35-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 03:32:36< ancestral> Okay
20160406 03:33:01< ancestral> Bah
20160406 03:33:48< ancestral> So I added -Wall -Wno-unused-local-typedefs -Who-unknown-warning-option to Release
20160406 03:33:53< ancestral> Still, I get the error
20160406 03:34:11< vultraz> you're not building debug, are you
20160406 03:34:37< celticminstrel> He's building Release.
20160406 03:34:59< celticminstrel> Is this formula/variant.hpp or boost/variant.hpp... sounds like the latter actually...
20160406 03:36:17< ancestral> boost
20160406 03:36:19-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 252 seconds]
20160406 03:36:28< ancestral> “BOOST_STATIC_ASSERT( false && sizeof(U) );”
20160406 03:36:58< ancestral> “Unused typedef ‘boost_static_assert_typedef_2247‘”
20160406 03:37:30< ancestral> I tried commenting that line and another line with the error (2254) and last time if I recall I got more boost errors
20160406 03:37:49< ancestral> More unused typedefs
20160406 03:38:10< ancestral> Googling
20160406 03:38:22< celticminstrel> Yeah, that should only be a warning, not an error...
20160406 03:38:30< ancestral> Hmm https://svn.boost.org/trac/boost/ticket/11664
20160406 03:39:11< ancestral> So maybe I need a newer version of Boost
20160406 03:39:32< ancestral> Or an older version
20160406 03:40:44< ancestral> Is 1.60.0 okay?
20160406 03:41:00< celticminstrel> What version are you using currently?
20160406 03:41:06< ancestral> 1.58
20160406 03:41:08< ancestral> I believe
20160406 03:41:27< ancestral> No
20160406 03:41:28< ancestral> 1.54
20160406 03:41:50< ancestral> Well that’s what the headers say
20160406 03:42:06< ancestral> I can use/build whatever version necessary
20160406 03:42:27< celticminstrel> Well, I would say any version is fine as long as it works... probably... though if it doesn't work on 10.7 that might be a bit of a problem...
20160406 03:42:40< ancestral> My target with 1.13.4 is for 10.6
20160406 03:42:50< ancestral> And I am making everything “universal”
20160406 03:56:24< ancestral> Well, I’ll try 1.60
20160406 03:57:09< ancestral> Still unsure exactly why Debug acts differently
20160406 03:59:48< vultraz> ancestral: I think we dropped 10.6 when we moved to C++11
20160406 03:59:50< vultraz> recommend 10.7
20160406 04:00:00< celticminstrel> This is for 1.13.4 though.
20160406 04:00:11< celticminstrel> So, technically, 10.6 is still at least semi-supported at that point.
20160406 04:00:36< celticminstrel> I already updated the deployment target to 10.7 on master.
20160406 04:00:45< celticminstrel> It was at 10.6 before then.
20160406 04:01:55< ancestral> Yeah I’m rebuilding 1.13.4
20160406 04:02:00< vultraz> oh, rigjht
20160406 04:02:06< ancestral> I mean I can change the target, but I don’t think that’s the issue
20160406 04:02:21< ancestral> Anyway, I can just change some of the settings for “Debug” and just fish the app out
20160406 04:02:40< celticminstrel> Eh?
20160406 04:02:46< ancestral> Spo
20160406 04:02:47< ancestral> So
20160406 04:02:55< ancestral> Debug and Release are just two separarte dirs
20160406 04:03:02< ancestral> And each has build settings, right?
20160406 04:03:05< vultraz> He's saying make Debug match Release and take the resulting app since Release won't build but Debug does
20160406 04:03:07< vultraz> I think
20160406 04:03:10< ancestral> Yes
20160406 04:03:23< ancestral> At least, make the stuff that matters match
20160406 04:03:32< ancestral> Like optimizations, SDKs, etc.
20160406 04:04:07< ancestral> I’m not going to spend too much of this on tagged 1.13.4, especially for dev
20160406 04:06:40< ancestral> Okay, I’m going to try building wesnothd in Debug and leave Wesnoth in Release, and see what happens
20160406 04:07:07< ancestral> (I’m going to abandon this project file after I’m done here)
20160406 04:07:43-!- travis-ci [~travis-ci@ec2-54-234-7-105.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 04:07:44< travis-ci> wesnoth/wesnoth#9210 (master - 1e5e071 : Celtic Minstrel): The build is still failing.
20160406 04:07:44< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/121054243
20160406 04:07:44-!- travis-ci [~travis-ci@ec2-54-234-7-105.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 04:08:08< ancestral> Nope, that won’t work, probably because it’s trying to build wesnothd in Release
20160406 04:08:21< celticminstrel> ancestral: You can remove wesnothd as a dependency.
20160406 04:08:51< celticminstrel> Ah, that build failing worried me, but it's only C++14 that failed.
20160406 04:10:01< ancestral> Yeah?
20160406 04:10:15< celticminstrel> That's in project settings too.
20160406 04:24:25-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has quit [Quit: Connection closed for inactivity]
20160406 04:26:21-!- Kwandulin [~Miranda@p200300760F0D01AA50A7B082C4D24307.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160406 05:22:06-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: And lo! The computer falls into a deep sleep, to awake again some other day!]
20160406 05:58:25-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 05:59:06-!- ScegfOd [637f4b7c@gateway/web/freenode/ip.99.127.75.124] has quit [Quit: Page closed]
20160406 06:02:59-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 244 seconds]
20160406 06:21:44-!- irker707 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20160406 07:27:43< ancestral> Okay, success
20160406 07:30:59-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has joined #wesnoth-dev
20160406 07:31:59< vultraz> :D
20160406 07:43:00-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20160406 07:53:50-!- aeonchild is now known as enchi
20160406 08:04:04-!- ShikadiLord [~ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev
20160406 08:04:19< ShikadiLord> ancestral: I think I know why Cocoa notifications are considered unavailable by the version UI.
20160406 08:05:01< ShikadiLord> The file that carries the required information, src/build_info.cpp, checks whether HAVE_NS_USER_NOTIFICATION has been defined. It most certainly has not, there.
20160406 08:05:28< ShikadiLord> The reason is that when it's defined, it is defined _only_ in the context of src/desktop/apple_notification.mm.
20160406 08:05:48< ShikadiLord> Either it used to be defined everywhere, or I misinterpreted something when I wrote that bit in build_info.cpp.
20160406 08:05:49-!- boucman_work [~boucman@247.37.0.109.rev.sfr.net] has quit [Ping timeout: 252 seconds]
20160406 08:06:25< ShikadiLord> Feel free to fix it however you see fit.
20160406 08:06:30-!- ShikadiLord [~ignacio@wesnoth/developer/shadowm] has left #wesnoth-dev []
20160406 08:10:16-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 08:10:17-!- Kwandulin [~Miranda@p200300760F0D01AA50A7B082C4D24307.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160406 08:14:51-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 264 seconds]
20160406 08:35:06-!- boucman_work [~boucman@190.17.90.92.rev.sfr.net] has joined #wesnoth-dev
20160406 08:44:34-!- Kwandulin [~Miranda@p200300760F0D01AA38F4482578D998DD.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160406 08:49:39-!- Appleman1234 [~Appleman1@KD106161139076.au-net.ne.jp] has quit [Ping timeout: 264 seconds]
20160406 08:54:21-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20160406 08:59:46< Aginor> 'lo
20160406 09:00:37< vultraz> lo
20160406 09:00:45< vultraz> Good news: you don't have to touch the threading after all
20160406 09:02:21< Aginor> how come?
20160406 09:02:29< vultraz> celmin fixed it
20160406 09:02:33< Aginor> good
20160406 09:02:46< vultraz> https://github.com/wesnoth/wesnoth/commit/1afa45a53e16115811986bcc51d33043259f8d90 I believe
20160406 09:04:58< Aginor> that fix makes me think that what other worker threads there are are wrong
20160406 09:05:09< Aginor> they should never attempt to call any of the video/event code
20160406 09:05:30< vultraz> The bug was when a dialog tried to show while the loadscreen was up
20160406 09:06:13< Aginor> that dialog was created from the wrong thread then
20160406 09:07:23< Aginor> I suggest we turn that return statement into an assert instead :)
20160406 09:10:57 * Soliton suggests taking the several hints since (and really even before) introducing threading and remove it again.
20160406 09:11:18< vultraz> Aginor: your call
20160406 09:11:26< Aginor>  hmm
20160406 09:11:56< vultraz> Right now the loadscreen seems pretty solid
20160406 09:13:05< vultraz> Albeit not as fast as it was when I first reimplemented it
20160406 09:13:12< vultraz> Then again, my implementation was buggy
20160406 09:46:59-!- Appleman1234 [~Appleman1@KD118156079165.au-net.ne.jp] has joined #wesnoth-dev
20160406 09:55:33< vultraz> OK
20160406 09:55:45< vultraz> So from next week, I'm going to be on indefinite Wesbreak
20160406 09:56:08< vultraz> If there's anything you guys want me to do before then, let me know.
20160406 10:00:56-!- boucman_work [~boucman@190.17.90.92.rev.sfr.net] has quit [Remote host closed the connection]
20160406 10:11:50< zookeeper> eh?
20160406 10:12:22< vultraz> zookeeper: I'm taking a break from wesnoth development
20160406 10:12:44< zookeeper> why are you doing that immediately after pushing a ton of stuff that needs refinement=
20160406 10:12:45< zookeeper> ?
20160406 10:13:43< vultraz> That being?
20160406 10:13:54< zookeeper> <vultraz> zookeeper: I'm taking a break from wesnoth development
20160406 10:14:08< vultraz> I mean, the stuff
20160406 10:14:11< vultraz> Not the 'that'
20160406 10:14:38< Aginor> zookeeper: he needs to worry about his studies, which is something I support
20160406 10:15:41< zookeeper> the stuff you've been doing lately, obviously.
20160406 10:17:05< zookeeper> (i don't want to pull literally right now to check what's changed since yesterday or so)
20160406 10:18:21< vultraz> I can't handle the loadscreen matters anymore
20160406 10:18:29< vultraz> Celmin is sorting out the build errors
20160406 10:19:06< vultraz> Plus, the loadscreen seems fine now
20160406 10:21:36< vultraz> I'll fix the horizontal scrollbars, but there's nothing absolutely pressing that needs to be sorted.
20160406 10:31:46< zookeeper> fine, i'll do it anyway so i can complain more precisely
20160406 10:32:49< zookeeper> but first:
20160406 10:32:50< zookeeper> include\utility(199): error C2079: 'std::pair<config,game_events::queued_event>::second' uses undefined struct 'game_events::queued_event'
20160406 10:32:51< zookeeper> include\deque(947) : see reference to class template instantiation 'std::pair<config,game_events::queued_event>' being compiled
20160406 10:32:51< zookeeper> src\synced_context.hpp(182) : see reference to class template instantiation 'std::deque<std::pair<config,game_events::queued_event>,std::allocator<_Ty>>' being compiled
20160406 10:33:24< vultraz> celmin's problem
20160406 10:37:19-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 10:37:44< zookeeper> let's see if just reverting that commit fixes it...
20160406 10:40:38-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has joined #wesnoth-dev
20160406 10:41:57-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 276 seconds]
20160406 10:51:24 * Aginor grabs a helping of bugs from the issue tracker
20160406 10:51:36< Aginor> so at least it's obvious what I'm working on
20160406 10:55:31< zookeeper> one thing that still needs fixing is how the gamemap tends to flicker onscreen right before the storyscreen appears
20160406 10:56:11< vultraz> I think Aginor's already working on that
20160406 10:56:18< Aginor> zookeeper: it's WIP
20160406 10:56:55< Aginor> have a look at renderpath_redo if you want, but it's still unfinished work
20160406 10:57:16< Aginor> I've solved many of the problems, but I need to make animations/halos play nicely too
20160406 10:57:31< Aginor> then I *think* flickering will be sorted
20160406 10:57:41< Aginor> next step after that is starting to look at optimisation
20160406 11:02:10-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has quit [Quit: ChipmunkV]
20160406 11:13:01-!- prkc [~prkc@catv-80-98-243-98.catv.broadband.hu] has quit [Ping timeout: 248 seconds]
20160406 11:18:02< zookeeper> ok, so.
20160406 11:18:11< zookeeper> in campaign menu, all white text is bolded, which looks awkward.
20160406 11:20:19< zookeeper> and the same goes for white text in most other places too
20160406 11:21:40< zookeeper> the scrollbar in multiplayer scenario selection list is a hybrid of old and new
20160406 11:22:31< zookeeper> the new scrollbar looks disproportionately small compared to whatever list contents it's attached to
20160406 11:23:27< zookeeper> holy crap, the bold text appears even in [message]s
20160406 11:24:24< zookeeper> the menu and actions buttons are still just voids
20160406 11:25:39-!- prkc [~prkc@gateway/vpn/privateinternetaccess/prkc] has joined #wesnoth-dev
20160406 11:26:19< zookeeper> there's a font scaling option in preferences now? well, that's good. but it won't let me go <100%, which is too big.
20160406 11:26:52< zookeeper> in preferences, the hotkeys tab is blank when i have >100% font scaling
20160406 11:27:30< zookeeper> apparently only if it's >=125%
20160406 11:27:59-!- boucman_work [~boucman@193.56.60.161] has joined #wesnoth-dev
20160406 11:29:18< vultraz> are you sure you're not using the new font
20160406 11:30:06< zookeeper> i've done nothing beyond pulling
20160406 11:30:15< zookeeper> so yeah probably i'm not
20160406 11:30:18< vultraz> hm
20160406 11:30:31< vultraz> I am, so maybe the issues are there but I'm not seeing them
20160406 11:31:41< zookeeper> oh and another bastard scrollbar is in the help. but really, the old scrollbars look so much better.
20160406 11:32:15< vultraz> I might add some more decor to the button areas
20160406 11:34:40< zookeeper> and of course the race and alignment icons are still in the recruit dialog
20160406 11:35:14< vultraz> I'm not changing that
20160406 11:38:43< zookeeper> well that is most unfortunate
20160406 11:40:53< zookeeper> because then you've created a mess for someone else to clean up, i doubt restoring the old dialog is just a matter of reverting the commit that introduced the new one, what with the refactoring that has been done since
20160406 11:47:33< vultraz> Why in god's name would you do that
20160406 11:47:37< vultraz> The old dialog is GUI1
20160406 11:47:47< vultraz> Plus, I'm not abandoning Wesnoth forever
20160406 11:47:50< vultraz> I'll be back
20160406 11:48:18< vultraz> Dunno when, exactly
20160406 11:49:02< vultraz> Might be back soon if I convince LB to come do some UI stuff.
20160406 11:49:09< vultraz> But I'm not vanishing until next week anyway
20160406 11:51:28< zookeeper> why? because it needs to be sorted out before 1.14, which might or might not fit inside "indefinite break"
20160406 12:00:52-!- Kwandulin [~Miranda@p200300760F0D01AA38F4482578D998DD.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160406 12:06:55-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160406 12:07:41< vultraz> I don't expect 1.14 before the end of the year, and I'll be back before then
20160406 12:08:01< vultraz> but if it's really so important..
20160406 12:12:26-!- irker447 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20160406 12:12:26< irker447> wesnoth: Charles Dang wesnoth:master 7525646cd0cb / data/gui/widget/unit_preview_pane.cfg: tunit_preview_pane: redesigned Minimal style https://github.com/wesnoth/wesnoth/commit/7525646cd0cb244a1d435b1e20d3c3fd99112e40
20160406 12:12:42< vultraz> zookeeper: ^there, an icon-less definition that can be used if necessary 
20160406 12:15:40< zookeeper> i guess one just needs to know how to use it, then?
20160406 12:20:45< wedge009> Aginor: Just wondering if renderpath_redo is okay? When I pull from it, I keep getting merge conflicts. I don't know what's happening there, it could just be me. Anyway, thanks for picking up those issues.
20160406 12:24:05< vultraz> zookeeper: well, some changes to the c++ need to be made
20160406 12:24:20< vultraz> I guess I'll get to that later
20160406 12:31:54-!- mjs-de [~mjs-de@x4e31f1a6.dyn.telefonica.de] has joined #wesnoth-dev
20160406 12:35:42< zookeeper> right, okay
20160406 12:38:55-!- travis-ci [~travis-ci@ec2-54-234-7-105.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 12:38:56< travis-ci> wesnoth/wesnoth#9211 (master - 7525646 : Charles Dang): The build is still failing.
20160406 12:38:56< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/121132168
20160406 12:38:56-!- travis-ci [~travis-ci@ec2-54-234-7-105.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 12:55:31-!- boucman_work [~boucman@193.56.60.161] has quit [Ping timeout: 248 seconds]
20160406 12:59:35-!- boucman_work [~boucman@bob75-2-81-56-46-209.fbx.proxad.net] has joined #wesnoth-dev
20160406 13:11:34-!- Kwandulin [~Miranda@p200300760F0D018FFC4BF7207FAE968A.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160406 13:20:35-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has joined #wesnoth-dev
20160406 13:58:48-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20160406 13:58:54-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20160406 14:10:11-!- boucman_work [~boucman@bob75-2-81-56-46-209.fbx.proxad.net] has quit [Ping timeout: 248 seconds]
20160406 14:22:03-!- Appleman1234 [~Appleman1@KD118156079165.au-net.ne.jp] has quit [Ping timeout: 240 seconds]
20160406 14:26:56-!- boucman_work [~boucman@bob75-2-81-56-46-209.fbx.proxad.net] has joined #wesnoth-dev
20160406 15:02:42-!- boucman_work [~boucman@bob75-2-81-56-46-209.fbx.proxad.net] has quit [Ping timeout: 246 seconds]
20160406 15:12:23-!- irker447 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20160406 15:20:32-!- boucman_work [~boucman@bob75-2-81-56-46-209.fbx.proxad.net] has joined #wesnoth-dev
20160406 15:36:25-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev
20160406 15:49:37-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20160406 15:50:08-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 15:51:33-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20160406 15:51:40-!- Greg-Bog_ [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 15:53:35-!- Dugi [93fbd396@gateway/web/freenode/ip.147.251.211.150] has joined #wesnoth-dev
20160406 15:53:39< Dugi> Hello.
20160406 15:54:10< Dugi> If I make a new file in wesnoth's source code and want to attribute it to myself, do I have to write my own name there or a nickname is enough?
20160406 15:55:11< celticminstrel> When I was doing that I either just deleted that line altogether or left in David White's name >_>
20160406 15:55:24< celticminstrel> I would assume a nickname is sufficient though...
20160406 15:57:21< celticminstrel> I can't see any in current files that are obviously a nickname.
20160406 15:57:45< celticminstrel> Oh, there's one that just says "by the Battle for Wesnoth Project".
20160406 15:59:09-!- boucman_work [~boucman@bob75-2-81-56-46-209.fbx.proxad.net] has quit [Ping timeout: 276 seconds]
20160406 16:00:43< celticminstrel> Well, more than one.
20160406 16:01:39-!- prkc [~prkc@gateway/vpn/privateinternetaccess/prkc] has quit [Ping timeout: 248 seconds]
20160406 16:06:58< Dugi> Okay, using nickname. Privacy matters.
20160406 16:07:46 * celticminstrel shrugs.
20160406 16:09:38< Dugi> Dumb question: How do I add a file into the scons project? CMake isn't set to support C++11, so it's currently completely useless.
20160406 16:10:17< celticminstrel> Huh? I thought the CMake was fixed by Ivanovic.
20160406 16:10:34< celticminstrel> You need to edit src/SConscript and src/CMakelists.txt
20160406 16:10:53< Dugi> Nope, the one I downloaded last week keeps telling that nullptr is an undefined variable.
20160406 16:11:12< celticminstrel> I suppose that could've been before he updated it...
20160406 16:13:28< Dugi> Aha. Okay. That's cool, before I prefer CMake. It gives an approximate guess of the progress. Although very approximate.
20160406 16:16:44-!- prkc [~prkc@catv-80-98-243-98.catv.broadband.hu] has joined #wesnoth-dev
20160406 16:17:02< vultraz> Dugi: it might be better to just give copyright to the project
20160406 16:18:22< vultraz> I would say real names are preferable otherwise, since then we know exactly who wrote the file.
20160406 16:18:31< Dugi> Well, I wanna leave some clue who wrote it.
20160406 16:18:57< Dugi> Nickname means that you know who it was, but I stay quasi-anonymous.
20160406 16:19:41< Dugi> All right, new file compiles, thanks, celticminstrel.
20160406 16:20:44< vultraz> celticminstrel: I'm getting 4 warnings about ..\..\src\units\unit.hpp|288|warning: 'realy2' may be used uninitialized in this function [-Wmaybe-uninitialized]|
20160406 16:21:13< vultraz> (other three are for realx2, realy1, and realx1)
20160406 16:22:52< celticminstrel> That error is somehow weird, since it's giving the wrong file...
20160406 16:23:01< celticminstrel> Warning, whatever.
20160406 16:23:03< vultraz> indeed
20160406 16:23:32-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has joined #wesnoth-dev
20160406 16:23:56< celticminstrel> Assuming it's about undo_action.cpp, it seems the warning is spurious and they're not being used uninitialized.
20160406 16:24:18< celticminstrel> I would expect it to be pointing to lines 118 and 122.
20160406 16:24:56< celticminstrel> Which implies that it's unable to prove that those lines are unreachable if the earlier if blocks that assign to them were skipped.
20160406 16:25:15< celticminstrel> If you want to silence the warnings, it's fine to assign 0 to the variables.
20160406 16:25:30< celticminstrel> In the declaration.
20160406 16:25:34-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20160406 16:25:34-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20160406 16:30:44-!- Kwandulin [~Miranda@p200300760F0D018FFC4BF7207FAE968A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160406 16:33:09-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20160406 16:33:28< Ivanovic> Dugi: i fixed the build sometime last weekend
20160406 16:33:40< Ivanovic> but only a quick&dirty hack which i would only say "works on my system"
20160406 16:35:19< zookeeper> celticminstrel, i take it that you noticed the compile errors i mentioned 6 hours ago
20160406 16:35:41< celticminstrel> I didn't. I'll go look.
20160406 16:35:47< zookeeper> well, maybe i didn't actually, but now i do :p
20160406 16:39:13< zookeeper> https://forums.wesnoth.org/viewtopic.php?p=595729#p595729 <- i think it's a a decent idea to put a mention/link to add-ons as the last item in the list, or somewhere in the campaigns menu.
20160406 16:41:20< Ivanovic> okay, there are some warnings left in the code
20160406 16:41:29< Ivanovic> are there even more files that have to be added to an exception list?
20160406 16:42:21< Ivanovic> or was the policy changed (without mail to wesnoth-dev) that from now on warnings should no longer be treated as error?
20160406 16:42:39< Ivanovic> http://pastebin.com/mepHHnKj
20160406 16:43:27< celticminstrel> I don't think any policy change has happened, but warnings can depend on the platform, so they might be missed in some cases.
20160406 16:45:54< celticminstrel> (More than just the platform, really.)
20160406 16:46:21-!- Horus2 [~Horus2@193.91.93.146.pool.invitel.hu] has joined #wesnoth-dev
20160406 16:47:54< celticminstrel> I guess those are the same warnings vultraz got.
20160406 16:52:10< Dugi> Ivanovic: Thanks for the information.
20160406 16:52:36-!- Horus2 [~Horus2@193.91.93.146.pool.invitel.hu] has left #wesnoth-dev []
20160406 16:53:49< celticminstrel> vultraz: Please make sure you finish the horizontal scrollbars at least.
20160406 16:55:45< celticminstrel> zookeeper: That's weird, the compiler error looks exactly like one I got myself while working on that...
20160406 16:57:38-!- prkc [~prkc@catv-80-98-243-98.catv.broadband.hu] has quit [Ping timeout: 244 seconds]
20160406 16:58:54< celticminstrel> The fix is easy, at least.
20160406 16:59:06< celticminstrel> Ugh...
20160406 16:59:28< celticminstrel> It means that synced_context.hpp now depends on config.hpp, though. :(
20160406 17:01:29-!- irker655 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20160406 17:01:29< irker655> wesnoth: Celtic Minstrel wesnoth:master 396af2d0d8cb / src/synced_context.hpp: Fix MSVC 2013 compile error https://github.com/wesnoth/wesnoth/commit/396af2d0d8cb7acc0d3b7196e8e2c4d88081dc77
20160406 17:03:00< celticminstrel> Aginor: I'd rather not change the return into an assert. The issue was a dialog created from Lua, so moving the Lua engine initialization out of the loadscreen worker thread should fix it; I didn't do that mainly because I'm not sure if there's dependency on the order of initialization.
20160406 17:04:30< celticminstrel> Also Aginor, I think vultraz is a little too generous in saying I've fixed it; there are still some lingering issues in the loadscreen - occasional random crashes from the t_string constructor, for example.
20160406 17:07:14< celticminstrel> zookeeper: What's this about?
20160406 17:07:18< celticminstrel> 20160406 11:24:24< zookeeper> the menu and actions buttons are still just voids
20160406 17:08:30-!- Greg-Bog_ [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20160406 17:08:36< vultraz> mouseover issue to the transparent menu buttons in-game
20160406 17:09:45-!- prkc [~prkc@46.166.188.211] has joined #wesnoth-dev
20160406 17:12:25< celticminstrel> vultraz: Where's your button definitions? button_default.cfg?
20160406 17:12:33< vultraz> yes
20160406 17:13:41< celticminstrel> Hmm, that doesn't seem to cover the text positioning... unless I'm missing something...
20160406 17:14:59< celticminstrel> I'm not seeing all the bold that zookeeper is seeing...
20160406 17:16:58< vultraz> text macros are in _initial
20160406 17:17:00< celticminstrel> 50% font scaling is no longer an utterly ridiculously small size. Still too small to be useful though.
20160406 17:17:17< celticminstrel> Oh, the GUI__CENTERED_TEXT macro, right.
20160406 17:18:49< celticminstrel> The vertical centering is definitely off.
20160406 17:19:15< celticminstrel> I think there's maybe five pixels more below than above with 50% font scaling.
20160406 17:19:47< celticminstrel> BTW, I've reduced the minimum of the font scaling slider to 80%.
20160406 17:20:45< celticminstrel> Hmm, maybe the text_height isn't what the formula assumes it to be...
20160406 17:22:31-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 17:23:57-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20160406 17:24:47< celticminstrel> I'm probably going to keep my prefs at 80% font scaling now that all the font sizes have increased.
20160406 17:24:55< vultraz> um
20160406 17:24:57< celticminstrel> Though I guess GUI1 hasn't increased yet.
20160406 17:25:01< vultraz> I thought we hadn't committed that yet?
20160406 17:25:05< vultraz> are you using ancestral's branch?
20160406 17:25:09< vultraz> or did he merge it
20160406 17:25:15< vultraz> I'm confused 
20160406 17:25:17< ancestral> Which what now
20160406 17:25:20< ancestral> :-P
20160406 17:25:27< celticminstrel> No, I'm not using his branch. I think the font sizes were committed but not the new font, or something.
20160406 17:25:32-!- Kwandulin [~Miranda@p200300760F0D018F310A5323049B0959.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160406 17:25:40-!- Greg-Bog_ [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 17:25:46< celticminstrel> I dunno, but I'm 99% sure that the font size has increased in master.
20160406 17:25:53< vultraz> ...eh??
20160406 17:25:59-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Read error: No route to host]
20160406 17:26:20< vultraz> yes they were...
20160406 17:26:21< vultraz> when was this
20160406 17:27:20< vultraz> oh damn
20160406 17:27:33< vultraz> ancestral: I accidentally committed the new font sizes to master :|
20160406 17:27:48< vultraz> celticminstrel: those are the sizes to go with the new font
20160406 17:27:55< ancestral> I would say revert the commits or change the font
20160406 17:28:10< ancestral> The font sizes with the new font will normalize abit
20160406 17:28:26< ancestral> i.e. DVS renders bigger at the same size as Lato
20160406 17:28:44< vultraz> Up to you to decide if you should merge your PR
20160406 17:28:59< ancestral> No one has objected, I say let’s go for it
20160406 17:29:12< ancestral> You want me to do it?
20160406 17:29:21-!- travis-ci [~travis-ci@ec2-50-16-39-135.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 17:29:22< travis-ci> wesnoth/wesnoth#9212 (master - 396af2d : Celtic Minstrel): The build is still failing.
20160406 17:29:22< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/121207376
20160406 17:29:22-!- travis-ci [~travis-ci@ec2-50-16-39-135.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 17:29:24< celticminstrel> ancestral: Even so, you were intending to increase the font size overall, right?
20160406 17:29:31< ancestral> Yes, slightly
20160406 17:29:31< vultraz> celticminstrel: yes
20160406 17:29:33< vultraz> that's what these numbers are
20160406 17:29:48< vultraz> ancestral: yes. thought will probably me merge conflicts, now
20160406 17:29:56< vultraz> should I revert that part of the commit?
20160406 17:30:14< ancestral> I suppose that would work
20160406 17:30:43< ancestral> If it’s not too much trouble
20160406 17:30:45< celticminstrel> It won't merge conflict if it's the exact same changes and no-one else has touch the area.
20160406 17:30:55< ancestral> GitHub says it has conflicts
20160406 17:31:53< irker655> wesnoth: Celtic Minstrel wesnoth:master 21965b40e5bf / data/gui/ (macros/_initial.cfg window/preferences/03_display.cfg): Font scaling minimum to 80% and adjust vertical centering formula https://github.com/wesnoth/wesnoth/commit/21965b40e5bf1cff56d776d6342563b2b49d3b6f
20160406 17:31:55< celticminstrel> Fair enough.
20160406 17:32:12< vultraz> dammit
20160406 17:32:18< celticminstrel> gfgtdf: Please fix the C++14 build.
20160406 17:32:23< vultraz> I was just committing to that file :|
20160406 17:32:28< celticminstrel> Oh, sorry.
20160406 17:32:56< vultraz> Now reversion will be more difficult...
20160406 17:33:03< celticminstrel> Not really?
20160406 17:33:28< celticminstrel> Unless the font size change affected the vertical centering formula.
20160406 17:33:42< celticminstrel> Even if the same file is touched, that doesn't automatically mean there's a conflict.
20160406 17:33:50< celticminstrel> If it's in different areas of the file.
20160406 17:34:11< vultraz> the font branch tweaked it to the value I accidentally committed 
20160406 17:34:23< celticminstrel> I personally think it's better to merge the PR manually instead of reverting this.
20160406 17:34:32< ancestral> Alright
20160406 17:34:37< vultraz> yeah, probably
20160406 17:34:53< celticminstrel> Also, does it affect GUI1 yet?
20160406 17:34:58< celticminstrel> What's the plan with that?
20160406 17:35:00< ancestral> If you want me to do this, I may not have time until tonight
20160406 17:35:15< celticminstrel> I could do it in two minutes if you want me to.
20160406 17:35:15-!- Greg-Bog_ [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20160406 17:35:21< ancestral> I’m fine with that
20160406 17:35:26< ancestral> celticminstrel: With GUI1,
20160406 17:35:36-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 17:35:46< ancestral> It’s a matter of updating the fonts.cfg and Lato will show up there
20160406 17:36:08< ancestral> But it might impair certain readability issues/UI issues
20160406 17:36:26< vultraz> I think it's better to use it and then update sizes.
20160406 17:36:30< ancestral> So that means maybe some slight changes to GUI1 dialogs
20160406 17:36:32< vultraz> Else we'll be seeing two fonts
20160406 17:36:33< vultraz> and it will be weird
20160406 17:36:34< celticminstrel> So GUI2 doesn't follow the order in fonts.cfg and uses Lato anyway?
20160406 17:36:59< vultraz> GUI2 uses only the family_order key
20160406 17:37:01< vultraz> nothing else
20160406 17:37:03< celticminstrel> Ah, okay.
20160406 17:37:27< celticminstrel> Well, if we moved GUI1 to ttext, then it would automatically adjust to the new font, as well.
20160406 17:38:12< ancestral> Will ttext render more like GUI2, or not?
20160406 17:39:26< ancestral> vultraz: Up to you with integrating the GUI1 dialogs with Lato, because I’m guessing there will be some buttons or boxes that might need to be resized. And I don’t know if maybe you guys are converting more GUI1 dialogs to GUI2?
20160406 17:39:53< ancestral> One more reason not to do it just now: the in game theme
20160406 17:40:15< ancestral> It’s not going to break horribly, but there could be some text that gets clipped
20160406 17:40:33< vultraz> I didn't notice any text clipping
20160406 17:40:37< ancestral> Yeah?
20160406 17:40:43< vultraz> But I was using it with the old default GUI1 sizes
20160406 17:40:50< ancestral> Right
20160406 17:40:50< vultraz> so don't rely on that
20160406 17:40:53< ancestral> I am willing to update the in game theme (minor changes, not a crazy overhaul)
20160406 17:41:03< ancestral> But
20160406 17:41:14< ancestral> I want to finish the trailer first
20160406 17:41:23< celticminstrel> Should GUI_NORMAL__FONT_SIZE__TITLE be 24 or 22?
20160406 17:41:35< ancestral> I think last I had 22
20160406 17:41:38< ancestral> 24 seemed quite large
20160406 17:41:45< celticminstrel> 'kay
20160406 17:41:45< ancestral> Wait, normal?
20160406 17:41:49< ancestral> Hmm
20160406 17:41:51< celticminstrel> No, title.
20160406 17:41:55< ancestral> Oh title
20160406 17:41:59< celticminstrel> There was a conflict there, which is why I asked.
20160406 17:42:00< ancestral> I’m not sure
20160406 17:42:06< ancestral> Which did I have?
20160406 17:42:15< ancestral> If I had 22, then stick with that
20160406 17:42:34-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20160406 17:42:38< vultraz> I thought it was 24
20160406 17:42:42< celticminstrel> Well, given that my formula adjustment was the upper version and 24 was the upper version, I think he had 22.
20160406 17:43:06< vultraz> ok
20160406 17:43:07< vultraz> go with that
20160406 17:45:14< irker655> wesnoth: ancestral wesnoth:master 353a9c38e789 / data/ (gui/macros/_initial.cfg hardwired/fonts.cfg): Lato is now the new game font. Initially, this will be limited to GUI2, but as t https://github.com/wesnoth/wesnoth/commit/353a9c38e7893bafbd166153ef216482d34aa895
20160406 17:45:16< irker655> wesnoth: ancestral wesnoth:master 280c5fe69a2d / / (5 files in 2 dirs): Minor formatting change to _initial.cfg https://github.com/wesnoth/wesnoth/commit/280c5fe69a2d1b4a2039c8f1bd6a70f1de7b21a4
20160406 17:45:18< irker655> wesnoth: Martin Proud wesnoth:master 30fefe488af1 / data/hardwired/fonts.cfg: Leaving Lato-Regular.ttf out due to GUI1 reasons https://github.com/wesnoth/wesnoth/commit/30fefe488af148d0347010fcb87268680fea6db1
20160406 17:45:20< irker655> wesnoth: Celtic Minstrel wesnoth:master 7521fad2a17c / / (6 files in 3 dirs): Merge pull request #639 from ancestral-lato https://github.com/wesnoth/wesnoth/commit/7521fad2a17cfa32c379113850ab1a470700b737
20160406 17:45:43< celticminstrel> Oh hey, github automatically marked it as merged, too.
20160406 17:46:04< vultraz> yes
20160406 17:46:16< vultraz> it does that if you push the same commits
20160406 17:46:23< celticminstrel> Guess so.
20160406 17:49:46-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20160406 17:50:24-!- ScegfOd [637f4b7c@gateway/web/freenode/ip.99.127.75.124] has joined #wesnoth-dev
20160406 17:54:05< celticminstrel> PRs to be dealt with: 616, 631, 642, 643.
20160406 17:54:11< celticminstrel> I think we can close 641.
20160406 17:58:16< celticminstrel> Testing 631 now.
20160406 17:59:54-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20160406 18:11:57-!- mjs-de [~mjs-de@x4e31f1a6.dyn.telefonica.de] has quit [Remote host closed the connection]
20160406 18:13:52-!- travis-ci [~travis-ci@ec2-107-20-99-119.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 18:13:53< travis-ci> wesnoth/wesnoth#9213 (master - 7521fad : Celtic Minstrel): The build is still failing.
20160406 18:13:53< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/121218269
20160406 18:13:53-!- travis-ci [~travis-ci@ec2-107-20-99-119.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 18:17:10-!- ScegfOd [637f4b7c@gateway/web/freenode/ip.99.127.75.124] has quit [Quit: Page closed]
20160406 18:46:06-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 244 seconds]
20160406 18:58:23< celticminstrel> I think PR631 can probably be merged very soon. Works for me, at least.
20160406 19:19:35-!- travis-ci [~travis-ci@ec2-107-20-99-119.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 19:19:36< travis-ci> gfgtdf/wesnoth-old#622 (master - 7521fad : Celtic Minstrel): The build was canceled.
20160406 19:19:36< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/121244522
20160406 19:19:37-!- travis-ci [~travis-ci@ec2-107-20-99-119.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 19:22:04-!- travis-ci [~travis-ci@ec2-23-20-6-6.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 19:22:05< travis-ci> gfgtdf/wesnoth-old#623 (master - 90016fc : gfgtdf): The build was canceled.
20160406 19:22:05< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/121246064
20160406 19:22:05-!- travis-ci [~travis-ci@ec2-23-20-6-6.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 19:22:14-!- travis-ci [~travis-ci@ec2-50-16-39-135.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 19:22:15< travis-ci> gfgtdf/wesnoth-old#623 (master - 90016fc : gfgtdf): The build was canceled.
20160406 19:22:15< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/121246064
20160406 19:22:15-!- travis-ci [~travis-ci@ec2-50-16-39-135.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 19:24:06-!- travis-ci [~travis-ci@ec2-23-20-6-6.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 19:24:07< travis-ci> gfgtdf/wesnoth-old#624 (master - afc0590 : gfgtdf): The build has errored.
20160406 19:24:07< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/121246126
20160406 19:24:07-!- travis-ci [~travis-ci@ec2-23-20-6-6.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 19:30:22< zookeeper> ok, the text bolding is gone now
20160406 19:30:54< celticminstrel> I assume that also means I fixed your compile error.
20160406 19:33:46< zookeeper> yeah, that too
20160406 19:41:03-!- ancestral [~ancestral@177.sub-70-197-227.myvzw.com] has joined #wesnoth-dev
20160406 19:51:05-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160406 19:57:19-!- ancestral [~ancestral@177.sub-70-197-227.myvzw.com] has quit [Read error: Connection reset by peer]
20160406 20:05:05-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has quit [Quit: nurupo]
20160406 20:09:54-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20160406 20:30:04-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20160406 20:46:50-!- Kwandulin [~Miranda@p200300760F0D018F310A5323049B0959.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160406 20:47:15-!- irker655 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20160406 21:01:05< Dugi> How do I use debug mode on wesnoth 1.13.4? The usual : does not seem to work.
20160406 21:02:27< Dugi> Aha, found it.
20160406 21:02:39< celticminstrel> Yeah, it changed to ; or something.
20160406 21:03:05< celticminstrel> Though I've taken to passing --debug on the command-line so I don't have to bother with that.
20160406 21:06:34-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has quit [Quit: ChipmunkV]
20160406 21:10:15-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20160406 21:12:13< Ravana_> I just changed preferences so that it would still open with :
20160406 21:12:40< celticminstrel> /me nods. Totally possible, of course.
20160406 21:12:50< celticminstrel> ...bah, random control character again... :(
20160406 21:13:15< Ravana_> though I wonder what people in mp games will be doing, when they need to teach someone how to give control...
20160406 21:15:14< celticminstrel> Doesn't it also work as a /-command in chat? I've never tried that though.
20160406 21:16:58< celticminstrel> It's kind of hard to tell people how to do things already in 1.12, since all the hotkeys are customizable.
20160406 21:18:33< Ravana_> though if you know enough to change it, then usually you know how to use it too
20160406 21:19:00-!- SigurdFD [~SigurdFD@dynamic-acs-72-23-176-151.zoominternet.net] has joined #wesnoth-dev
20160406 21:19:03< celticminstrel> I still want to split the hotkeys up according to categories.
20160406 21:19:12< celticminstrel> So that everything's not in one giant list.
20160406 21:25:03-!- prkc [~prkc@46.166.188.211] has quit [Quit: Leaving]
20160406 21:47:18-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev
20160406 21:50:04-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 244 seconds]
20160406 21:50:04-!- wedge010 is now known as wedge009
20160406 21:53:01-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 248 seconds]
20160406 22:04:09-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20160406 22:05:41-!- mjs-de [~mjs-de@x4e31f1a6.dyn.telefonica.de] has joined #wesnoth-dev
20160406 22:17:35-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20160406 22:18:17< Dugi> Guys, has any of you an idea how do I create a pull request from my local copy of wesnoth?
20160406 22:19:15< celticminstrel> You need a github account to create a pull request.
20160406 22:19:29< Dugi> I do have that.
20160406 22:19:39< celticminstrel> Okay, have you forked the wesnoth repo?
20160406 22:19:50< Dugi> I have successfully forked it, now I need to rebase it (my copy is based on master, not on the fork).
20160406 22:20:46< celticminstrel> Rebasing it is helpful if there are conflicts, but not strictly necessary.
20160406 22:21:03< Dugi> So what do I have to do if the changes are based on master and not on the fork?
20160406 22:21:08< celticminstrel> But it's not that hard, especially if there are no conflicts.
20160406 22:21:23< celticminstrel> You'll want to add your fork as a remote.
20160406 22:21:27< Dugi> There shouldn't be conflicts, the changes are small.
20160406 22:21:31< Dugi> So how do I do that?
20160406 22:21:35< celticminstrel> Or possibly just change the existing remote to point to it.
20160406 22:21:39< Dugi> So how do I do that?
20160406 22:21:55< celticminstrel> You can either use the "git remote" command, or edit the .git/config file.
20160406 22:22:20< celticminstrel> Oh, there's also "git push -u" if you want to push at the same time.
20160406 22:22:26< celticminstrel> That might be easier actually.
20160406 22:22:40< celticminstrel> ...wait, no, I think that requires you to have the remote set already...
20160406 22:23:15< celticminstrel> I think the command for setting a remote is something like "git remote --add name url"
20160406 22:23:15< Dugi> Says I don't have permission if I use git push -u
20160406 22:23:25< SigurdFD> Dugi, are your changes on your local master branch, or on a topic branch?
20160406 22:23:30< celticminstrel> Yeah, you'd need arguments to that command.
20160406 22:24:00< Dugi> So I type git remote --add Dugy https://github.com/Dugy/wesnoth
20160406 22:24:13< celticminstrel> When setting the remote I recommend using either a SSH address (if you've set up keys) or an address with your username - eg http://CelticMinstrel@github.com/...
20160406 22:24:19< Dugi> SigurdFD: My local master branch. I should have forked it first.
20160406 22:24:47< celticminstrel> Dugi: Like that, but I recommend also adding the username so you don't have to retype it every time you push.
20160406 22:24:57< celticminstrel> You can also add your password, but it's stored in plaintext so I don't recommend that.
20160406 22:25:19< Dugi> Unknown option add ?
20160406 22:25:30< celticminstrel> What was it then... it's something like that...
20160406 22:25:45< celticminstrel> Oh, it's a subcommand, not an option, so drop the hyphens.
20160406 22:25:56< Dugi> I have the login thing set up already.
20160406 22:26:41< celticminstrel> Once you've added the remote you can "git push -u Dugy master" or whatever.
20160406 22:26:41< Dugi> Still, permission denied to wesnoth/wesnoth Doesn't seem something was changed about the remote.
20160406 22:26:57< celticminstrel> The -u is only necessary the first time.
20160406 22:27:17< Dugi> Oh, it works somehow.
20160406 22:27:27< celticminstrel> Right, permission was denied because you didn't change the default remote, which is usually "origin".
20160406 22:27:44< celticminstrel> "git push" is usually synonymous with "git push origin <current-branch>" or something.
20160406 22:28:32< Dugi> It sent 180 megabytes... what the hell?
20160406 22:29:48< Dugi> It looks correct, but I forgot to add the two added files.
20160406 22:31:06< Dugi> Hm, how do I undo a commit?
20160406 22:33:20< celticminstrel> "git reset HEAD^" undoes the most recent commit but keeps the changes.
20160406 22:33:35< celticminstrel> Though I'm not sure if that's what you want.
20160406 22:33:52< celticminstrel> There's also "git revert" which creates a new commit undoing any other commit.
20160406 22:35:40< Dugi> Git reset head did it, but the two commits remain in the repo
20160406 22:37:37< Dugi> I will delete the repo and remake it, that's not so much work.
20160406 22:39:30< celticminstrel> No need.
20160406 22:39:37< celticminstrel> Add --force to your push command.
20160406 22:39:58< celticminstrel> Unless of course you've already deleted it. It's not like it hurts to do so in this case.
20160406 22:41:39< SigurdFD> Dugi: https://wiki.wesnoth.org/Git_for_Wesnoth_Crash_Course - it's a good guide for setting up the workflow and remotes
20160406 22:42:27< Dugi> I should have seen that earlier.
20160406 22:52:35-!- gfgtdf [~chatzilla@x4e36aa12.dyn.telefonica.de] has joined #wesnoth-dev
20160406 22:53:10< gfgtdf> celticminstrel: 20160406 17:32:18< celticminstrel> gfgtdf: Please fix the C++14 build.
20160406 22:53:36< gfgtdf> celticminstrel: hmm i tried but i dont see though this travis linux stuff
20160406 22:53:47< gfgtdf> celticminstrel: we we have oone whi knows about it we should disable it
20160406 22:53:50< gfgtdf> noone*
20160406 22:53:54< gfgtdf> who*
20160406 22:54:32< celticminstrel> That's fine too, I just don't want to keep getting "build failed" messages when it was only for C++14.
20160406 22:58:03-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20160406 23:01:04-!- irker084 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20160406 23:01:04< irker084> wesnoth: gfgtdf wesnoth:master c9ecd5a15da8 / .travis.yml: disable c++14 build https://github.com/wesnoth/wesnoth/commit/c9ecd5a15da849760ec7037a6808f3643bcce531
20160406 23:01:45< gfgtdf> celticminstrel: also i notced that it instll gcc 4.7 even when installing with clang
20160406 23:02:01< gfgtdf> celticminstrel: it'd mostlikekely be better if this onl happened on the gcc build
20160406 23:02:12-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160406 23:02:17< celticminstrel> Yeah, I know. I think it's probably not a big deal, but yeah, if we can that would be better.
20160406 23:02:34< celticminstrel> Actually, there's also another way of installing things in Travis that I think we should consider making use of.
20160406 23:02:47< gfgtdf> celticminstrel: whihc one ?
20160406 23:03:05< celticminstrel> https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-with-the-APT-Addon
20160406 23:05:30< gfgtdf> celticminstrel: hmm is that exclusive to the container based thing ?
20160406 23:05:38< celticminstrel> Pretty sure it's not.
20160406 23:05:50< celticminstrel> It's compulsory in the container based thing though.
20160406 23:05:56< celticminstrel> Which Wesnoth is not using.
20160406 23:06:00< celticminstrel> (Obviously.)
20160406 23:13:19< gfgtdf> celticminstrel: did you see https://forums.wesnoth.org/viewtopic.php?f=4&p=595724 = Its mostlikekely related to https://github.com/wesnoth/wesnoth/commit/03580ed9a9ca685da3e201799c1743715d055180
20160406 23:13:52< gfgtdf> celticminstrel: about the '-' character in particular
20160406 23:15:07< celticminstrel> So I need to fix DW, huh...
20160406 23:16:26< celticminstrel> But wait, does it not happen with no mods enabled?
20160406 23:17:02< gfgtdf> celticminstrel: hmm i didint think he said that, to me it sunded liek he just had mod activated and though tht it was teh casue for that bug
20160406 23:17:29< celticminstrel> Yeah, it doesn't seem like it would be related to having a mod enabled...
20160406 23:17:42< Dugi> Dammit, I have updated my local version to be built on the latest build, but it keeps listing these changes as local changes.
20160406 23:18:07< celticminstrel> ?
20160406 23:18:12< Dugi> Any idea what is going on?
20160406 23:18:21< celticminstrel> I'm not sure what you mean.
20160406 23:19:18< Dugi> My version is de37701, it seems to be totally up to date, but I have a load of changes listed, these seem to be the changes between the version I had initially cloned and the current version
20160406 23:19:55< celticminstrel> So what you mean is that "git status" is showing stuff that you don't think it should be showing?
20160406 23:19:59< Dugi> Yes.
20160406 23:20:10< Dugi> Tons of hogwash, but not the changes I've made.
20160406 23:20:18< celticminstrel> Was there a merge conflict?
20160406 23:20:31< gfgtdf> Dugi: how exactly did you update to current head?
20160406 23:20:35 * celticminstrel blink.
20160406 23:20:44< celticminstrel> Oh wow, I just noticed a typo in object.lua. o.o
20160406 23:21:00< Dugi> gfgtdf: Not sure.
20160406 23:21:12< Dugi> celticminstrel: No conflict, everything compiles and merged well.
20160406 23:21:25< gfgtdf> Dugi: do you have local changes taht you want to keep ?
20160406 23:21:26< celticminstrel> Ah, someone (maybe even me) already fixed it, good.
20160406 23:21:52< Dugi> gfgtdf: Yes.
20160406 23:21:57< celticminstrel> Dugi: What exactly did you do? Something like "git pull --rebase"?
20160406 23:22:10< Dugi> gfgtdf: Actually all the code I have there is okay, just git is getting made.
20160406 23:22:16< Dugi> gfgtdf: *mad
20160406 23:22:24< Dugi> celticminstrel: Yes, I did.
20160406 23:22:34< Dugi> celticminstrel: Without that rebase.
20160406 23:22:53< celticminstrel> Oh, so you merged in master rather than rebasing.
20160406 23:23:34< Dugi> celticminstrel: My local version is up to date with all my changes. I don't think I have some master currently.
20160406 23:23:49< celticminstrel> Huh?
20160406 23:24:58< Dugi> celticminstrel: I mean, I have deleted the old fork because it was messed up. You were taking long to reply so I thought it would solve it...
20160406 23:25:29< celticminstrel> Okay, so, is the de37701 commit one of yours?
20160406 23:25:45< celticminstrel> eg, "git log -n1" shows a message you wrote.
20160406 23:26:43< Dugi> celticminstrel: It does write the one commit I have.
20160406 23:27:19< celticminstrel> And you're quite sure that none of the things listed in "git status" are things that you did?
20160406 23:27:28< Dugi> Yes.
20160406 23:27:51< celticminstrel> This will undo everything that's currently listed in "git status": "git reset --hard"
20160406 23:28:06-!- travis-ci [~travis-ci@ec2-107-20-99-119.compute-1.amazonaws.com] has joined #wesnoth-dev
20160406 23:28:07< travis-ci> wesnoth/wesnoth#9214 (master - c9ecd5a : gfgtdf): The build was fixed.
20160406 23:28:07< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/121295703
20160406 23:28:07-!- travis-ci [~travis-ci@ec2-107-20-99-119.compute-1.amazonaws.com] has left #wesnoth-dev []
20160406 23:29:02< Dugi> celticminstrel: The reply was what I expected. It still lists some stuff on some untracked files, but none of them are my concern.
20160406 23:29:21< Dugi> celticminstrel: There's now one commit listed that I want to push into the fork.
20160406 23:29:36< celticminstrel> So then, "git push Dugy" or something. Might need to specify "master" as well.
20160406 23:29:49< celticminstrel> If rejected, and you're certain there's nothing to lose on the remote repo, add --force
20160406 23:30:04< celticminstrel> --force basically overwrites the remote with what you have locally.
20160406 23:31:21-!- Dugi_ [93fbd396@gateway/web/freenode/ip.147.251.211.150] has joined #wesnoth-dev
20160406 23:31:31< Dugi_> celticminstrel: Oops, accidentally killed my X-server.
20160406 23:32:50< Dugi_> Looks correct now, thanks.
20160406 23:33:50-!- Dugi [93fbd396@gateway/web/freenode/ip.147.251.211.150] has quit [Ping timeout: 250 seconds]
20160406 23:35:55< Dugi_> Okay, it's there https://github.com/wesnoth/wesnoth/pull/644
20160406 23:38:20< Dugi_> Not going to wait for travis, it's too late. Good night.
20160406 23:38:24-!- Dugi_ [93fbd396@gateway/web/freenode/ip.147.251.211.150] has quit []
20160406 23:45:34< celticminstrel> Huh...? The ankh necklace defined in Dead Water isn't used?
20160406 23:47:23-!- mjs-de [~mjs-de@x4e31f1a6.dyn.telefonica.de] has quit [Remote host closed the connection]
20160406 23:48:23< irker084> wesnoth: Celtic Minstrel wesnoth:master 3b4b858a40d2 / data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg: DW S10: Fix invalid [object] IDs https://github.com/wesnoth/wesnoth/commit/3b4b858a40d251cb4a3662d894843af7b947dfff
20160406 23:50:35< celticminstrel> Oh, I mispelled it in my search. That's why.
--- Log closed Thu Apr 07 00:00:20 2016