--- Log opened Sun Aug 23 00:00:54 2015 20150823 00:02:11< Aginor> oh well, I get it to compile but it's not finding the data directory 20150823 00:02:23< Aginor> even when I give it as a --data-dir argument 20150823 00:02:24< wedge009> shadowm: Thanks. Should the comment be changed, then? I suppose we don't want to specifically set a centred window on start-up. It just happens to be that way (on Windows) when undefined is set. 20150823 00:02:46< wedge009> Aginor: So it's another problem with SDL2 then. ): 20150823 00:03:38< Aginor> wedge009: I don't see a need for it to be specifid on any platform 20150823 00:03:41< Aginor> leave it to the VM 20150823 00:03:58< Aginor> wedge009: my OSX issues are wiuthout SDL2, I wanted to establish a baseline first 20150823 00:04:20< wedge009> Aginor: Sorry, I was referring to the column heading. 20150823 00:04:26< mattsc> Aginor: https://sourceforge.net/projects/wesnoth/files/unofficial/Mac%20Compile%20Stuff/ 20150823 00:04:36< shadowm> wedge009: I already merged the PR. 20150823 00:04:55< Aginor> ah, thanks 20150823 00:05:16< mattsc> this contains the Resources you need to include to get Xcode to compile 20150823 00:05:22< wedge009> shadowm: Okay, thanks. 20150823 00:05:55< shadowm> Both #454 and #455. 20150823 00:06:46< mattsc> Aginor: http://wiki.wesnoth.org/CompilingWesnothOnMacOSX#Build_using_XCode 20150823 00:07:10< mattsc> That page is really outdated, but the instructions at the beginning of that section should still be valid for MAvericks 20150823 00:07:21< mattsc> Sorry, Yosemite. Whatever ... 20150823 00:07:29< Aginor> 10.10? :D 20150823 00:07:30< mattsc> I can’t keep those names straight. :P 20150823 00:07:33< mattsc> yes 20150823 00:07:47< Aginor> neither can I 20150823 00:07:48< mattsc> but they should work for Mavericks (10.9, right?) too 20150823 00:14:19< Aginor> probably, yeah 20150823 00:14:24-!- Appleman1234 [~Appleman1@KD036010156065.au-net.ne.jp] has quit [Ping timeout: 244 seconds] 20150823 00:17:34< shadowm> celticminstrel: #463 is ready for review, right? 20150823 00:22:44-!- mattsc_ [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150823 00:24:33-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20150823 00:24:33-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20150823 00:24:46-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Ping timeout: 246 seconds] 20150823 00:24:47-!- mattsc_ is now known as mattsc 20150823 00:44:47< shadowm> vultraz: http://i.imgur.com/3rrrZvH.jpg 20150823 00:47:48< vultraz> Looks good to me 20150823 00:54:40< celticminstrel> shadowm: Yeah, I think so. 20150823 00:55:13< celticminstrel> vultraz: A way to get a unique name to identify a side, 20150823 00:55:37< vultraz> Hm... 20150823 00:56:49< shadowm> add_to_keyboard_chain, remove_from_keyboard_chain. How curious. 20150823 00:57:05< vultraz> celticminstrel: what about side number + user team name 20150823 00:57:29< vultraz> "1 (foo test team)" 20150823 00:57:48< irker850> wesnoth: Celtic Minstrel wesnoth:master 2012323758a4 / src/unit.cpp: Add [effect]apply_to=advances_to http://git.io/vswRR 20150823 00:57:50< irker850> wesnoth: Celtic Minstrel wesnoth:master 37bb9a021aab / src/unit.cpp: Add [effect]apply_to=alignment http://git.io/vswR0 20150823 00:57:52< irker850> wesnoth: Celtic Minstrel wesnoth:master 0a13fac06360 / src/unit_attack_type.cpp: Add increase_movement= to [effect]apply_to=attack http://git.io/vswRE 20150823 00:57:53< celticminstrel> User team name is far from unique, but I suppose; adding side number would make it unique. 20150823 00:57:54< irker850> wesnoth: Celtic Minstrel wesnoth:master 9785774c9a84 / src/unit.cpp: Add [effect]apply_to=max_attacks and [effect]apply_to=attacks_left http://git.io/vswRu 20150823 00:57:56< irker850> wesnoth: Celtic Minstrel wesnoth:master e64c46ca237c / src/unit.cpp: Add [effect]apply_to=recall_cost http://git.io/vswRz 20150823 00:57:58< irker850> wesnoth: Celtic Minstrel wesnoth:master d685bea4aa8a / src/unit.cpp: Add [effect]apply_to=vision http://git.io/vswRg 20150823 00:58:00< irker850> wesnoth: Celtic Minstrel wesnoth:master aa60b9451a1f / src/unit.cpp: Add [effect]apply_to=jamming http://git.io/vswR2 20150823 00:58:02< irker850> wesnoth: Celtic Minstrel wesnoth:master 69006cbf147e / src/unit_attack_type.cpp: Add set_*= versions of increase_*= keys in [effect]apply_to=attack http://git.io/vswRa 20150823 00:58:04< irker850> wesnoth: Celtic Minstrel wesnoth:master 1e74387d3d92 / src/unit.cpp: Handle case of default (-1) in [effect]apply_to=vision http://git.io/vswRV 20150823 00:58:06< irker850> wesnoth: Celtic Minstrel wesnoth:master a62eeaa65d87 / src/unit.cpp: Handle case of default (-1) in [effect]apply_to=recall_cost http://git.io/vswRw 20150823 00:58:08< irker850> wesnoth: Celtic Minstrel wesnoth:master 3223df345311 / src/unit.cpp: Split [effect]apply_to=advances_to into separate "new" and "remove" effects http://git.io/vswRr 20150823 00:58:10< irker850> wesnoth: Celtic Minstrel wesnoth:master b91fe7fc91e4 / changelog: Update changelog http://git.io/vswRo 20150823 00:58:12< irker850> wesnoth: Celtic Minstrel wesnoth:master 8fc2c7cc1f81 / src/unit.cpp: Style tweak http://git.io/vswRK 20150823 00:58:14< irker850> wesnoth: Celtic Minstrel wesnoth:master db9aae730ab7 / changelog src/unit.cpp: Remove [effect]apply_to=attacks_left due to not being very useful http://git.io/vswR6 20150823 00:58:16< irker850> wesnoth: Celtic Minstrel wesnoth:master ace0b53b3118 / changelog src/unit_attack_type.cpp: Change *_movement keys in [effect]apply_to=attack to *_movement_used http://git.io/vswRi 20150823 00:58:18< irker850> wesnoth: Ignacio R. Morelle wesnoth:master fa5e0f7be24b / changelog src/unit.cpp src/unit_attack_type.cpp: Merge pull request #463 from CelticMinstrel/effect_apply_to http://git.io/vswRP 20150823 00:58:46< shadowm> celticminstrel: One colum for the side number, another for the team name (with color applied to it)? 20150823 00:58:59< shadowm> Also, I didn't check but how does this dialog interact with hidden sides? 20150823 01:00:06< celticminstrel> ...good question. It probably includes them. 20150823 01:00:31< shadowm> If it doesn't check whether they are hidden or not then yes, most certainly. :) 20150823 01:04:53< shadowm> + { "set_dialog_focus", &lua_gui2::intf_set_dialog_focus }, 20150823 01:05:02< shadowm> I think somebody will appreciate this. 20150823 01:05:55< celticminstrel> Okay, so, stuff in label settings dialog, and stuff with AMLA PR... 20150823 01:06:28< mattsc> Aginor: oh ... 20150823 01:06:35< mattsc> I just remember something ... 20150823 01:07:28< celticminstrel> Oh right, something in quit confirm as well. 20150823 01:08:10< mattsc> Trying to look it up ... 20150823 01:09:49< mattsc> There it is. I used to get all sorts of warnings from third-party software also (probably boost, don’t remember), so I added the -isystem flag to the Xcode builds. 20150823 01:10:11< mattsc> That makes the compiler ignore those. 20150823 01:10:16< mattsc> I think, IIRC. 20150823 01:10:40< celticminstrel> Yeah, I think by default it suppresses warnings in system headers. 20150823 01:10:51< celticminstrel> If you do that in the scons build you can also add -Werror. 20150823 01:10:54< celticminstrel> Probably. 20150823 01:11:26< celticminstrel> Though there's still that annoying little warning in menu_events that I'm fairly sure isn't supposed to be issued. 20150823 01:11:43< shadowm> celticminstrel: Also, don't forget to document your WML/Lua API additions in the wiki! 20150823 01:11:45-!- Appleman1234 [~Appleman1@KD036010134068.au-net.ne.jp] has joined #wesnoth-dev 20150823 01:12:01< celticminstrel> Including female_text, I guess. 20150823 01:12:12< celticminstrel> Did I touch Lua API? 20150823 01:12:46< shadowm> Yes, indirectly. 20150823 01:12:56< irker850> wesnoth: Ignacio R. Morelle wesnoth:master ba6257129ab7 / / (4 files in 2 dirs): Add wesnoth.set_dialog_focus function http://git.io/vswEq 20150823 01:13:06< shadowm> The WML API can be and is used by Lua. 20150823 01:13:35< celticminstrel> In that case though, simply updating the EffectWML page would be sufficient, right? 20150823 01:13:47< shadowm> Yes. 20150823 01:14:11< shadowm> There's also the unstore_unit and animation WML addition of female_text, though. 20150823 01:14:30< shadowm> (And male_text, IIRC.) 20150823 01:14:57< shadowm> This isn't a magic new function, vultraz. 20150823 01:15:16< shadowm> This is literally gui2::twindow::keyboard_capture(). 20150823 01:15:21< celticminstrel> Yeah. 20150823 01:15:45< celticminstrel> It was animate_unit, to be specific. 20150823 01:15:53< celticminstrel> Calling an animation, not defining one. 20150823 01:16:17< shadowm> celticminstrel: Oh, not animation WML then. 20150823 01:16:19< celticminstrel> Would current_player be empty in a single-player game? 20150823 01:16:41 * shadowm doesn't know. 20150823 01:18:14-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150823 01:24:43-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has joined #wesnoth-dev 20150823 01:28:19< celticminstrel> Okay, this should omit hidden sides and always get a nice name, even if it's "Anonymous Player". 20150823 01:28:31< celticminstrel> I'm not quite sure if that last code path will ever be reached, though. 20150823 01:28:43< celticminstrel> I'll test it in the tutorial. 20150823 01:29:12-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev 20150823 01:29:12-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host] 20150823 01:29:12-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150823 01:33:46< celticminstrel> Should I add new things to the wiki asap or wait until they're in a tagged release? 20150823 01:33:57< celticminstrel> eg 1.13.2 in this case. 20150823 01:34:36< shadowm> New things should be documented (ideally) as soon as they are pushed to master, otherwise we get undocumented features like jamming/vision . 20150823 01:34:48< celticminstrel> Vision is documented, only jamming is missing. 20150823 01:35:00< shadowm> Like jamming, accuarcy, and parry. 20150823 01:35:43< shadowm> Ideally people should operate under the assumption that nothing guarantees they won't be hit by a truck before release. 20150823 01:36:16< celticminstrel> Okay, now when I view the label settings dialog in the tutorial, I get a red "Konrad" and a white "Team Labels". This is the case even if I select Li'sar instead of Konrad. 20150823 01:36:58< shadowm> I believe that selecting Li'sar will also display Konrad when hovering on the side flag on the top bar too. 20150823 01:37:34< shadowm> Okay, no, it just displays "human_player" nowadays, which isn't that much better. 20150823 01:37:36< celticminstrel> I see human_player when doing that. 20150823 01:37:39< celticminstrel> Yeah. 20150823 01:38:09< celticminstrel> So team 2 and 3 are hidden and thus omitted from the dialog, I guess? 20150823 01:38:12< celticminstrel> Are they hidden? 20150823 01:38:42< shadowm> Yep, it turns out that's what the WML says. 20150823 01:39:03< celticminstrel> Oh, I see, the empty ones you saw before were only those ones, because they don't have a name or a current_player. 20150823 01:39:31< celticminstrel> I see they don't have a user_team_name either, so if they weren't hidden they'd now show up as "Side 2 (Anonymous Player)". 20150823 01:40:01< celticminstrel> 'kay, in any case, this appears to work. 20150823 01:48:04-!- Appleman1234 [~Appleman1@KD036010134068.au-net.ne.jp] has quit [Quit: Leaving] 20150823 01:48:52-!- Appleman1234 [~Appleman1@KD036010134068.au-net.ne.jp] has joined #wesnoth-dev 20150823 02:07:50< irker850> wesnoth: Ignacio R. Morelle wesnoth:master b4de73f83b28 / / (4 files in 2 dirs): Add wesnoth.set_dialog_visible function http://git.io/vswwy 20150823 02:11:01< shadowm> If someone else can think of another Lua GUI2 addition they want to see in 1.13.2, before I switch to another task... 20150823 02:11:19< celticminstrel> You should ask aeth 20150823 02:11:44< celticminstrel> Actually, I think he wanted a way to set a text field active when the dialog is shown... 20150823 02:11:50< celticminstrel> Something like that. 20150823 02:12:23< shadowm> 22:12:57 wesnoth: Ignacio R. Morelle wesnoth:master ba6257129ab7 / / (4 files in 2 dirs): Add wesnoth.set_dialog_focus function http://git.io/vswEq 20150823 02:12:34< celticminstrel> Ahh, missed that. 20150823 02:12:58< shadowm> I don't believe he'll be particularly interested in this stuff seeing as how he targets 1.12.x. 20150823 02:13:16< celticminstrel> I don't see why he wouldn't be interested in it even if he targets 1.12.x. 20150823 02:24:11< aeth> celticminstrel: yes, that's what it was 20150823 02:24:46< celticminstrel> So there wasn't anything else, I gues? 20150823 02:24:48< celticminstrel> ^+s 20150823 02:24:56< aeth> shadowm: I think another thing most people complain about is that double clicking on a menu item doesn't work to automatically OK and select that item. 20150823 02:24:59< aeth> In a list 20150823 02:25:05< aeth> Like in [message] [option] 20150823 02:25:10< celticminstrel> Ah, right, I think I brought that up too. 20150823 02:25:27< aeth> Basically, anything that [message] can do that Lua dialogs can't do is something that the users very quickly notice 20150823 02:25:42< celticminstrel> I imagine that'd have to be coded into the dialog somehow, since you don't always want double-clicking a list item to auto-OK, it would depend on the dialogs. 20150823 02:25:54< aeth> right 20150823 02:26:08< celticminstrel> I have no idea how you handle GUI2 events from Lua. 20150823 02:26:18< aeth> very carefully 20150823 02:26:27< aeth> You have to have a function in a function in a function 20150823 02:26:31< aeth> among other strange things 20150823 02:28:05< celticminstrel> o.O 20150823 02:28:11< aeth> You need a function that wraps the MP-safe data passing, and then a function that the MP-safe data passing calls. 20150823 02:28:39< aeth> celticminstrel: so basically the non-dialog stuff in the code example of http://wiki.wesnoth.org/LuaWML:Display#wesnoth.show_dialog needs to be wrapped in two functions 20150823 02:29:26< aeth> Thiking about it now, I might be able to put the functions themselves at the top level of the function to avoid the function-in-function-in-function stuff 20150823 02:29:45< celticminstrel> So the functions don't rely on closure, then? 20150823 02:29:50< aeth> celticminstrel: You do have to have at least one layer of function-in-function, though so that you can actually take in arguments since afaik all the callbacks need to be functions with 0 args 20150823 02:30:11< aeth> It's similar to a closure but different. 20150823 02:30:32< celticminstrel> The example does have function-in-function. 20150823 02:30:53< celticminstrel> So how do you know what kind of event occurred? 20150823 02:30:55< aeth> celticminstrel: you need to add two more layers of functions on top of that 20150823 02:31:21< aeth> celticminstrel: You put all of that stuff within a function foo that wesnoth.synchronize_choice(foo) calls 20150823 02:31:37< aeth> celticminstrel: and all of that goes within a function so that you can reuse the code to do more than one thing given that all of these callbacks can't take arguments. 20150823 02:32:11< aeth> If you're doing single player you can skip the wesnoth.synchronize_choice step, afaik 20150823 02:33:20< aeth> I *think* you might be able to un-layer some of these deep nested layers of functions, but testing it requires OOS testing so I'll have to test it. 20150823 02:35:23< aeth> If this was done with closures instead I guess you'd return the callback function, and then feed that into wesnoth.synchronize_choice. I'm not sure how that would actually flatten this, though. 20150823 02:35:53< aeth> oh, I guess you'd use this to cut exactly one layer of nested functions, hmm 20150823 02:37:33< shadowm> aeth: "double clicking on a menu item doesn't work to automatically OK and select that item" It does if you set return_value_id = "ok" for the row's toggle_panel. 20150823 02:37:38< aeth> I'm not sure if that would be better or worse. The complexity would be approximately the same, you would just be moving the safe_dialog() (as I called it) function outside of the gui2 dialog function, and having it return a function that wesnoth.synchronize_choice uses. 20150823 02:38:00< shadowm> I didn't read the rest because it wasn't specifically addressed at me and seemed to be theorical stuff. 20150823 02:39:26< aeth> shadowm: I don't think the OK thing is in the documentation 20150823 02:39:55< shadowm> I imagine. 20150823 02:40:30< shadowm> Except it is: http://wiki.wesnoth.org/GUIWidgetInstanceWML#Toggle_panel 20150823 02:40:46< aeth> return_value_id is 20150823 02:40:51< shadowm> Also here: http://wiki.wesnoth.org/GUIWidgetInstanceWML#Button 20150823 02:41:01< shadowm> I said return_value_id, yes. 20150823 02:41:20< aeth> return_value_id is in the documentation, "ok" is not. 20150823 02:42:25< shadowm> It's the kind of thing that's best taken from existing code, yes, like everything else involving either flavor of GUI2. 20150823 02:42:52< aeth> except mainline doesn't use Lua GUI2 afaik 20150823 02:43:24< shadowm> Either flavor = vanilla GUI2 or Lua GUI2. 20150823 02:45:12< shadowm> Optional nitpicking: https://github.com/wesnoth/wesnoth/blob/master/data/campaigns/tutorial/lua/character_selection.lua 20150823 02:45:51< shadowm> (Not my idea, but I'm not about to go and rain on vultraz's parade.) 20150823 02:46:49< aeth> that's... not even the proper way to do it 20150823 02:47:01< aeth> I guess it might be ok if it's the only Lua dialog in the scenario 20150823 02:47:19< shadowm> It's missing a synchronize_choice yes. 20150823 02:47:29< shadowm> I planned to work on that after converting it to use a horizontal listbox. 20150823 02:47:37< aeth> also it makes the dialog local to the function, which doesn't need to be the case 20150823 02:47:59< aeth> If you make the dialog global or generated via its own function, you can reuse the common boiler plate multiple times, e.g. the whole T.helptip and T.tooltip 20150823 02:48:15< aeth> Although it doesn't really matter if it's the only one in the scenario 20150823 02:48:22< shadowm> The tag callbck is "its own function" as far as I'm concerned. 20150823 02:49:01< aeth> no, what I mean is local character_selection_dialog can become local function dialog(...) 20150823 02:49:01< shadowm> I get what you are trying to say, but I don't believe it's needed here. It's only ever executed once. 20150823 02:49:06< aeth> And then you can reuse the code 20150823 02:49:08< aeth> right 20150823 02:49:21< aeth> It's not a particularly useful model for Lua dialog code then, though 20150823 02:53:51< aeth> I should clean up my gui2.lua file so I can link it here, it would probably be easier that way 20150823 02:54:22< aeth> currently it runs, and that's about all :-p 20150823 02:55:16< aeth> shadowm: Is there a reason why mainline uses C++ hardcoded to give meaning to the dialog instead of Lua? Is that because Lua doesn't run in the menus outside of an active game? 20150823 02:56:07< aeth> Wesnoth's code could probably be cleaned up a bit if there was Lua running in the main menu. 20150823 02:56:15< shadowm> It's because Lua support did not exist when GUI2 first landed in mainline, and the Lua GUI2 API was added as an unsupported hack without the approval of the GUI2 author and maintainer. 20150823 02:56:22< aeth> ah 20150823 02:56:39< shadowm> I believe you of all people present here should know that we didn't always have Lua. 20150823 02:56:44< aeth> Yes. 20150823 02:56:59< aeth> But I thought they arrived at the same time, GUI2 and Lua. I guess I was wrong. 20150823 02:57:00< shadowm> GUI2 first landed in 1.5.x along with the new [message] UI. 20150823 02:57:10< aeth> ah, I didn't know the new [message] UI was GUI2. 20150823 02:57:19< shadowm> Lua landed in 1.7.0. 20150823 02:57:23< aeth> I assumed at some point it was re-implemented in GUI2. 20150823 02:58:03< shadowm> And the Lua GUI2 API landed in 1.9.0 or later. 20150823 02:58:27< shadowm> It also became the source of some political tension. 20150823 02:58:28< aeth> 1.9 was the first time I was using Lua because 1.8 Lua support wasn't that good iirc. 20150823 02:59:09< aeth> I'm not sure if I was active in Wesnoth for 1.5, which is why I probably confused 1.5 and 1.7 features. 20150823 02:59:17< aeth> I was not active circa mid 2008 to mid 2009 iirc 20150823 02:59:34< shadowm> I remember otherwise. 20150823 03:00:35< aeth> Aethaeryn's Maps changelog is silent between 26 April 2008 and 20 July 2009, that's all I have to go off of. 20150823 03:00:52< aeth> 1 release, simultaneously on 1.4.1 and 1.5, and then no releases until 1.6.4 20150823 03:01:37< shadowm> > r828 | aethaeryn | 2008-07-27 20:10:03 -0400 (Sun, 27 Jul 2008) | 1 line 20150823 03:01:40< shadowm> > updating unit tree slightly 20150823 03:02:22< shadowm> You weren't constantly active, certainly, but there is one update suggesting that you were around in some form. 20150823 03:02:31< aeth> barely 20150823 03:02:42< aeth> And that's still before the school year. 20150823 03:02:45-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150823 03:02:50< shadowm> And that's a commit from TE, not AM. 20150823 03:03:00< aeth> I do not think I played Wesnoth often during my freshman year at college, if at all 20150823 03:03:05< aeth> When I lived on campus 20150823 03:03:20-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has joined #wesnoth-dev 20150823 03:03:36< shadowm> Meanwhile, 1.5.0 was released at the end of April 2008. 20150823 03:03:41< aeth> In the northern hemisphere, the school year is usually late August or early September into May or June. 20150823 03:04:14< aeth> yes, the only release of Aethaeryn's Maps documented in the changelog is 1.5.0 on 26 April 20150823 03:04:23< shadowm> Then some activity again on June 2009, after 1.7.0 was released. 20150823 03:04:41< aeth> right, after the spring semester ended. 20150823 03:05:20< aeth> https://github.com/Aethaeryn/wesnoth-umc/blob/master/Aethaeryns_Maps/changelog 20150823 03:06:42< celticminstrel> Oh yeah, I noticed the tutorial no longer had a message popup to choose your character. 20150823 03:06:52< aeth> My wiki account's contributions go into 13 July 2008 and then 2 contribs in 7 September are the only within the time period I'm talkinga bout 20150823 03:07:04< aeth> *talking about 20150823 03:09:11< celticminstrel> Okay, so the [unit] tag... 20150823 03:09:44< celticminstrel> ...seems to be implemented in C++... 20150823 03:10:06< aeth> celticminstrel: Most things are probably implemented in C++ if they are outside of game events 20150823 03:10:10< celticminstrel> ...what directory was that in again... I remember the filename was action_wml.cpp 20150823 03:10:34< celticminstrel> aeth: I'm referring to [unit] ActionWML. Though I guess it's also valid in [side]... 20150823 03:10:59< celticminstrel> Ah, game_events. 20150823 03:11:38< shadowm> Most of the details are part of the unit class ctor though. 20150823 03:11:46< shadowm> (src/unit.?pp.) 20150823 03:12:33< celticminstrel> action_wml.cpp led me to unit_creator::add_unit, but I wouldn't be surprised if it eventually gets me to unit.cpp. 20150823 03:12:56< celticminstrel> Ah, yup, constructor call. 20150823 03:15:29-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150823 03:16:00< celticminstrel> Hmm. It brings me right back to unit::add_modification. 20150823 03:19:07< celticminstrel> The modifications are copied verbatim from the input config in the unit constructor, and nowhere does it actually make any check for modification type. To add a WML error if someone uses [modifications][advance], I'd need to do an extra check somewhere, maybe in the constructor? But that might just keep giving the warning whenever you load a saved game? 20150823 03:20:05-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150823 03:20:21< shadowm> Something has to read those mods, right? 20150823 03:20:46< celticminstrel> Yeah, they're read in apply_modification where it loops through the list of possible modification types. 20150823 03:20:51< celticminstrel> ^+s() 20150823 03:21:21< shadowm> That meaning "advancement", "advance", "object", and "trait", right? 20150823 03:21:25< celticminstrel> Yes. 20150823 03:21:44< shadowm> So... warn if it finds any [advance] nodes? 20150823 03:23:09< celticminstrel> Does ERR_CONFIG just write to the log, or will it show up to the player? 20150823 03:23:22< celticminstrel> Well, I suppose I can try it and see. 20150823 03:23:56< shadowm> Log only. 20150823 03:24:33< shadowm> celticminstrel: You should write to lg::wml_error instead. 20150823 03:24:43< celticminstrel> What about ERR_LUA? 20150823 03:25:08< shadowm> Log only too. 20150823 03:25:31< celticminstrel> But that's what the commit you linked me did... hmm... 20150823 03:25:36< shadowm> lg::wml_error has the special property of being displayed in the game chat as soon as it becomes available. 20150823 03:26:03< shadowm> If you search for mentions of it you'll notice that a number of deprecated syntax handlers use it. 20150823 03:26:55-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20150823 03:27:20< shadowm> celticminstrel: When I linked that commit I didn't remember that wml_error existed because I haven't used it in years. 20150823 03:27:30< celticminstrel> Ah. 20150823 03:27:35< shadowm> I would imagine that the author wasn't aware of it either. 20150823 03:27:52< celticminstrel> So it's okay to use it for Lua things too? 20150823 03:28:16 * celticminstrel is currently testing with a [side][modifications][advance]. 20150823 03:29:30< shadowm> I would expect yes, since it's part of the implementation of Lua function calls. 20150823 03:33:07< shadowm> The worst case scenario is that the message is never read, which would only happen if you never reach the in-game UI or something makes it quit. There is an automatic poll point in the game events manager implementation where lg::wml_error's contents are dumped. 20150823 03:33:30< shadowm> *dumped to the UI. 20150823 03:35:19< celticminstrel> The code path is triggered during the loading phase (I added a temporary write to std::cout to verify that), but I'm not seeing the error show up in-game... 20150823 03:35:51 * celticminstrel tries adding \n 20150823 03:38:46< celticminstrel> That did it. 20150823 03:39:19 * Aginor twiddles thumbs and is building the game for OSX 20150823 03:39:39< Aginor> my old laptop is sooooo slow compared to something less ancient 20150823 03:40:01< celticminstrel> My computer's pretty slow too. 20150823 03:46:38 * shadowm facekeyboards. 20150823 03:46:42< shadowm> I hate this wiki. 20150823 03:49:05< shadowm> Okay, added the documentation I had to add: http://wiki.wesnoth.org/LuaWML:Display#wesnoth.set_dialog_focus 20150823 03:49:27< celticminstrel> Oh right, I need to do this too. 20150823 03:49:47< celticminstrel> And then quit-confirm. 20150823 03:51:37< shadowm> "Basic styling (light gray background, borders, padding and align left) can be achieved by adding class="wikitable"." 20150823 03:51:47 * shadowm grits teeth. 20150823 03:51:57< shadowm> Why is this not the default, MediaWiki, WHY??? 20150823 03:55:08< Aginor> graaaah 20150823 03:55:13< Aginor> linker error! 20150823 03:58:08< Aginor> hmm 20150823 03:58:12< Aginor> but only with cmake 20150823 03:58:25 * Aginor is suspicious 20150823 03:58:36< Aginor> I don't think anyone has tested cmake on os x for a long time 20150823 03:58:41< aeth> shadowm: probably because MediaWiki is very, very ancient. 20150823 03:58:56< aeth> (for the web, at least) 20150823 04:00:06< celticminstrel> Also someone should document jamming on the wiki. 20150823 04:00:31-!- BeoXTC_ [3eb2b12a@gateway/web/cgi-irc/kiwiirc.com/ip.62.178.177.42] has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client] 20150823 04:17:39< celticminstrel> Uh. I think I lost a commit during rebase... 20150823 04:20:45-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has quit [Ping timeout: 240 seconds] 20150823 04:22:36< celticminstrel> shadowm: I just pushed one more commit to the effects branch. https://github.com/CelticMinstrel/wesnoth/commit/1870cf35cd38abdc3f11aef7a0b077eeab7ac85b 20150823 04:22:54< celticminstrel> It was there before, but somehow got lost when I was rebasing the style fixes in. 20150823 04:23:00< celticminstrel> Should I open a new pull request? 20150823 04:25:00-!- lunatico [~lunatico@187.193.64.100] has joined #wesnoth-dev 20150823 04:26:15-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has joined #wesnoth-dev 20150823 04:54:14-!- Kwandulin [~Miranda@p5B00880A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150823 05:06:12< aeth> celticminstrel: you were right, a closure works better 20150823 05:06:40< aeth> The closure basically adds an anonymous button press function, and wraps around choice. 20150823 05:06:45< aeth> Maybe I should update the wiki 20150823 05:07:28< celticminstrel> If you think you should update the wiki, you probably should! 20150823 05:08:18-!- irker850 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20150823 05:09:45< aeth> celticminstrel: https://github.com/Aethaeryn/wesnoth-umc/blob/979b4b328d7da3735203e12ab64dffec708dedf2/Aethaeryns_Mod/lua/gui2.lua#L66-L89 20150823 05:11:18< aeth> You just pass in a dialog WML table, a preshow function, and any custom variables that postshow might rely on. Then it returns a function that returns a WML table containing the choice, if the choice is made. Otherwise, the table is false (so you can handle it). 20150823 05:13:19-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has joined #wesnoth-dev 20150823 05:13:21< celticminstrel> I see. 20150823 05:14:56< aeth> I don't think there is any way to further clean that part up given the constraints of postshow() having to modify rather than return a variable, and the return having to be some WML table 20150823 05:15:14< aeth> (Nothing else in gui2.lua has been cleaned up yet.) 20150823 05:21:38< shadowm> celticminstrel: Yes, sure. 20150823 05:23:12< celticminstrel> 'kay, done. 20150823 05:29:29-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:32:14-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Max SendQ exceeded] 20150823 05:33:18-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:34:14-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Max SendQ exceeded] 20150823 05:34:18< aeth> shadowm: One issue I noticed is with wesnoth.message. It never goes to the chat log, which makes sense most of the time, but some of the time it doesn't make sense. 20150823 05:34:51< aeth> shadowm: I have a thing where units speak, but it's too easy to dismiss [messages] so people miss dialog, so I made it also speak to chat. But it's not in chat log when it speaks to chat because it uses wesnoth.message 20150823 05:36:34-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150823 05:38:02-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:38:31-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has joined #wesnoth-dev 20150823 05:42:59-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 265 seconds] 20150823 05:46:11-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:48:53-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:50:13-!- sailors__ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:50:45-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 244 seconds] 20150823 05:51:53-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:53:24-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Read error: Connection reset by peer] 20150823 05:54:45-!- sailors__ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Read error: Connection reset by peer] 20150823 05:54:49-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 05:56:24-!- irker535 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150823 05:56:24< irker535> wesnoth: Celtic Minstrel wesnoth:master 1870cf35cd38 / src/unit.cpp: Enhance [effect]apply_to=new_advancement with respect to AMLAs http://git.io/vswN4 20150823 05:56:24< irker535> wesnoth: Charles Dang wesnoth:master 4464a05bb50e / src/unit.cpp: Merge pull request #472 from CelticMinstrel/effect_apply_to http://git.io/vswNB 20150823 05:58:30-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 244 seconds] 20150823 05:58:40-!- Cheshyre [48c957d5@gateway/web/freenode/ip.72.201.87.213] has joined #wesnoth-dev 20150823 06:01:46< vultraz> I wish I could figure out why the window icon looks so garbled 20150823 06:05:48< vultraz> celticminstrel: I feel stupid, where is this label settings dialog? xD 20150823 06:05:55< celticminstrel> Actions menu. 20150823 06:06:50-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 06:07:25-!- Cheshyre [48c957d5@gateway/web/freenode/ip.72.201.87.213] has quit [Quit: Page closed] 20150823 06:08:29< vultraz> celticminstrel: you opted for just the name? 20150823 06:09:33< celticminstrel> ...oh wait. 20150823 06:09:45< celticminstrel> It should say "Side 1 (name)"... 20150823 06:09:59-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20150823 06:10:20< vultraz> celticminstrel: definitely 20150823 06:10:33< vultraz> without a leader, and if it's not hidden, you get the internal save_di 20150823 06:10:35< vultraz> id* 20150823 06:10:41-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 256 seconds] 20150823 06:11:01< shadowm> celticminstrel: https://github.com/wesnoth/wesnoth/pull/471/files#diff-c8294137f861ca19c700eed63d89c86fR64 -- Could you explain this to me? 20150823 06:11:36< celticminstrel> That last line should be assigning display_name to the map instead of team_name. 20150823 06:11:47-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20150823 06:12:02< celticminstrel> The idea there is to try a few things to get a displayable name and if that fails, fallback to "Anonymous Player". 20150823 06:12:28< celticminstrel> Then display it as "Side %d (%s)". 20150823 06:12:29< shadowm> Yes, but I'm concerned about this printf-style string I'm seeing along with a suspicious basic_string::replace call. 20150823 06:12:37< vultraz> Better than "save_id_1440310200_3" :P 20150823 06:13:01< shadowm> What happens if a translator translates that as "Bando %d (%s)"? 20150823 06:13:13< shadowm> (Spanish.) 20150823 06:13:25< celticminstrel> Ah, right, good point. Should use a find call instead of 5. 20150823 06:13:36< shadowm> No, you should use vgettext. :p 20150823 06:13:51< celticminstrel> Okay, how do I do that? 20150823 06:14:34< shadowm> First, you need to format your string the same way you would in WML to use variable interpolation, e.g. "Side $side_number ($text)". 20150823 06:14:42-!- Kwandulin [~Miranda@p5B00880A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150823 06:15:49< shadowm> Then pass that string along with a string_map containing the substitutions to the vgettext() function (see src/formula_string_utils.hpp for the declaration). 20150823 06:16:11< shadowm> Again, src/addon/manager_ui.cpp contains a few usage examples. 20150823 06:16:33< irker535> wesnoth: Charles Dang wesnoth:master fc6d6b7e7dee / data/gui/default/window/editor_edit_label.cfg: teditor_edit_label: removed erroneous extra border http://git.io/vswxn 20150823 06:16:36< shadowm> The format syntax is literally WML variable interpolation. 20150823 06:22:04-!- Appleman1234 [~Appleman1@KD036010134068.au-net.ne.jp] has quit [Ping timeout: 260 seconds] 20150823 06:24:44-!- lunatico [~lunatico@187.193.64.100] has quit [Quit: leaving] 20150823 06:29:17-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150823 06:34:33-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150823 06:37:26-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 250 seconds] 20150823 06:37:26-!- wedge010 is now known as wedge009 20150823 06:45:56-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Quit: My Mac has gone to sleep. ZZZzzz…] 20150823 06:48:51-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 06:53:47-!- Xara [Yangyf@2001:cc0:2020:4010:85e1:cb42:919b:caf3] has joined #wesnoth-dev 20150823 07:11:13< irker535> wesnoth: Charles Dang wesnoth:master b5e853043331 / data/gui/default/window/label_settings.cfg: tlabel_settings: cleaned up code and dialog layout http://git.io/vsrvI 20150823 07:19:08-!- celticminstrel is now known as celmin|sleep 20150823 07:19:11-!- Appleman1234 [~Appleman1@KD036010143199.au-net.ne.jp] has joined #wesnoth-dev 20150823 07:19:27< irker535> wesnoth: Charles Dang wesnoth:master 612d0b232fa6 / data/gui/default/window/editor_generate_map.cfg: teditor_generate_map: removed erroneous extra border http://git.io/vsrv9 20150823 07:20:55 * vultraz assumes janitor hat 20150823 07:28:21-!- [Relic] [~Relic]@2602:306:33a3:6d30:55dd:ca61:52b5:798b] has quit [Quit: I press the magic X and all the weirdos go away!] 20150823 07:42:39-!- Kwandulin [~Miranda@p5B00880A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150823 08:00:34< irker535> wesnoth: Ignacio R. Morelle wesnoth:master e43a4a3ebdb9 / src/desktop/version.cpp: desktop: Handle versions of lsb_release that wrap -s output in quotes http://git.io/vsrT2 20150823 08:25:11-!- ancestral [~ancestral@75-161-229-81.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150823 08:28:50-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Quit: My Mac has gone to sleep. ZZZzzz…] 20150823 08:29:12-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 08:32:12-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 255 seconds] 20150823 08:33:38-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 260 seconds] 20150823 08:39:51< Aginor> 20:32 < Aginor> shadowm: I have managed to reproduce your blending bug on osx 20150823 08:39:54< Aginor> 20:32 < Aginor> this means I can fix it 20150823 08:39:56< Aginor> 20:32 < Aginor> (SDL2) 20150823 08:39:59< Aginor> 20:34 < Aginor> I have also verified that the hotkeyrewrite works under SDL2 20150823 08:40:02< Aginor> 20:35 < Aginor> I have also verified that the hotkeyrewrite works under OSX 20150823 08:40:04< Aginor> 20:35 -!- salluc69 [~lucky@host74-168-dynamic.16-79-r.retail.telecomitalia.it] 20150823 08:40:07< Aginor> has joined #wesnoth 20150823 08:40:10< Aginor> 20:37 < Aginor> shadowm: I've tested and verified 20150823 08:40:12< Aginor> https://github.com/wesnoth/wesnoth/pull/466 on Linux and OSX, 20150823 08:40:15< Aginor> wedge009 on Windows. I think it is ready to be reviewed and 20150823 08:40:18< Aginor> merged if it passes review 20150823 08:40:21< Aginor> that turned horrible, sorry 20150823 08:40:57-!- mjs-de [~mjs-de@f049244165.adsl.alicedsl.de] has joined #wesnoth-dev 20150823 08:51:24-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150823 08:53:04-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 250 seconds] 20150823 08:53:04-!- wedge010 is now known as wedge009 20150823 08:53:28< Ivanovic> hi folks 20150823 08:53:44< Ivanovic> i am currently not able to build trunk due to a warning about an old cast being used 20150823 08:54:10< Ivanovic> http://pastebin.com/vPeyYjYb 20150823 08:54:21< Ivanovic> another "warning treated as error" that we should turn off? 20150823 08:55:03< Ivanovic> gcc (Gentoo 4.9.3 p1.2, pie-0.6.2) 4.9.3 20150823 08:55:05< Ivanovic> and cmake 20150823 08:59:20< Ivanovic> i mean switching this one to a normal C++ cast is not problem, so the question is if this one was intentional 20150823 09:00:53< shadowm> No, we actually want that warning, it's just annoying that the CMake recipe has warnings that SCons does not. 20150823 09:01:46< shadowm> Aginor: Okay, but I doubt I'll get to it today. 20150823 09:02:19< Aginor> shadowm: that's fine 20150823 09:02:41< shadowm> You said you've done kernel work, Linux kernel I assume? How come your patches have non-conforming commit messages then? :p 20150823 09:02:41< Aginor> shadowm: I just wanted to give you a status update 20150823 09:03:05< Aginor> shadowm: it's complicated 20150823 09:03:37< Aginor> shadowm: none of my code has currently been submitted to the kernel :D 20150823 09:03:50< Aginor> for business reasons 20150823 09:04:07< Aginor> besides, what's the wesnoth commit message standard? 20150823 09:04:27< shadowm> http://wiki.wesnoth.org/DeveloperGuide#Commit_messages 20150823 09:04:55< Aginor> ok, I missed the 72 character thing 20150823 09:04:55< shadowm> And the subject shouldn't have a trailing stop, I forgot to add that there. 20150823 09:05:08< Aginor> want me to to fixup my commit messages? 20150823 09:05:57< irker535> wesnoth: Nils Kneuper wesnoth:master c51c9131562b / src/ (scripting/game_lua_kernel.cpp widgets/multimenu.cpp): converted some old C style casts to new c++ style casts http://git.io/vsrYg 20150823 09:06:06< Ivanovic> shadowm: okay, I fixed those casts to be C++ casts 20150823 09:06:25< Ivanovic> shadowm: and if scons does not provide those warnings, something is really strange with scons 20150823 09:06:37< shadowm> Thanks. 20150823 09:06:41< Ivanovic> since those clearly are old style casts and gcc should output the warning in case that type is set to on 20150823 09:06:43< Ivanovic> ;) 20150823 09:07:10< shadowm> Aginor: It's mostly just a thing to keep in mind in the future, but if you want to do that... *shrug* 20150823 09:07:31< Aginor> shadowm: fair enough, I'll make a better job of conforming 20150823 09:08:03< vultraz> ugh.. chrome is now broken regarding #-point URLs :| 20150823 09:08:03< Aginor> I've got some other stuff to deal with tonight, I might get to it later 20150823 09:08:22< vultraz> Or something is 20150823 09:08:30< vultraz> I can't open them from CZ properly anymore 20150823 09:09:18< shadowm> loonycyborg: Perhaps you could figure out how to add the compiler warning flags our CMake recipe uses to the SCons recipe? The CMake recipe seems to make sure the compiler supports them before enabling them. 20150823 09:09:35< Aginor> Ivanovic: any special settings when compiling? It's warning free for me here 20150823 09:09:57< Aginor> (cmake + gcc 5.1.1) 20150823 09:10:01< shadowm> Otherwise I could go and add them to travis at least, but I'd rather have everyone on SCons get the same warnings so they aren't caught by surprise by CI build errors. 20150823 09:12:24< loonycyborg> shadowm: what flags exactly? 20150823 09:12:55< shadowm> Every flag checked with check_compiler_has_flag in /CMakeLists.txt. 20150823 09:13:31< Ivanovic> Aginor: i fixed it now 20150823 09:13:36< Ivanovic> Aginor: and no really special settings 20150823 09:14:53< Ivanovic> http://pastebin.com/gZN7DDf1 20150823 09:15:51< shadowm> loonycyborg: Actually, only -Wold-style-cast it seems. The rest seem to be explicitly disabled rather than enabled. 20150823 09:16:07< shadowm> Love whoever wrote this macro. 20150823 09:16:36< Ivanovic> git blame will tell you 20150823 09:16:37< Ivanovic> ;) 20150823 09:16:48< shadowm> There is also the pedantic build flag set but SCons doesn't have a pedantic build option yet and I'm not sure I want to go down that rabbit hole yet. 20150823 09:16:53< Ivanovic> ehm, i meant, git praise 20150823 09:17:01< shadowm> Or ever, really. 20150823 09:17:52< loonycyborg> I can just make scons pass -Wold-style-cast, not sure if check for it is even needed 20150823 09:18:29< loonycyborg> because gcc ignores -W flags it doesn't know iirc 20150823 09:18:50< Aginor> -Wall? 20150823 09:19:20< Ivanovic> loonycyborg: there is more than just gcc out there 20150823 09:19:22< shadowm> We build with clang too. 20150823 09:19:27< Ivanovic> how does clang behave? 20150823 09:19:32< Ivanovic> ;) 20150823 09:19:44< loonycyborg> pretty sure it would emulate gcc behavior in this case 20150823 09:19:47< Aginor> Ivanovic: like gcc :D 20150823 09:24:11< loonycyborg> shadowm: but should -Wold-style-cast be strict mode or it should be always passed? 20150823 09:25:56< shadowm> The difference is hardly relevant since we won't ship versions that don't pass SCons builds in strict mode, and without strict mode the warning doesn't hurt anything. 20150823 09:28:18< loonycyborg> in strict mode scons passes only extra options -Werror and -Wno-unused-local-typedefs, to disable some warning we apparently don't wanna fix 20150823 09:45:05-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Remote host closed the connection] 20150823 09:51:00-!- travis-ci [~travis-ci@ec2-54-157-207-181.compute-1.amazonaws.com] has joined #wesnoth-dev 20150823 09:51:01< travis-ci> wesnoth/wesnoth#7179 (master - c51c913 : Nils Kneuper): The build was broken. 20150823 09:51:01< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/76837569 20150823 09:51:01-!- travis-ci [~travis-ci@ec2-54-157-207-181.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150823 09:55:46< loonycyborg> wow broken builds so rare. Mostly they're just errored 20150823 09:57:02< loonycyborg> it seems some tests failed on one of compiler configurations 20150823 09:57:26< Aginor> timeout 20150823 10:00:21-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20150823 10:12:27-!- gfgtdf [~chatzilla@x55b1a5e0.dyn.telefonica.de] has joined #wesnoth-dev 20150823 10:13:26< gfgtdf> the changelog says something about apply_to=attacks_left which i cannot find in the code 20150823 10:13:58-!- pydsigner [~pydsigner@unaffiliated/pydsigner] has quit [Ping timeout: 260 seconds] 20150823 10:15:09-!- pydsigner [~pydsigner@unaffiliated/pydsigner] has joined #wesnoth-dev 20150823 10:36:02< vultraz> gfgtdf: around? 20150823 10:36:09< gfgtdf> vultraz: y 20150823 10:38:11< vultraz> gfgtdf: I noticed wesnoth crashes if there's a wml error in a mainline campaign. for some reason, it runs the preprocessor 3 times, hits the error each time, and then crashes silently the third time 20150823 10:38:59< vultraz> I don't know why it loops three times before crashing 20150823 10:39:13< gfgtdf> vultraz: maybe it just pronts teh erorrmessage 3 times ? 20150823 10:39:14< vultraz> Also don't know why an addon WML error doesn't cause a crash 20150823 10:39:44< vultraz> gfgtdf: it goes through the loading process 3 times. the bar repeats. 20150823 10:40:20< Aginor> vultraz: have you looked at what happens when the error is thrown and how the error is handled? 20150823 10:40:45< Aginor> if you have the error message you should be able to trace through the source quite easily 20150823 10:41:05< vultraz> well the error message is the WML error 20150823 10:41:31< vultraz> that should just abort loading and return to the titlescreen 20150823 10:41:47< vultraz> instead it refreshes the cache and does it two more times :/ 20150823 10:42:26< vultraz> (how do I know it refreshes the cache? if you go into the WML and fix the problem before clicking past the error message, the preproc will pass next cycle) 20150823 10:44:02< vultraz> The final crash is silent 20150823 10:44:04< gfgtdf> vultraz: i don really know how it works, when you start a game/editor/mp_select then this function is called https://github.com/wesnoth/wesnoth/blob/master/src/game_config_manager.cpp#L120 20150823 10:44:20< gfgtdf> vultraz: i never had to looks into its detail that much 20150823 10:45:29< vultraz> Hmmm 20150823 10:45:46< gfgtdf> vultraz: it seems like when it fails to load the mainline cfg files that it then tried to rload the gameconfig but with deisbled addons 20150823 10:45:58< gfgtdf> vultraz: so we have at least 2 reloads 20150823 10:46:06< gfgtdf> vultraz: idk where teh third comes from 20150823 10:46:30< vultraz> Actually maybe I was unclear 20150823 10:46:40< vultraz> The first load is when you start the campaign 20150823 10:46:51< vultraz> Then the second and third would be those two reloads 20150823 10:47:37< gfgtdf> vultraz: yes i was unclarear i mena 1 load then then 2 reload so 2 loads is what i see from looking tat the cod 20150823 10:47:43< vultraz> Hmm 20150823 10:47:50< vultraz> Well either way that doesn't make sense 20150823 10:48:03< vultraz> If there's an error in mainline why would it try again without addons? 20150823 10:48:19< vultraz> IMO 20150823 10:48:29< vultraz> If there's a mainline error it should drop back to titlescreen 20150823 10:48:36< gfgtdf> vultraz: i think that code mqaybe handles failures from mainline and from adon errors 20150823 10:49:00< gfgtdf> vultraz: so that it makes sense when it error comes from an addon (which is lilekey) 20150823 10:49:04< gfgtdf> vultraz: but im not sure 20150823 10:49:17< gfgtdf> vultraz: its also apossible that addon errors are handled eariler 20150823 10:52:07< vultraz> Looks like the Unknown Scenario error you get from addons is caught at game_initialization/playcampaign.cpp:415 20150823 10:52:42< vultraz> return LEVEL_RESULT::QUIT; 20150823 10:53:13< gfgtdf> vultraz: yes 20150823 10:53:20< gfgtdf> vultraz: buts thats not the wml parsing error 20150823 10:55:00< Aginor> hmm 20150823 10:55:13< Aginor> wesnoth doesn't build with cmake under osx by default 20150823 10:55:35< Aginor> there's an objective-c file that's not compiled 20150823 10:58:00-!- Appleman1234 [~Appleman1@KD036010143199.au-net.ne.jp] has quit [Ping timeout: 255 seconds] 20150823 11:08:55-!- prkc [~prkc@4E5CCDCF.dsl.pool.telekom.hu] has joined #wesnoth-dev 20150823 11:12:52< vultraz> gfgtdf: Ok I seem to have been mistaken there are only 2 reloads not 3 20150823 11:14:25-!- Appleman1234 [~Appleman1@KD036010148214.au-net.ne.jp] has joined #wesnoth-dev 20150823 11:49:21< gfgtdf> vultraz: you have some plan on how to precoeed with LoW ? 20150823 12:06:22-!- irker535 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20150823 12:11:08-!- lv92 [~lvlz@net-93-71-241-91.cust.vodafonedsl.it] has joined #wesnoth-dev 20150823 12:11:49< lv92> hi 20150823 12:29:18< gfgtdf> hi 20150823 12:36:40-!- noy [~Noy@wesnoth/developer/noy] has quit [Read error: Connection reset by peer] 20150823 12:36:56-!- horrowin1 [~Icedove@2a02:810a:8b00:5298:21b:fcff:fee3:c3ff] has joined #wesnoth-dev 20150823 12:36:58-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20150823 12:52:30-!- gfgtdf [~chatzilla@x55b1a5e0.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 39.0.3/20150806001005]] 20150823 13:02:52-!- Kwandulin [~Miranda@p5B00880A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150823 13:07:45-!- trewe [~trewe@2001:8a0:d111:df01:626c:66ff:fe92:9b7c] has joined #wesnoth-dev 20150823 13:12:37< lv92> is there any search engine for battle for wesnoth units ? 20150823 13:13:06< zookeeper> not unless you count http://units.wesnoth.org/ 20150823 13:18:53< lv92> is this pages generated with a script? 20150823 13:38:55< zookeeper> yeah 20150823 13:42:41< Ravana_> not very frequently though, last update was in april 20150823 13:46:01< lv92> where i can find that script? i would like to put all that units inside a database. 20150823 13:48:22< zookeeper> dunno, since it doesn't seem to be in https://github.com/wesnoth/website 20150823 13:51:58< vultraz> gfgtdf: what do you mean? 20150823 14:15:51-!- Xara [Yangyf@2001:cc0:2020:4010:85e1:cb42:919b:caf3] has quit [Read error: Connection reset by peer] 20150823 14:20:19-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20150823 14:21:08-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150823 14:22:46-!- Kwandulin [~Miranda@p5B00880A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150823 14:22:56-!- [Relic] [~Relic]@2602:306:33a3:6d30:894e:ba23:4303:1004] has joined #wesnoth-dev 20150823 14:44:45< celmin|sleep> lv92: Possible data/tools/unit_tree? I recall not being able to get it to work for me a few years ago, though. 20150823 14:48:13-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150823 14:48:21-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Client Quit] 20150823 14:51:34-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 265 seconds] 20150823 14:53:39< zookeeper> although even if you find the script, it'll do you little good without access to the add-on server to run it in... 20150823 14:55:00< Ravana_> I tried to run it just for my addon but didn't manage that either 20150823 14:56:22< lv92> the add on server? 20150823 14:58:02-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150823 14:58:18< zookeeper> yes? the one where you download add-ons from 20150823 14:58:31< lv92> i thought that the script generate the html file based with local units, and after upload it to units.wesnoth 20150823 14:59:34< zookeeper> that's what i assume 20150823 15:00:50< lv92> is the addon server the same server that has units.wesnoth? 20150823 15:01:54< celmin|sleep> It's addons.wesnoth.org. 20150823 15:02:27< celmin|sleep> The script generates unit trees for all addons too. 20150823 15:03:15< lv92> yes but that problem could be avoided if wesnoth application has all addon that stay in addons.wesnoth.org in local. 20150823 15:03:24< celmin|sleep> I think it's not documented or something, and I couldn't figure out how to use it to generate the tree just for my addon. 20150823 15:03:51< zookeeper> sure, if you want to download all add-ons then be my guest :P 20150823 15:04:17-!- celmin|sleep is now known as celticminstrel 20150823 15:05:37< celticminstrel> Where are the GUI1 dialogs defined? 20150823 15:06:03< celticminstrel> src/dialogs.cpp? 20150823 15:07:20< lv92> shadow say that the new framework stay in src/gui 20150823 15:07:26< lv92> says* 20150823 15:07:29< celticminstrel> Old framework. 20150823 15:07:30< lv92> said* 20150823 15:07:32< celticminstrel> Not new. 20150823 15:07:33< lv92> k 20150823 15:11:47-!- ypnos [~ypnos@lme51.informatik.uni-erlangen.de] has joined #wesnoth-dev 20150823 15:14:46-!- Appleman1234 [~Appleman1@KD036010148214.au-net.ne.jp] has quit [Ping timeout: 265 seconds] 20150823 15:23:23< celticminstrel> It seems construct_dialog.cpp is the main place. 20150823 15:32:26< celticminstrel> If a display object is accessible somewhere in the core GUI2 code, I could make a similar patch there. 20150823 15:34:12< celticminstrel> Hm, it didn't work though. :( 20150823 15:35:32< celticminstrel> Ah, wait, it did work in that Cmd+Q in the preferences dialog over a game now does nothing. 20150823 15:36:06< celticminstrel> But selecting No at the quit confirmation still quits anyway... probably because there's no dialog to catch it... 20150823 15:36:22< celticminstrel> So maybe I need a way to tell if a GUI1 widget has a dialog? 20150823 15:40:48-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has joined #wesnoth-dev 20150823 16:07:58-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20150823 16:16:20< lipkab> shadowm, Aginor: I won't have time for #466 today, hopefully I'll be able to handle in a day or two. 20150823 16:18:31< lipkab> shadowm: Re SDL_gpu: I'm not opposed to dropping it, but I wouldn't do it before we have actual plans and a dedicated developer to replace it with something else. 20150823 16:19:33< lipkab> We won't be better off with an OGL stub than an SDL_gpu stub. 20150823 16:21:58-!- Kwandulin [~Miranda@p5B00880A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150823 16:27:17-!- Appleman1234 [~Appleman1@KD106180019038.au-net.ne.jp] has joined #wesnoth-dev 20150823 16:34:01-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has quit [Ping timeout: 256 seconds] 20150823 16:39:06-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 16:40:18-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150823 16:40:20-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 16:43:39-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 256 seconds] 20150823 16:46:01-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has joined #wesnoth-dev 20150823 16:59:21-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has quit [Ping timeout: 255 seconds] 20150823 17:17:59-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has joined #wesnoth-dev 20150823 17:22:26< celticminstrel> It feels unacceptable to access resources::screen from within the GUI2 event handler. (Even though that's what I did in the GUI1 event handling.) 20150823 17:22:59< celticminstrel> I can't think of any other way for GUI2 to know whether it should be able to insta-quit, though. 20150823 17:24:41< celticminstrel> ...wait, could the quit event be reposted and the GUI2 dialog closed so that the parent context can handle it? 20150823 17:25:15< celticminstrel> Can thandler instruct a dialog to close? 20150823 17:31:27< celticminstrel> Looks like that just creates an infinite loop. 20150823 17:32:48< celticminstrel> Or... 20150823 17:39:10-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has quit [Ping timeout: 260 seconds] 20150823 17:48:30-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20150823 17:48:31-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has joined #wesnoth-dev 20150823 17:53:32< celticminstrel> Ah, I see. 20150823 17:54:36-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has quit [Ping timeout: 260 seconds] 20150823 17:54:52< celticminstrel> It would need the window's handle ID to instruct it to close, and it doesn't know that. :/ 20150823 17:57:45-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has joined #wesnoth-dev 20150823 18:00:05-!- lipkab [~the_new_l@host-91-147-210-193.biatv.hu] has quit [Client Quit] 20150823 18:03:56< celticminstrel> And the GUI2 event handling code seems needlessly complicated. 20150823 18:04:15< celticminstrel> I guess I'll just leave it like this for now. 20150823 18:13:31-!- fonger [5203ffea@gateway/web/freenode/ip.82.3.255.234] has joined #wesnoth-dev 20150823 18:15:02-!- iceiceice [~chris@50.245.222.235] has joined #wesnoth-dev 20150823 18:15:02-!- iceiceice [~chris@50.245.222.235] has quit [Changing host] 20150823 18:15:02-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150823 18:21:27-!- horrowin1 [~Icedove@2a02:810a:8b00:5298:21b:fcff:fee3:c3ff] has quit [Quit: horrowin1] 20150823 18:21:45-!- horrowin1 [~Icedove@2a02:810a:8b00:5298:21b:fcff:fee3:c3ff] has joined #wesnoth-dev 20150823 18:26:36-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20150823 18:26:59< loonycyborg> shadowm: -Wold-style-cast triggers a warning from glib hearders here 20150823 18:27:14-!- gfgtdf [~chatzilla@x55b1a5e0.dyn.telefonica.de] has joined #wesnoth-dev 20150823 18:28:08< gfgtdf> vultraz: you did some commits to LoW in master so i wonder whether to have a plan to fix 1.13 LoW state or whether you just randomly fix think that look bad to you. 20150823 18:29:34< gfgtdf> celticminstrel: i think the gui2 code has just a cvideo object. 20150823 18:29:42< gfgtdf> celticminstrel: but im not sure 20150823 18:30:54< celticminstrel> I think it does, yes. 20150823 18:31:00< celticminstrel> But no display. 20150823 18:31:07< celticminstrel> So no way to tell if in_game(). 20150823 18:31:33< celticminstrel> And even that's only in the dialogs/widgets/windows/whatever, not in the event handling, I think. 20150823 18:32:06< gfgtdf> celticminstrel: why do you want to call in_game ? 20150823 18:32:13< iceiceice> celticminstrel: you can potentially get pointers to game_display, play_controller etc. from the pointers in resources.hpp 20150823 18:32:18< iceiceice> buts its rather evil 20150823 18:32:37< celticminstrel> iceiceice: I know, that's how I did it in GUI1. 20150823 18:33:04< iceiceice> what are you trying to do exactly? 20150823 18:35:34< iceiceice> so this is, you want a hotkey to be handled differently depending on whether we are in game or not? 20150823 18:35:48< celticminstrel> Something like that. 20150823 18:36:22< iceiceice> isn't there already some system for making in-game specific vs. general hotkeys? 20150823 18:36:25< iceiceice> i only dimly remember this now 20150823 18:36:38< celticminstrel> This doesn't go through the hotkey system at all. 20150823 18:36:45< iceiceice> oh ok 20150823 18:37:25< iceiceice> celticminstrel: so one issue regarding the engine design is that, 20150823 18:38:01< iceiceice> it can happen that when the main loop is running, some input event is handled such that, we are currently inside of a lua callback when we have to handle it 20150823 18:38:34< iceiceice> what we do in those situations is that we throw an exception 20150823 18:38:53< iceiceice> and there is this "lua jailbreak exception" mechanism to basically allow the exceptions to propogate back across lua without causing problems 20150823 18:39:26< iceiceice> if you wanted to do things in a way similar to how the engine does similar things, you might throw an exception fro the "close" event? 20150823 18:39:41< iceiceice> and then it gets handled one way at application root, and differently inside of the game loop? 20150823 18:39:50< iceiceice> not saying that's necessarily a good idea. 20150823 18:40:16< iceiceice> but most of the time right now, when we want to exit the game we throw an exception of some kind at some point 20150823 18:40:32< celticminstrel> I could do it that way. 20150823 18:41:15< iceiceice> i guess i would expect that if you want to exit the game, you're either going to have to do that, or modify some existing code that throws an exception 20150823 18:41:25< iceiceice> or just modify the actual main game loop 20150823 18:41:37< iceiceice> i haven't looked at the code in a while though, maybe someone already modified that to make this possible 20150823 18:41:57< iceiceice> iirc thoguh its currently an infinite loop and is only exited via exceptions 20150823 18:50:56< loonycyborg> shadowm: I guess I can change those -I flags to -isystem but need to consider possible side effects 20150823 19:16:43-!- trewe [~trewe@2001:8a0:d111:df01:626c:66ff:fe92:9b7c] has quit [Quit: quit] 20150823 19:18:05< gfgtdf> shadowm: i think the file filesystem_win32.ii was only used b filesystem.cpp so that should be deleted too then. 20150823 19:21:22-!- horrowin1 [~Icedove@2a02:810a:8b00:5298:21b:fcff:fee3:c3ff] has quit [Quit: horrowin1] 20150823 19:21:41-!- horrowin1 [~Icedove@2a02:810a:8b00:5298:21b:fcff:fee3:c3ff] has joined #wesnoth-dev 20150823 19:25:47< celticminstrel> vgettext doesn't use the normal gettext string macros? 20150823 20:16:05-!- Appleman1234 [~Appleman1@KD106180019038.au-net.ne.jp] has quit [Ping timeout: 252 seconds] 20150823 20:21:48-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150823 20:23:34< shadowm> loonycyborg: We should use -isystem. 20150823 20:23:44< shadowm> gfgtdf: Right, I forgot about it. 20150823 20:24:44< shadowm> celticminstrel: vgettext is recognized by the extraction scripts. 20150823 20:25:08-!- lv92 [~lvlz@net-93-71-241-91.cust.vodafonedsl.it] has quit [Quit: Leaving.] 20150823 20:25:14< loonycyborg> shadowm: but those particular -I flags are retrieved from pkg-config 20150823 20:25:37< shadowm> We should use -isystem for anything we don't provide. 20150823 20:25:48< loonycyborg> there should be a reason it doesn't give -isystem instead 20150823 20:26:11< shadowm> The reason is most likely nonexistent or related to compiler support for the option. 20150823 20:26:34< shadowm> CMake uses -isystem instead, for what it's worth. 20150823 20:29:08-!- irker373 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150823 20:29:08< irker373> wesnoth: Ignacio R. Morelle wesnoth:master 92dd610d4cbb / projectfiles/CodeBlocks/wesnoth.cbp src/filesystem_win32.ii: fs: Remove Windows-only bits of the legacy filesystem API implementation http://git.io/vsKoC 20150823 20:30:53< shadowm> lipkab: Right. 20150823 20:31:08< celticminstrel> Ah. 20150823 20:40:12-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Quit: My Mac has gone to sleep. ZZZzzz…] 20150823 20:44:30-!- ancestral [~ancestral@209.181.254.220] has joined #wesnoth-dev 20150823 20:47:41-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer] 20150823 20:47:56-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20150823 21:00:50-!- Shackra [~Jorge@186.177.2.148] has quit [Ping timeout: 246 seconds] 20150823 21:01:39-!- ancestral [~ancestral@209.181.254.220] has quit [Quit: i go nstuf kthxbai] 20150823 21:01:55-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20150823 21:08:24-!- travis-ci [~travis-ci@ec2-54-234-46-129.compute-1.amazonaws.com] has joined #wesnoth-dev 20150823 21:08:25< travis-ci> wesnoth/wesnoth#7184 (master - 92dd610 : Ignacio R. Morelle): The build was fixed. 20150823 21:08:25< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/76890523 20150823 21:08:25-!- travis-ci [~travis-ci@ec2-54-234-46-129.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150823 21:13:41-!- Appleman1234 [~Appleman1@KD036010139155.au-net.ne.jp] has joined #wesnoth-dev 20150823 21:26:00-!- mjs-de [~mjs-de@f049244165.adsl.alicedsl.de] has quit [Remote host closed the connection] 20150823 21:40:11< vultraz> I'm honestly surprised at the number of favs yesterday's screenshot tweet got 20150823 21:42:49< shadowm> How many? 20150823 21:45:14< celticminstrel> Maybe I should delete branch master. 20150823 21:45:24< celticminstrel> It's not really serving any purpose in my remote repo. 20150823 21:45:50< celticminstrel> Also why are there so many random branches floating around. 20150823 21:46:11< vultraz> shadowm: 8 rts, 26 favs 20150823 21:46:20< shadowm> celticminstrel: You mean https://github.com/wesnoth/wesnoth/branches ? 20150823 21:46:25< celticminstrel> Yeah that. 20150823 21:46:31< celticminstrel> I don't need all of those. 20150823 21:46:34< celticminstrel> In my fork, I mean. 20150823 21:46:40< vultraz> Compared to last week, which was 6/9 20150823 21:46:41< shadowm> They are part of your clone. 20150823 21:46:51< celticminstrel> Yeah. 20150823 21:47:14< shadowm> Deleting it won't do much because about 80% of their data is shared with your own branches. 20150823 21:47:25< shadowm> *them 20150823 21:47:32< vultraz> And the new water only got 4/8 20150823 21:47:44< celticminstrel> It would make it easy for me to find my branches in the list, though. 20150823 21:47:48< shadowm> For example, if you create a topic branch from master's tip, that branch shared all those objects with master. 20150823 21:47:48< celticminstrel> Easier. 20150823 21:48:10< shadowm> As long as you don't delete them locally... 20150823 21:48:33< celticminstrel> I don't even have those branches locally. 20150823 21:48:53< shadowm> Uh. How did you clone your downstream repository? 20150823 21:49:04< celticminstrel> I forked on github and cloned from there. 20150823 21:49:28< celticminstrel> What I mean is those branches don't exist as local branches. 20150823 21:49:34< celticminstrel> In my repo. 20150823 21:49:41< celticminstrel> Of course they're there in the remote branches. 20150823 21:49:49< shadowm> Right. 20150823 21:50:31< shadowm> Of course you can delete as many branches as you want as long as you don't need them *or* push those deletes upstream when you get push access to upstream. 20150823 21:50:44< celticminstrel> If I get push access to upstream. 20150823 21:51:08< shadowm> It's not a big if. 20150823 21:52:31< shadowm> Does anyone here get notified when peope push new commits to their PRs? 20150823 21:52:53< vultraz> Not that I know of 20150823 21:53:15< shadowm> This is starting to get on my nerves. 20150823 21:53:41< celticminstrel> I was going to comment to notify you but didn't get to it. 20150823 21:54:13< shadowm> Unless people poke me about it or I go check on the PR like I did just now, I don't get to find out when this happens. :( 20150823 21:54:35< celticminstrel> I dunno if it was my PR that triggered this though. 20150823 21:54:39< shadowm> (Poking includes new follow-up comments.) 20150823 21:54:54< shadowm> No, it's happened with several other people in the past week. 20150823 21:55:52< shadowm> The code looks good, I'll test it after eating some food. 20150823 21:56:01< shadowm> (#471 I mean.) 20150823 21:57:49 * vultraz was thrown for a moment by the dual if blocks with the same conditional 20150823 21:58:21< vultraz> Why not an else? 20150823 22:00:11< shadowm> vultraz: What's your answer to gfgtdf's question? I'm also interested in it. 20150823 22:08:07< vultraz> shadowm, gfgtdf: I intend to clean it up insofar as major bugs and obviously crappy code is concerned 20150823 22:08:54< shadowm> What about the 1.12/master drift I've mentioned countless times before? 20150823 22:09:40< shadowm> It's far more important to get that out of the way before even attempting to fix bugs. 20150823 22:10:02< vultraz> Is it really necessary to fix 1.12? :/ 20150823 22:10:07< shadowm> Yes. 20150823 22:10:29< vultraz> I could do it, but depending on how much they've deviated it might be a massive PITA 20150823 22:10:47< shadowm> It is going to be a pain but someone must do it. 20150823 22:11:07< shadowm> And the longer it takes for it to be corrected, the more work that has to be duplicated on either side of the divergence. 20150823 22:12:54-!- fonger [5203ffea@gateway/web/freenode/ip.82.3.255.234] has quit [Ping timeout: 246 seconds] 20150823 22:14:23< celticminstrel> vultraz: Was that dual ifs at me or someone else? 20150823 22:14:33< vultraz> How would you go about doing it anyway 20150823 22:14:36< vultraz> celticminstrel: yes 20150823 22:14:39< vultraz> you 20150823 22:14:51< celticminstrel> It's not an else because the first conditional may or may not change the string. 20150823 22:15:44-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 272 seconds] 20150823 22:15:50< celticminstrel> Ah... I forgot the Anonymous Player case. 20150823 22:17:16 * celticminstrel goes with "Unknown" instead. 20150823 22:18:27< celticminstrel> What needs to be fixed about 1.12? 20150823 22:19:48< shadowm> vultraz: Look at 1.12 and master since 1.11.11 (`git log 1.11.11..1.12`, `git log 1.11.11..master`), compare commits on both sides chronologically, ensure they exist on both if applicable. 20150823 22:20:44< shadowm> I keep mentioning 1.11.11 because 1.11.11 is the last shared tag between both branches (meaning 1.12 was branched off afterwards). 20150823 22:20:56-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20150823 22:21:08< shadowm> I told you this before too. :\ 20150823 22:28:55-!- joet [~joet@host86-163-223-171.range86-163.btcentralplus.com] has joined #wesnoth-dev 20150823 22:29:05-!- joet [~joet@host86-163-223-171.range86-163.btcentralplus.com] has left #wesnoth-dev [] 20150823 22:35:22-!- celticminstrel is now known as celmin|away 20150823 22:41:51-!- iceiceice [~chris@23.31.228.41] has joined #wesnoth-dev 20150823 22:41:51-!- iceiceice [~chris@23.31.228.41] has quit [Changing host] 20150823 22:41:51-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150823 22:44:04-!- gfgtdf [~chatzilla@x55b1a5e0.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 39.0.3/20150806001005]] 20150823 22:51:25-!- prkc [~prkc@4E5CCDCF.dsl.pool.telekom.hu] has quit [Ping timeout: 256 seconds] 20150823 22:53:44 * vultraz groans 20150823 22:54:20< vultraz> this is a bloody mess 20150823 22:58:16-!- horrowin1 [~Icedove@2a02:810a:8b00:5298:21b:fcff:fee3:c3ff] has quit [Quit: horrowin1] 20150823 23:04:57-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 260 seconds] 20150823 23:20:16-!- Appleman1234 [~Appleman1@KD036010139155.au-net.ne.jp] has quit [Ping timeout: 246 seconds] 20150823 23:36:50-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 23:38:06-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 23:41:18-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 260 seconds] 20150823 23:54:02-!- iceiceice [~chris@50.245.222.235] has joined #wesnoth-dev 20150823 23:54:02-!- iceiceice [~chris@50.245.222.235] has quit [Changing host] 20150823 23:54:02-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150823 23:56:23-!- sailorswift [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 23:58:21-!- sailors__ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has joined #wesnoth-dev 20150823 23:59:58-!- sailorsw_ [~sailorswi@c-50-156-105-171.hsd1.ca.comcast.net] has quit [Ping timeout: 260 seconds] --- Log closed Mon Aug 24 00:00:13 2015