--- Log opened Fri Feb 21 00:00:04 2014 --- Day changed Fri Feb 21 2014 20140221 00:00:04< iceiceice> the key point is that you must reload through the Multiplayer -> Load game dialog 20140221 00:00:15< iceiceice> and not just "load" from title screen 20140221 00:00:20< iceiceice> which in retrospect makes perfect sense 20140221 00:00:52< iceiceice> it might be good to creating a warning for the user that they aren't loading correctly?? 20140221 00:01:07< iceiceice> anyways, lipk I think this isn't actually broken 20140221 00:01:10< iceiceice> lipkab: ^ 20140221 00:01:13< iceiceice> thunderstruck: ^ 20140221 00:05:20< irker581> wesnoth: Charles Dang wesnoth-old:master a720f9a564b9 / doc/manual/manual.txt: Added missing trait entries http://git.io/jIL5lw 20140221 00:07:46< aquileia> vultraz: line 715 - Units with the Dim trait have get a 20140221 00:08:05< vultraz> Oops, sorry. Just woke up >_> 20140221 00:08:10 * vultraz kicks himself 20140221 00:08:31< aquileia> What about "need 20% more XP" ? 20140221 00:09:41< vultraz> Hm, perhaps better make that Experience 20140221 00:09:47< vultraz> More formal 20140221 00:09:47< aquileia> Well, you don't need to wake up if you update animation WML all through the night ;) 20140221 00:10:05< aquileia> HP are used there as well 20140221 00:10:38-!- Dugi [93fbd156@gateway/web/freenode/ip.147.251.209.86] has quit [Ping timeout: 245 seconds] 20140221 00:10:46< aquileia> hmm.,,, HP and hitpoints are mixed 20140221 00:12:08< vultraz> Have you been up all night updating animation WML? :P 20140221 00:12:34< aquileia> You said yourself UtBS is a can of worms - I didn't listen 20140221 00:12:49< aquileia> That's what I get from that 20140221 00:14:38< vultraz> Hehe 20140221 00:15:09< irker581> wesnoth: Charles Dang wesnoth-old:master a37e035e30ab / doc/manual/manual.txt: Fixed a few sleep-induced typos http://git.io/qLnv2w 20140221 00:15:26< vultraz> Thanks for pointing those out 20140221 00:15:44< ChrisOelmueller> there's a new typo in that, heh 20140221 00:15:48< ChrisOelmueller> more expereince 20140221 00:16:24< vultraz> ok I need breakfast 20140221 00:16:28 * vultraz absconds 20140221 00:16:35< vultraz> note to self DO NOT work on wesnoth before food 20140221 00:19:01-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev 20140221 00:19:16< vultraz> I *think* that's it 20140221 00:19:31< vultraz> Dam web editor has no spellcheck >_> 20140221 00:19:44< aquileia> What the heck? http://pastebin.com/im04n2bY 20140221 00:21:31< aquileia> Only to prevent it from flipping... 20140221 00:22:06< irker581> wesnoth: Charles Dang wesnoth-old:master 72ac7e01809d / doc/manual/manual.txt: If I find another typo... http://git.io/nyPkyA 20140221 00:24:45-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 00:25:12< vultraz> Ivanovic: I think that's it ^ weapon specials seem fine. traits and abilities are now all included 20140221 00:25:41-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 248 seconds] 20140221 00:26:54< aquileia> In hope to find another typo I sent it through a spellchecker, and didn't find anything 20140221 00:27:10< aquileia> so it should be clean now 20140221 00:29:12-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 252 seconds] 20140221 00:31:18< aquileia> Coffee_irc, anyone: Does auto_hflip=no need a [frame] or can it bbe applied globally? 20140221 00:31:44< iceiceice> anyone: i'm going to push a change so that the user gets a warning when they load an mp scenario from the title screen load button 20140221 00:32:01< iceiceice> here's the warning I wrote: "Warning: This is a multiplayer scenario. If it is part of an mp campaign configured with eras or modifications, events included in these may not work correctly in subsequent scenarios unless you load it through the Multiplayer -> Load Game dialog instead." 20140221 00:32:57< iceiceice> does anyone feel this is unclear / undesirable? you are welcome to rewrite 20140221 00:33:03< aquileia> Sounds good (from a player perspective). 20140221 00:33:55< iceiceice> it definitely would have saved me some time if this was here already >< 20140221 00:34:11< aquileia> Perhaps you could even simplify to "subsequent scenarios may not work correctly" 20140221 00:34:44< iceiceice> yeah so that is an option 20140221 00:35:55< iceiceice> hmm i guess i will make that change 20140221 00:36:43< iceiceice> sometimes i think its good to be specific, if the player does something that is said to cause an error, but the error doesn't apparently happen they may disregard the warning 20140221 00:37:05< iceiceice> i dont think thats a good argument for making it complicated though 20140221 00:37:32< aquileia> Another argument: Less text for the translators. 20140221 00:38:31< iceiceice> heres another try: "Warning: This is a multiplayer scenario. If it is part of an mp campaign, in some circumstances subsequent scenarios will not work correctly unless you load it through the Multiplayer -> Load Game dialog instead." 20140221 00:39:29< aquileia> I think the preevious version was better 20140221 00:39:48< iceiceice> hmm 20140221 00:40:11< aquileia> But no big preference 20140221 00:40:24< iceiceice> "Warning: This is a multiplayer scenario. If it is part of an mp campaign, eras and modifications may not work correctly in subsequent scenarios unless you load it through the Multiplayer -> Load Game dialog instead." 20140221 00:40:32< aquileia> And I'm not really the one to ask about this 20140221 00:41:05< aquileia> That seems good to go (again, not my decision) 20140221 00:41:16< iceiceice> thanks aquileia :) 20140221 00:41:44< aquileia> Still composing? 20140221 00:42:25< aquileia> Just out of interest 20140221 00:43:51< vultraz> "Warning: This is a multiplayer scenario and some parts of it may not work properly in singleplayer. It is recommended to load this scenario through the Multiplayer -> Load Game dialog instead" 20140221 00:43:57< aquileia> Oh, I'm getting tired... an mp --> a MP 20140221 00:46:54< iceiceice> ok i have pushed vultraz's version 20140221 00:47:01< iceiceice> *not to master 20140221 00:47:06< iceiceice> but i will soon 20140221 00:51:02-!- wesbot_ [~wesbot@asteria.debian.or.at] has joined #wesnoth-dev 20140221 00:51:31-!- alcedine [~alcedine@151.236.26.17] has joined #wesnoth-dev 20140221 00:51:52-!- enchilad1 [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140221 00:52:01-!- Crab_ [~Crab_@wesnoth/developer/crab] has quit [Quit: Crab_] 20140221 00:52:32-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Disconnected by services] 20140221 00:52:52-!- enchilad1 is now known as enchilado 20140221 00:52:53< irker581> wesnoth: Chris Beck wesnoth-old:master 8e4fef932d46 / src/game_controller.cpp: Add warning when multiplayer game is loaded through title screen load button http://git.io/Gx3f8w 20140221 00:52:55< irker581> wesnoth: Chris Beck wesnoth-old:master 3ac2afd07bd1 / changelog: update changelog http://git.io/xlI7UQ 20140221 00:52:57< irker581> wesnoth: cbeck88 wesnoth-old:master db75c081a591 / changelog src/game_controller.cpp: Merge pull request #101 from cbeck88/mp_options http://git.io/K-sYbA 20140221 00:55:19-!- janebot_ [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20140221 00:55:57-!- Netsplit *.net <-> *.split quits: alcedine_, wesbot, janebot, mjs-de 20140221 00:55:59< shadowm> 21:00:50 it might be good to creating a warning for the user that they aren't loading correctly?? 20140221 00:56:00-!- wesbot_ is now known as wesbot 20140221 00:56:02< iceiceice> aquileia: hey, i haven't been composing, way too distracted for that 20140221 00:56:12< shadowm> iceiceice: Well, if you can figure out how to tell MP saves apart from SP saves... 20140221 00:56:48< iceiceice> i mean if it says its a multiplayer game and we are loading it through the singleplayer load function, that means something is fishy 20140221 00:57:38< aquileia> iceiceice: What a pity. But well, there isn't much time before the freeze. I can certainly understand your priorities (and RL exists as well) 20140221 00:57:38< iceiceice> so my commit message is actually not totally accurate, in fact the error will appear whenever you attempt to do this 20140221 00:58:15< iceiceice> so if you use menu load from in a different scenario to try to load an mp save, you will also get the warning 20140221 00:59:19< iceiceice> the error will appear right after wesnoth tries to format network sides to human and network_ai to local ai 20140221 00:59:38< iceiceice> aquileia: yeah maybe i will make more time for it later but its too hard atm 20140221 01:00:34< aquileia> and as long as West is absent, there is no real incentive 20140221 01:00:47< iceiceice> shadowm: "it might be good to creating a warning..." that's exactly what i was trying to do 20140221 01:02:03< shadowm> I hadn't read the log further at that point, I see. 20140221 01:02:46-!- mjs-de [~mjs-de@f049139146.adsl.alicedsl.de] has joined #wesnoth-dev 20140221 01:07:13< iceiceice> Dugi: 20140221 01:07:22< iceiceice> I had a thought about the add-on manager overhaul 20140221 01:07:55< iceiceice> so, i know you are mainly concerned with quality rankings, but some people who play on mobile devices are actually also very concerned about add-on size 20140221 01:08:21-!- mattsc [~mattsc@154.20.32.246] has joined #wesnoth-dev 20140221 01:08:26< iceiceice> it might be useful if besides measuring the size of the add-on folder, you also could give people the number of bytes the add-on takes while loaded in the config-cache at run time 20140221 01:09:34< iceiceice> since that is probably more important for them i guess 20140221 01:11:04-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 01:13:28-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 01:19:09-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 252 seconds] 20140221 01:19:54-!- cib0 [~cib@p5DD23020.dip0.t-ipconnect.de] has quit [Ping timeout: 265 seconds] 20140221 01:32:11< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 8918b974f187 / src/campaign_server/campaign_server.cpp: campaignd: No longer allow existing add-ons with invalid names to be reuploaded http://git.io/AVreEg 20140221 01:34:43-!- mjs-de [~mjs-de@f049139146.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140221 01:37:37< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 46b278579bea / data/tools/wesnoth/campaignserver_client.py: wesnoth_addon_manager: Make the portmap tuple more easily diffable http://git.io/CDvByw 20140221 01:42:44-!- Guest34016 is now known as _8680_ 20140221 01:44:24< shadowm> /** Seems like compression level above 6 is waste of cpu cycle */ 20140221 01:44:34< shadowm> And yet the production instances have run with a level of 9 all this time. 20140221 01:45:19< shadowm> Well, it's baldras. It can deal with it. 20140221 01:53:12-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 02:07:11-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20140221 02:08:46-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has joined #wesnoth-dev 20140221 02:09:35< shadowm> EliDupree: Confirmed the wesnoth_addon_manager fixes. Thanks! 20140221 02:09:38< shadowm> Er. 20140221 02:09:47< shadowm> elias: What I said above. 20140221 02:09:49< EliDupree> heh 20140221 02:10:54< elias> hm, suddenly i want to play ultima 20140221 02:12:55-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 02:15:38< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master ab5cc6b03d48 / changelog: Update changelog for wesnoth_addon_manager fixes http://git.io/r0-45Q 20140221 02:17:11< aquileia> Coffee_irc , _8680_ : You recently discussed the details of the new animation syntax... what happens if the duration differs from the sum of the image durations in the frame? 20140221 02:17:54-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 265 seconds] 20140221 02:18:25< _8680_> I don’t believe that’s determined by Coffee’s syntax. 20140221 02:19:12< _8680_> I assume that problem would have existed and been dealt with already by the time Coffee’s syntax emerged. 20140221 02:20:11< EliDupree> I've been doing a lot of stuff with animations from an add-on developer perspective and I'd like to know that too :p 20140221 02:20:29< EliDupree> Looking around the source is useful but there are sooo many details 20140221 02:23:10< aquileia> I thought I read about redistributing the time in Coffee's thread r.wesnoth.org/t38198 20140221 02:23:20< aquileia> I'm searching it right noww 20140221 02:25:37-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has joined #wesnoth-dev 20140221 02:27:46< aquileia> r.wesnoth.org/p546956 20140221 02:30:46< aquileia> This still doesn't tell whar happens if duration is longer, so I'll have to test it. But certainly not on the monster of animation I'm working on right now... 20140221 02:31:32< aquileia> I guess it's simple padding 20140221 02:31:36< aquileia> any bets? 20140221 02:34:29-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140221 02:39:00< aquileia> I saw only the last frame during the additional 2000 duration I added 20140221 02:44:54-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 02:46:11< aquileia> EliDupree: So the answer is: Animations longer that duration are cut short, shorter ones are padded with their last frame. 20140221 02:47:12< EliDupree> Good, that means I implemented this correctly :p 20140221 02:48:28< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master dc15ae8d3199 / data/tools/wesnoth_addon_manager: wesnoth_addon_manager: Add missing trailing newline to _info.cfg http://git.io/uO07DQ 20140221 02:48:31< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master acd1db7c31b2 / src/addon/info.cpp: addon/info: wesnoth_addon_manager wants the dependencies list in _info.cfg http://git.io/cMu_Ig 20140221 02:48:34< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master baa566161b4c / data/tools/wesnoth_addon_manager: wam: Write title and type fields to _info.cfg like the C++ client does http://git.io/XdKwsQ 20140221 02:48:37< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 80172ee58f48 / data/tools/wesnoth_addon_manager: wam: Make our _info.cfg's look identical to the C++ client's http://git.io/XVgJkQ 20140221 02:48:40< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 287a086e3bc9 / changelog: Update changelog for recent wam changes http://git.io/4tMZgQ 20140221 02:58:55< shadowm> loonycyborg, mordante: Since we are about to enter beta and the cairo situation in Windows remains unsolved, I'd like to commit my patch from bug #21648 as a workaround in the meantime. Any objections? 20140221 02:59:11< shadowm> (Patch: https://gna.org/bugs/download.php?file_id=20044) 20140221 03:05:01< aquileia> replacing 391 lines with 192 on a single file... the syntax is definitely efficient! 20140221 03:05:49-!- justinzane_ [~justinzan@tiny.justinzane.com] has quit [Read error: Connection reset by peer] 20140221 03:06:14-!- justinzane_ [~justinzan@tiny.justinzane.com] has joined #wesnoth-dev 20140221 03:06:23-!- Ivanovic_ [~ivanovic@x2f42035.dyn.telefonica.de] has joined #wesnoth-dev 20140221 03:07:07< aquileia> To be accurate, it's mostly because a feature was misused before... 20140221 03:09:37-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 272 seconds] 20140221 03:10:16-!- Ivanovic_ is now known as Ivanovic 20140221 03:29:57-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has quit [Quit: leaving] 20140221 03:30:16-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has joined #wesnoth-dev 20140221 03:36:04< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master f28e74c0bd12 / data/gui/default/widget/text_box_default.cfg: gui2/ttext_box: Workaround text AA issue with transparent background http://git.io/xnAZwA 20140221 03:36:07< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master a9298e1d6dfc / data/gui/default/ (widget/text_box_default.cfg window/wml_message.cfg): gui2/ttext_box: Add a 'transparent' backgroundless variant for WML [message] http://git.io/hyqpvQ 20140221 03:39:36-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has quit [Quit: Lost terminal] 20140221 03:40:49-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has joined #wesnoth-dev 20140221 03:48:44< iceiceice> mattsc: 20140221 03:49:50< iceiceice> I think that in fact it is possible to switch out of ai during the ai's turn, 20140221 03:50:03< iceiceice> there is a code path in playsingle_controller.cpp for this in the play_side function 20140221 03:50:04< iceiceice> https://github.com/wesnoth/wesnoth-old/blob/master/src/playsingle_controller.cpp#L676 20140221 03:50:43< iceiceice> but i think i'm just going to try to write a patch right to that function rather htan relying on this exception mechanism 20140221 03:51:13< iceiceice> just fyi anyways 20140221 04:01:05-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 04:05:25-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 248 seconds] 20140221 04:06:22< mattsc> iceiceice: but doesn't that look like it only happens if the AI has nothing to do, and it would only take effect at the beginning of the turn? 20140221 04:06:59< matthiaskrgr> is the factions and terrain section of the help broken? 20140221 04:09:41< mattsc> matthiaskrgr: they work for me on trunk compiled earlier today (other than some missing images in the terrain section) 20140221 04:10:02< matthiaskrgr> I'm on a9298e1d6dfc845b6470bfaf1232fd18260ca618 20140221 04:10:21< shadowm> Everyone: make sure RELEASE_NOTES has all the stuff that should go in the 1.11.10 announcement by this Saturday morning. 20140221 04:11:00-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Ping timeout: 265 seconds] 20140221 04:11:19< mattsc> shadowm: I'm done with that, just working on some MAI bugs atm 20140221 04:11:52< matthiaskrgr> mattsc: "terrain" is only unaccessible when I run the help form the main menu. 20140221 04:11:57< matthiaskrgr> otherwise it seems to work 20140221 04:12:33< mattsc> matthiaskrgr: ah, I tried from within a game; and factions from within a MP game; it might be intended that way 20140221 04:12:47< matthiaskrgr> mmh 20140221 04:13:00< mattsc> I don't know that, just saying that it might 20140221 04:13:10< matthiaskrgr> ok 20140221 04:13:18< matthiaskrgr> well, I have no idea, it just seemed strange :D 20140221 04:14:09< irker581> wesnoth: mattsc wesnoth-old:master a66a87dad65a / data/ai/micro_ais/scenarios/healer_support.cfg: Healer support MAI test scenario: change event from die to last breath http://git.io/kasIKA 20140221 04:14:41< mattsc> shadowm: you hate saurians as opponents or on your side? Or both? 20140221 04:14:53< shadowm> Opponents. 20140221 04:15:24< shadowm> The disgusting little pests kept killing my guys in the treasury scenarios in LoW. 20140221 04:15:28< mattsc> Yeah, they are kind of annoying. 20140221 04:15:45< shadowm> And it's impossible to block them since they are all skirmishers and I can't afford a map-wide wall of units. 20140221 04:15:54< mattsc> Treasury is a reasonably tough one, IIRC 20140221 04:16:13< mattsc> I am currently having an issue with bunnies at the moment. 20140221 04:16:18< shadowm> Well, I _can_ afford it. 20140221 04:16:32< mattsc> Well, actually, the bunnies are rats, but either way they aren't replay safe. 20140221 04:16:36< shadowm> I just don't want to waste my precious gold. 20140221 04:17:01< mattsc> I think I was kind of impatient last time I played that scenario, and I paid for it. 20140221 04:18:48< aquileia> shadowm: Sorry, I forgot the release notes in my last pull request... new sprites are probably visible enough to go in there. In some minutes I'll do another PR for UtBS - should I add it there although there is no context? 20140221 04:19:18< mattsc> Actually, other than that you get healers that way, I don't care too much for saurians on my side either. And Orcish Warlord is just so much better than a saurian flanker, it's not even funny. 20140221 04:20:25< mattsc> ... although, the extra strike does help in some situation; as does skirmishing, of course. 20140221 04:20:25< shadowm> aquileia: Well, first thing is that image improvements belong in the changelog only unless they are particularly notable (say, a new set of portraits). Second is that our own artists and committers do a terrible job at maintaining the changelog for that kind of thing, so it's become an optional task. 20140221 04:20:46< aquileia> Ok, less work 20140221 04:21:03< shadowm> Remember that RELEASE_NOTES is only for stuff that is worth announcing in the release announcement with all the fancy formatting and stuff. 20140221 04:22:48< mattsc> Well, back to my bunnies, I guess... 20140221 04:23:06< shadowm> Now, hm, I personally don't know whether R_N entries are useful in a pull request. 20140221 04:23:41< shadowm> I personally don't have a problem with people sending me their own entries through any other channel in advance if that's less trouble for them. 20140221 04:25:27-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection] 20140221 04:27:27< aquileia> Something else: The last thing before I run wmllint is the question whether I should change an animation... the melee attack of the small mudcrawler 20140221 04:28:01< aquileia> Any objections from anyone if I stop at mudcrawler-attack-2 ? 20140221 04:28:52< shadowm> Not me, certainly. 20140221 04:40:06< shadowm> aquileia: Do you have a forum account? 20140221 04:40:24< aquileia> Yes, same name 20140221 04:41:42< shadowm> Okay. 20140221 04:43:50< aquileia> and github as well - seems noone else chooses an ancient roman city as nickname 20140221 04:57:54< iceiceice> mattsc: i grepped for "fallback_ai_to_human" exception, it turns out the only place it is thrown is here: https://github.com/wesnoth/wesnoth-old/blob/master/src/ai/formula/ai.cpp#L490 20140221 04:58:11< iceiceice> so actually it is thrown when the ai has too much to do and exceeds recursion count 20140221 04:58:57< iceiceice> but I guess you're right, I don't know of any mechanism in 1.11 master to allow undroid of ai during its turn 20140221 04:59:03< mattsc> I see 20140221 04:59:37< mattsc> iceiceice: well, let's try Crab_ again when he's back. He's very responsive when he has time, so I assume he was just busy earlier today. 20140221 05:00:00< iceiceice> sure 20140221 05:00:08< mattsc> Well, or you can figure it out by yourself, but I won't be much help I'm afraid :P 20140221 05:00:14< iceiceice> hehe i think i'm pretty close 20140221 05:01:03< mattsc> nice :) 20140221 05:02:03-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 05:04:34< irker581> wesnoth: mattsc wesnoth-old:master ac5acf69af90 / data/ai/micro_ais/cas/ (ca_forest_animals_move.lua ca_forest_animals_new_rabbit.lua): Forest Animals MAI: make the rabbit-type animals replay safe http://git.io/oeVWJA 20140221 05:04:55< mattsc> Now the bunnies are behaving nicely 20140221 05:05:01< aquileia> Hmm... running wmllint gives me an error, but in wmllint itself: line 1005 is considered invalid syntax by python 20140221 05:05:24< aquileia> Am I oing something wrong? 20140221 05:05:39< mattsc> ... and with that, all Micro AIs should be replay and MP safe (I hope). 20140221 05:05:39< shadowm> What Python version are you running? 20140221 05:05:39< aquileia> s/oing/doing 20140221 05:06:12< shadowm> Uh, line 1005 seems completely innocuous. 20140221 05:06:34-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 260 seconds] 20140221 05:08:49< aquileia> Well, I'm a complete idiot... I installed perl, not python. At least there is an easy fix 20140221 05:09:25< aquileia> Thanks, without your question I probably wouldn't have seen it that fast 20140221 05:09:52< shadowm> Does any of the present have a suggestion for a better location for the Game Paths dialog than Preferences -> General? 20140221 05:10:35< shadowm> Otherwise you'll all have to deal with my completely-unimportant dialog featuring in a highly-visible place in 1.12 because I don't intend to relocate it after 1.11.10 unless it's to a GUI2 parent dialog. 20140221 05:10:45< mattsc> shadowm: no, still don't have a better idea on that 20140221 05:11:38< mattsc> I think it's good the way it is. In fact, I like that it is right there and "in your face", because when I want it, it's usually to save myself 10 second of typing in the path, so I don't want to search for it. 20140221 05:18:33< aquileia> I'll be back after a short system restart... 20140221 05:18:47-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has quit [Quit: Page closed] 20140221 05:19:58-!- cjhopman [cjhopman@nat/google/x-scgksjdesgkmwlfw] has joined #wesnoth-dev 20140221 05:19:58-!- cjhopman__ [cjhopman@nat/google/x-uvzpbmjgehwdwgbp] has quit [Read error: Connection reset by peer] 20140221 05:23:27-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has joined #wesnoth-dev 20140221 05:25:37< aquileia> With python installed, it stops at line 592 - perhaps due to the apostrophes 20140221 05:26:04< aquileia> shadowm: Can't I just assume you are right? 20140221 05:26:42< shadowm> ("misc/schedule-morning.png","misc/time-schedules/default/schedule-morning.png"), 20140221 05:26:49< shadowm> That's line 592... 20140221 05:27:11< shadowm> So, what Python version, again? 20140221 05:27:30-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20140221 05:27:52< aquileia> Not in my version, there it is print '"%s", line %d: closing %s I see %s with %s' % (filename, lineno, closer, tag, attributes) 20140221 05:27:59< aquileia> 3.3 20140221 05:28:08< shadowm> Try Python 2.7. 20140221 05:28:13< aquileia> Ok 20140221 05:28:13< shadowm> Eh wait. 20140221 05:28:36< shadowm> :< Yeah, try Python 2.7 anyway. 20140221 05:29:14< shadowm> wmllint was clearly written for Python 2.x, and 3.x interpreters are not quite backwards-compatible. 20140221 05:29:57< shadowm> Not sure if we should change the shebang for that and other scripts to point to python2 instead... AI0867? 20140221 05:30:21< shadowm> (Not that it'd have helped in the case, I presume.) 20140221 05:32:47-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20140221 05:33:47< shadowm> -- checking for module 'systemd' 20140221 05:33:47< shadowm> -- package 'systemd' not found 20140221 05:33:54< shadowm> Hey, what does cmake want to do with systemd? 20140221 05:36:52< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 47ffd9ea2d0e / / (7 files in 5 dirs): gui2/tscreenshot_notification: New GUI2 dialog shown when taking screenshots http://git.io/4AbujQ 20140221 05:36:55< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master d1635436c9bb / src/SConscript: scons: Link libwesnoth_extras.a into wesnoth twice http://git.io/CdeAwQ 20140221 05:36:58< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 892f233f6581 / RELEASE_NOTES changelog players_changelog: Update changelogs and RELEASE_NOTES http://git.io/xsM0_A 20140221 05:37:01< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 5d84cb579ca7 / / (10 files in 6 dirs): Merge branch 'staging/feature/screenshot-notifications' http://git.io/hgdgzg 20140221 05:39:24< aquileia> Whoa, it runs and I get dozens of "unknown speaker" messages in UtBS, but my changes are ok 20140221 05:39:29< shadowm> iceiceice: Have you added your Lua API features to LuaWML in the wiki? 20140221 05:39:44< iceiceice> not the most recent one 20140221 05:40:05< shadowm> aquileia: Perhaps it's the set I already fixed last night. 20140221 05:40:06< iceiceice> theres some question that i should change the interface 20140221 05:40:15< iceiceice> to be a proxy table 20140221 05:40:21< iceiceice> instead of a wesnoth.get_... function 20140221 05:40:31< aquileia> I'll make a pull request of it then 20140221 05:40:34< iceiceice> but i'm not sure if i'm going to get to it 20140221 05:41:02< shadowm> aquileia: i.e. http://pastebin.com/NdSccmCR 20140221 05:41:32< aquileia> exactly those 20140221 05:41:40< iceiceice> this is just hte part about the get_era thing for SigurdFD, the other part wesnoth.game_config.era i expect will be more widely used and i dont intend to change it, and it is documented 20140221 05:42:22< shadowm> Proxy tables are nice. I highly recommend them as part of a complete balanced breakfast. 20140221 05:43:23< shadowm> Of course, that's what I'd say from the Lua side of things. The C++ is rather unwieldy -- I have done it before. 20140221 05:44:02< shadowm> ... for a feature set I forgot I wanted to stabilize and land before 1.11.10. Oops. It'll have to be for 1.13.x then. 20140221 06:00:17< aquileia> https://github.com/wesnoth/wesnoth-old/pull/102 20140221 06:01:13< aquileia> Thanks again shadowm, the 2.7 tip helped (as you probably guessed in between) 20140221 06:04:32< shadowm> Who's going to handle this? The first commit does too much stuff. 20140221 06:05:34< shadowm> Meaning it changes too many things that should've been done in separate commits for organizational purposes. 20140221 06:06:33< aquileia> I thought I shoul squash them all? 20140221 06:11:27-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 06:13:16< shadowm> Hm, no, did someone advise that? 20140221 06:14:35< aquileia> I suppose it was a slightly different situation, but in my first PR I added unnecessary commits and zookeeper would have preferred a squash 20140221 06:14:56-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has joined #wesnoth-dev 20140221 06:15:38< aquileia> From one extreme to the opposite... 20140221 06:18:19< shadowm> "With 7 maintainers listed for UtBS" Ah, the infamous Spontaneous UtBS Maintainer Disappearance Syndrome. 20140221 06:19:00< aquileia> Do I have to create partially edited files (e.g. only deleting #wmllint usage) ? 20140221 06:19:14< shadowm> 10:06:46 i suppose irker doesn't report pushes to the resources branch 20140221 06:19:19< shadowm> Oh yeah, my bad, I need to fix that. 20140221 06:19:32< shadowm> Hang on I'm reading my kilometric IRC backlog. 20140221 06:21:00< shadowm> Hm, okay, zookeeper was talking about the "not optipng" commit I think. 20140221 06:21:23< aquileia> yes 20140221 06:21:36< shadowm> Anyway, different developers, different tastes in commit style. I'm sure zookeeper won't mind the super-commit. :p 20140221 06:22:47< aquileia> So I'll wait for him and plant it on his todo list? ;) 20140221 06:23:36< iceiceice> aquileia 20140221 06:23:45< aquileia> yes? 20140221 06:23:48< iceiceice> i'll see if i can fidn the thing i read that explained what a proper commit is 20140221 06:24:01< iceiceice> basically the point of a commit as far as i can tell is, 20140221 06:24:18< iceiceice> it should possibly "make sense" to revert a commit 20140221 06:24:25< shadowm> zookeeper: Okay, what "resources branch"? It's a repository: https://github.com/wesnoth/resources 20140221 06:24:26< iceiceice> in the sense that after any commit ideally eveyrthing should compile 20140221 06:24:31< iceiceice> and each commit shoudl create a new logical unit 20140221 06:24:41< shadowm> zookeeper: Also, the last commit was by me on January 26, so...? 20140221 06:24:41< iceiceice> or like, be a logical next development step 20140221 06:25:10< iceiceice> so usually when you write something you make mistakes, you backtrack and undo somethings 20140221 06:25:23< _8680_> iceiceice: Was it ? 20140221 06:25:25< iceiceice> before you commit to a public repo though, you should go back and rebase things and clean them up 20140221 06:26:06< _8680_> Or maybe ? 20140221 06:26:30< aquileia> shadowm: That was a misunderstanding - he spoke about wesnoth-resources (not wesnoth/resources), my own repo 20140221 06:26:51< aquileia> iceiceice: Thanks for the guidelines 20140221 06:27:00< shadowm> AH okay nvm then. 20140221 06:27:19 * shadowm doesn't know how to count, now forgot how to read... 20140221 06:28:40< iceiceice> aquileia, _8680_: ok the 2nd thing 8680 sent is better than what i was going to send ;) 20140221 06:29:15< iceiceice> but i'll send what i was going to send anyways just in case 20140221 06:29:17< iceiceice> http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html 20140221 06:29:48 * shadowm hates mailing lists, why can't I have permalinks in my mail client... 20140221 06:29:56< iceiceice> ok i guess this doesn't explain what a commit is, it really just talks about what rebase is, when and why you might want to rewrite your history 20140221 06:30:05< _8680_> Another reason to split up commits that can break things (not, e.g., image-optimizing commits) is that if they do break things, then it’s easier to find the change that broke things (e.g., with `git bisect`) when the commits are smaller. 20140221 06:30:28< shadowm> _8680_: Objection. Image-optimizing commits have broken things in the past. 20140221 06:30:50< _8680_> They have? Was the tool broken or…? 20140221 06:31:04< shadowm> This is why we came up with a script to compare the results in wesnoth-optipng using PIL. 20140221 06:31:46-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20140221 06:42:28-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140221 06:42:51< vultraz> _8680_: yes, if it causes color changes 20140221 06:43:05< vultraz> _8680_: which is why shadowm does optipng for nx 20140221 06:43:47< shadowm> I do? 20140221 06:45:13< _8680_> I meant to ask whether the tool was broken in those specific instances, or whether the breakage was caused by human error or something else. 20140221 06:46:32< shadowm> Who knows. 20140221 06:46:42< shadowm> I only know it keeps happening! 20140221 06:48:37< aquileia> zookeeper: Do you want to join the discussion about commit sizes or rather look at https://github.com/wesnoth/wesnoth-old/pull/102 ? 20140221 06:48:43-!- Ivanovic [~ivanovic@x2f42035.dyn.telefonica.de] has quit [Changing host] 20140221 06:48:43-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140221 06:50:14< aquileia> Not that you had to do either... 20140221 06:50:15-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 06:51:26< Ivanovic> vultraz: great, thanks! 20140221 06:52:39-!- horon [~horon@nttkyo210231.tkyo.nt.ngn2.ppp.infoweb.ne.jp] has joined #wesnoth-dev 20140221 06:53:25-!- horon [~horon@nttkyo210231.tkyo.nt.ngn2.ppp.infoweb.ne.jp] has quit [Client Quit] 20140221 06:54:39< zookeeper> shadowm, yes, i meant the resources repo 20140221 06:54:56-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 252 seconds] 20140221 06:55:35< zookeeper> and as for why aquileia's stuff didn't go there even though i pressed the button i was told to press, i don't know 20140221 06:56:41< aquileia> Well, there is https://github.com/aquileia/wesnoth-resources to which you pushed and there is https://github.com/wesnoth/resources 20140221 06:57:13< zookeeper> ok, so what good did it do to have me push to the former? 20140221 06:58:15< aquileia> I thought you wanted to try in a safe environment? 20140221 06:59:16< aquileia> I can of course also make a PR for wesnoth/resources out of most of my repo, if you want 20140221 07:00:33< iceiceice> hmm the plot thickens... 20140221 07:01:23< aquileia> Oh, and when I'm at it... I have a Eloh sprite candidate from zerovirus waiting there: https://github.com/aquileia/wesnoth-resources/tree/master/UTBS/frames%20zerovirus 20140221 07:01:33< iceiceice> last time on "wesnoth development with iceiceice", the protagonist wanted to create an idle mode for a side to take, to ease things when network disconnections occur 20140221 07:01:46< iceiceice> and wea talked about making an idle ai for this purpose and decided it was bad 20140221 07:02:09< iceiceice> however now we know that we can make an idle controller mode if we like *but* it requires us to modify server source code ... 20140221 07:02:17< shadowm> Idle AI? 20140221 07:02:31< shadowm> There used to be a way to make an AI idle. 20140221 07:02:34< iceiceice> not the same as idle ai, 20140221 07:02:41< iceiceice> the idle ai which exists actually passes its turn 20140221 07:02:50< iceiceice> what we want here is an ai that doesnt even do that 20140221 07:03:02< iceiceice> so it is just a placeholder until the dc person comes back 20140221 07:03:06< shadowm> Ah, right. 20140221 07:03:08< iceiceice> usually in games people will use an observer for this purpose 20140221 07:04:05< iceiceice> so i guess ultimately i will probably have to modify server source regardless? 20140221 07:04:18< iceiceice> its not possible in games on the mp server to set the ai to a "nonstandard" droid, is it? 20140221 07:04:38< zookeeper> aquileia, try what? merging a pull request, or testing the animations etc? 20140221 07:04:40< iceiceice> you can only set a side to the default AI afaik 20140221 07:04:51< aquileia> the former 20140221 07:04:57< zookeeper> right 20140221 07:05:15< shadowm> iceiceice: There is an AI selection box in the game setup dialog IIRC. 20140221 07:05:29< iceiceice> yes i remember that... 20140221 07:05:56< iceiceice> i'm not sure if the server has a "change controller" tag that recognizes the different kinds of ai though? 20140221 07:06:03< iceiceice> the server uses some simplified wml or something right? 20140221 07:06:07< zookeeper> Ivanovic, do you mind if i rename arvith back to arne, in TB? 20140221 07:07:01< shadowm> iceiceice: simple_wml refers to the WML representation used for server work. Really, all this strikes me as stuff that's done purely on the client-side. 20140221 07:07:31< iceiceice> you'd think so, except that in testing i am finding that when i change a side to idle, the server sends a message "that's not a legal controller" 20140221 07:07:38< shadowm> I presume the server needs to know about the different controller types (including the "ai" controller), but the exact implementation of each is most likely left to the clients. 20140221 07:07:45< iceiceice> yes 20140221 07:08:10< iceiceice> i feel like i'd rather not change the server code at all is the thing... 20140221 07:08:15< iceiceice> but i guess i will have to do that little bit most likely 20140221 07:08:23< shadowm> What's the worst thing that could come out of that? 20140221 07:08:53< iceiceice> well the worst thing is that i write some C++ not quite right and it causes a run time exception that crashes the server at some point 20140221 07:09:15< shadowm> Oh, surely it's just one or two std::string comparisons! 20140221 07:09:24< iceiceice> you never know :p 20140221 07:09:38< iceiceice> when's the last time the server.cpp code was patched? 20140221 07:09:43< iceiceice> how much testing was done? 20140221 07:09:46< shadowm> Besides, the whole purpose of the beta stage is to test things. 20140221 07:09:56< iceiceice> oh, we have a beta stage? 20140221 07:09:57< iceiceice> that's awesome 20140221 07:10:05< iceiceice> haha\ 20140221 07:10:10< shadowm> Yes, 1.11.10 is the first 1.12 beta. 20140221 07:10:22< iceiceice> i see 20140221 07:10:26< iceiceice> so how long does beta phase last? 20140221 07:10:41< shadowm> The point is that this kind of change probably won't be allowed in 1.12 after 1.11.10 is tagged.. 20140221 07:10:47< iceiceice> right 20140221 07:11:00< iceiceice> i'm well aware of that 20140221 07:11:18< shadowm> Hm, dunno, Ivanovic said he was aiming for 1.12.0 in May or so. We usually have a number of beta releases and 1 RC. 20140221 07:11:39< iceiceice> ok, i think i can get it right, i just wasn't sure before now that i would defintiely have to bite the bullet and modify the server code 20140221 07:11:44< shadowm> There are bugs to be fixed, translations to be updated, and a large announcement to be redacted and translated. 20140221 07:13:54-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20140221 07:15:28< shadowm> For reference, 1.9.10 (Nov 7 2011) through 1.9.13 (Dec 19 2011) were betas, and 1.9.14 (Jan 8 2012) was RC 1. 20140221 07:16:00< shadowm> 1.10.0 gold on January 22 2012. 20140221 07:16:52< aquileia> zookeeper, shadowm, Espreon and 4 other maintainers: Is https://github.com/aquileia/wesnoth-resources/blob/master/UTBS/frames%20zerovirus/eloh-1-shadow.png or her blondee twin worth considering? I could add it to the PR if you like 20140221 07:17:35< shadowm> Eh uh hm... 20140221 07:17:54< zookeeper> i can't say i'm a fan 20140221 07:17:57< shadowm> I remember that sprite. *absconds* 20140221 07:20:19-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 260 seconds] 20140221 07:20:44< aquileia> Well, if the present one was any better... https://github.com/wesnoth/wesnoth-old/blob/master/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/eloh-serene.png 20140221 07:21:15< zookeeper> yeah, i have a hard time telling which would be better, so i'll default with the old one 20140221 07:22:40< iceiceice> i have no business commenting, but my feeling is you should take what matches the portrait better? 20140221 07:23:07< shadowm> I'd refrain from attempting to make a baseframe for that thing until there's an actual (read: not a Wesnoth 1.2 edit) portrait made. 20140221 07:23:25< Ivanovic> zookeeper: btw i disagree that we should rename arvit back to arne 20140221 07:23:34< zookeeper> Ivanovic, oh? 20140221 07:23:39< zookeeper> okay then 20140221 07:23:56< Ivanovic> both names work as good as each other 20140221 07:27:11-!- wesbot changed the topic of #wesnoth-dev to: 1.11.10 (start of string+feature freeze) planned for February 22nd | 222 bugs, 349 feature requests, 28 patches | Logs: http://irclogs.wesnoth.org | Alternate logs: http://wesnoth.debian.net | Don't paste on IRC! Use a pastebin: http://pastebin.com | http://imagebin.org 20140221 07:31:09 * zookeeper tries a quick edit of the core elvish lady 20140221 07:31:43 * zookeeper finds that the new paint.net seems incapable of shift-move-copying a selection 20140221 07:32:41< aquileia> it can 20140221 07:32:47< zookeeper> how? 20140221 07:33:11< aquileia> You just want to move a part? 20140221 07:33:20< zookeeper> no, i want to copy a part around 20140221 07:33:51< zookeeper> i don't know why you'd think i couldn't move the selected pixels 20140221 07:35:19-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has joined #wesnoth-dev 20140221 07:35:51< aquileia> copyingg seemed easier that moving, so I assumed it'd be the latter part 20140221 07:37:06< aquileia> Perhaps I don't understand what you want to do... I'd have said select, ctrl+c, ctrl+v an you have a freely moveable prt 20140221 07:37:26< aquileia> and you have a freely moveable part 20140221 07:37:59< zookeeper> yeah. and previously, i could just press down shift and move the selected pixels to do the same 20140221 07:38:31< zookeeper> besides just pressing ctrl+c ctrl+v doesn't work, even though if i do it through the menus it does 20140221 07:39:06< zookeeper> or it works sometimes, depending on whether it's in the mood of taking keyboard input 20140221 07:39:51 * zookeeper shrugs 20140221 07:39:54< aquileia> Oh, try ctrl instead of shift 20140221 07:40:06< zookeeper> no difference 20140221 07:40:50< zookeeper> anyway, the new version has lots of nice tool options, but it's terrible in how it crashes like 90% of the time when i go backwards in undo history via the history box 20140221 07:40:57< aquileia> Did you change to move mode via M ? 20140221 07:41:16< zookeeper> no 20140221 07:41:44< zookeeper> but i both did and did not select the move pixels tool 20140221 07:42:27< aquileia> So M and then ctrl+drag is what you seem to need 20140221 07:42:46< zookeeper> no, it doesn't work 20140221 07:43:54< aquileia> you are on 3.5.11 or later? 20140221 07:44:17< zookeeper> 4.0 20140221 07:44:44< zookeeper> hence the "new paint.net" 20140221 07:44:51< aquileia> No wonder we don't understand each others problems 20140221 07:45:05< aquileia> sorry, I wasn't aware of the beta 20140221 07:46:10< zookeeper> ohh. it's a beta. i wonder if it ever asked me whether i want to check for those too. 20140221 07:46:13< zookeeper> it might have 20140221 07:47:24-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140221 07:48:58< vultraz> fabi: I added a note to clarify on the map vs scenario options: http://wiki.wesnoth.org/BuildingMaps#Creating_a_map 20140221 07:59:10< aquileia> zookeeper: I tried the beta and withdraw my previous answer 20140221 07:59:33< aquileia> including the "it can" 20140221 07:59:37-!- Gallaecio [~quassel@84.120.219.139.dyn.user.ono.com] has quit [Read error: Connection reset by peer] 20140221 08:14:35-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has quit [Quit: Page closed] 20140221 08:19:38-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 08:36:17-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 08:52:57< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master e48d038b3d7d / changelog: Fix changelog formatting http://git.io/Tp3FmQ 20140221 08:53:00< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 8aa1c0e1f2aa / utils/mp-server/run_campaignd: run_campaignd: Use 4 threads for 1.9 or 1.12 only http://git.io/zAD6uQ 20140221 08:53:03< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master 0540b987c2f3 / utils/mp-server/run_server: run_server: Use more threads for 1.9 (32), less threads for 1.8 (8) http://git.io/R-FWuQ 20140221 09:02:19< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master d4fad10ab685 / utils/mp-server/run_server: run_server: 30 threads for 1.10, not 1.9 http://git.io/hh3y_g 20140221 09:04:15< Soliton> iceiceice: the server has no idea what AI a client is running and doesn't need to know either. where exactly do you get an issue? 20140221 09:06:13< Soliton> iceiceice: re the load game warning: it'd be much better to just do the right thing instead of warning if that's reasonably possible. 20140221 09:08:31< shadowm> Ivanovic: Around what time this Saturday do you intend to tag? 20140221 09:24:41< shadowm> "* Updated screenshots used inside the ingame help and fixed description of orbs." 20140221 09:24:56< shadowm> Wait, wasn't the new orb coloring going to be reverted? 20140221 09:29:03< irker581> wesnoth: Ignacio R. Morelle wesnoth-old:master cbbad01dbedc / players_changelog: Copy additional players_changelog entries from the main changelog http://git.io/k2gC5A 20140221 09:30:27< shadowm> zookeeper: Anything to say in RELEASE_NOTES about EI? 20140221 09:30:46< zookeeper> yeah, i'll update it once i've gotten the rest of it in 20140221 09:34:50-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 265 seconds] 20140221 09:36:23-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140221 09:51:59< shadowm> Btw, any particular reason WML parser errors have been translatable since 2004 but preprocessor errors haven't? 20140221 09:52:45< shadowm> Not that I feel too strongly about either. As I said, considering that coders would need to read the reference in the wiki in English anyway... 20140221 10:00:00-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 252 seconds] 20140221 10:04:08-!- exciton_ [chuck-the-@77.51.174.228] has joined #wesnoth-dev 20140221 10:06:05-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140221 10:07:53-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 260 seconds] 20140221 10:11:03-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 264 seconds] 20140221 10:16:17-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 260 seconds] 20140221 10:17:04-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140221 10:20:27-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Ping timeout: 260 seconds] 20140221 10:46:08-!- stikonas [~gentoo@cpc18-sgyl27-2-0-cust35.18-2.cable.virginm.net] has joined #wesnoth-dev 20140221 10:46:08-!- stikonas [~gentoo@cpc18-sgyl27-2-0-cust35.18-2.cable.virginm.net] has quit [Changing host] 20140221 10:46:08-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140221 10:48:17< loonycyborg> shadowm: I'm not against committing that font patch 20140221 10:59:18< vultraz> does anyone use shroud_data? 20140221 11:07:48< vultraz> fabi: ping 20140221 11:17:33-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Ping timeout: 260 seconds] 20140221 11:19:33-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has quit [Ping timeout: 248 seconds] 20140221 11:22:15-!- EdB [~edb@37.160.12.200] has joined #wesnoth-dev 20140221 11:26:31-!- exciton_ [chuck-the-@77.51.174.228] has quit [Read error: Connection reset by peer] 20140221 11:26:45-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev 20140221 11:40:31< vultraz> If anyone's wondering, I've undertaken the task of updating the main parts of the wiki related to content creation (the pages on Maps, Scenarios, etc) 20140221 11:40:49< vultraz> And getting rid of outdated material and pages, etc 20140221 11:41:45< zookeeper> great 20140221 11:56:10-!- molgrum [~molgrum@212.85.89.43] has quit [Quit: Lämnar] 20140221 11:58:39-!- molgrum [~molgrum@212.85.89.43] has joined #wesnoth-dev 20140221 12:11:12-!- DCW [~Thunderbi@cpc1-finc14-2-0-cust12.4-2.cable.virginm.net] has joined #wesnoth-dev 20140221 12:11:28< vultraz> Here's my updated http://wiki.wesnoth.org/BuildingScenarios page 20140221 12:11:44-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20140221 12:18:39-!- timotei_ [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev 20140221 12:23:04-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 12:29:35< vultraz> fabi: ^ 20140221 12:34:53-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140221 12:38:30-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 12:58:25-!- EdB [~edb@37.160.12.200] has quit [Quit: Konversation terminated!] 20140221 13:06:43-!- TooLmaN [~TooLmaN@mail.thomsonplastics.com] has joined #wesnoth-dev 20140221 13:07:37-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20140221 13:10:17-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has joined #wesnoth-dev 20140221 13:14:33-!- DCW [~Thunderbi@cpc1-finc14-2-0-cust12.4-2.cable.virginm.net] has quit [Read error: Connection reset by peer] 20140221 13:14:40< aquileia> zookeeper, shadowm : I'll repeat my question from earlier this morning... 06:19:00< aquileia> Do I have to create partially edited files (e.g. only deleting #wmllint usage) ? 20140221 13:15:06< aquileia> I'd prefer not to of course, but if you want me to... 20140221 13:15:33< zookeeper> i don't understand the question 20140221 13:16:07< aquileia> shadowm would like to have more separate commits for the UtBS stuff 20140221 13:17:44 * zookeeper still doesn't 20140221 13:18:42< zookeeper> "still doesn't understand the question"; not "still doesn't like to have [...]" 20140221 13:19:43< aquileia> There was a short diiscussion about what size a single comit should have, and 3000 changed lines with syntax changes as well as cleanin up were deemed too much by him 20140221 13:20:51< aquileia> sorry for the typos, it's time to screw up my laptop and exchange the keyboard 20140221 13:21:04< zookeeper> oh, right. i don't have much of an opinion on that myself, i don't mind even big commits. 20140221 13:23:33< aquileia> Then I don't have to go throgh the hassle to branch, roll back, create intermediate files, commit step for step, ... Nice! 20140221 13:24:11< Soliton> if you don't make mistakes or want others to easily understand your changes make big commits. 20140221 13:26:42< aquileia> Soliton: Well, it is all in one unit folder (a complete refactoring of animation WML to comply with the new syntax and get rid of the deprecated begin) 20140221 13:27:35< zookeeper> if you're doing the same thing to many units/files/images then i don't think anyone minds if it's one commit rather than one commit per unit/file/image 20140221 13:27:47 * Soliton nods. 20140221 13:28:06< zookeeper> the latter is mostly just spamming the commit log IMO :p 20140221 13:30:12< aquileia> The thing is I cleaned up some tiny tings as well - deleting unnecessary lines, more precisely #wmllint usage comments, duplicate advanceto's, and units changed to use [base_unit] and I guess shadowm referenced these 20140221 13:31:26< aquileia> so if "cleean up" is one job, it's ok 20140221 13:34:29< zookeeper> gray area i guess 20140221 13:36:53< aquileia> All this began because I wanted to get rid of an unnecessary else tag and figured it wouldn't warrant a PR alone... if I had known it would explode to 3000 lines... 20140221 13:37:46< Soliton> git add -p is your friend. 20140221 13:39:07< Soliton> "clean up" is as clearly one job as "fix everything". 20140221 13:43:46< Soliton> IMO what's important is ease of review. if you made lots of simple similar changes and put in some "clean ups" that may or may not be simple and correct then suddenly i cannot quickly skip over the commit verifying that it's just a simple replace or whatever but i have to check the whole commit and look for those "clean up" changes. 20140221 13:44:31< Soliton> if those random "clean up" changes are in a seperate commit it becomes easy again. 20140221 13:46:19< aquileia> I'm reading about add -p right now, but in any case it is a little late... 20140221 13:49:12< aquileia> And with this, it'd be a herculean feat... I'd rather create a 'clean up only' version of the files (less that 1% of the changes) than to handle every single block 20140221 13:52:45< aquileia> To make it short - do you want me to do it or not? 20140221 13:54:26-!- mjs-de [~mjs-de@f048209017.adsl.alicedsl.de] has joined #wesnoth-dev 20140221 13:57:31-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 272 seconds] 20140221 13:57:36< Soliton> in case you're talking to me. i've just made general comments. i've not looked at anything you did. so if zookeeper will merge it that's who you need to listen to in the end. 20140221 14:04:08< aquileia> Soliton: on'T misunderstand me - if there was no deadline today I'd love to get as many tips as possible (This is only my second PR) and I'm really grateful for leads on what commands to look at. It's just that there is no chance to get this right tomorrow. 20140221 14:04:24< aquileia> s/on'T/Don't 20140221 14:06:09-!- stikonas [~gentoo@cpc18-sgyl27-2-0-cust35.18-2.cable.virginm.net] has joined #wesnoth-dev 20140221 14:06:09-!- stikonas [~gentoo@cpc18-sgyl27-2-0-cust35.18-2.cable.virginm.net] has quit [Changing host] 20140221 14:06:09-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140221 14:06:18< Soliton> sure, no worries. 20140221 14:07:44-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has joined #wesnoth-dev 20140221 14:08:17< aquileia> I have a proposal (you'll probably don't like): If you could revert the giant commit in my fork, readding the stuff in logical chunks would be ok. I just fear the roll back since the last time (when it corrupted my local clone) 20140221 14:12:57-!- mattsc [~mattsc@154.20.32.246] has quit [Quit: Computer's napping] 20140221 14:14:44< Soliton> make a backup of the repo; git reset HEAD~1; git add -p; git commit; repeat last two steps as needed; git push -f 20140221 14:15:59< aquileia> backup in a branch or local one? 20140221 14:16:58< aquileia> As I told I'm not really git literate yet 20140221 14:17:00< Soliton> i was thinking of just copying. 20140221 14:17:06< aquileia> Ah, ok 20140221 14:17:20< aquileia> I hope you bear with my questions 20140221 14:21:43< AI0867> 06:29 < shadowm> Not sure if we should change the shebang for that and other scripts to point to python2 instead... AI0867? <-- on every system I've used, 'python' is python 2.x, 'python3' is python 3.x and you may get specific branches using 'python2.7' or the like 20140221 14:22:27< AI0867> I have been considering moving the tools to python3 though 20140221 14:23:02< AI0867> a bug like this has been reported before, and it was some overly flexible distro that allowed you to install python3 as 'python' 20140221 14:23:11-!- mattsc [~mattsc@207.230.251.234] has joined #wesnoth-dev 20140221 14:29:46-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 14:30:20< AI0867> 06:33 < shadowm> Hey, what does cmake want to do with systemd? <-- it wants to be able to install wesnothd as a service 20140221 14:30:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140221 14:31:34< aquileia> Soliton: Is a commit without description ok if the title says everything? 20140221 14:33:37< vultraz> Yes 20140221 14:33:55-!- cib0 [~cib@p5DD23020.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140221 14:35:17-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Ping timeout: 252 seconds] 20140221 14:38:06-!- apoi_ [~andi@85-126-180-242.volume.xdsl-line.inode.at] has quit [Quit: leaving] 20140221 14:38:18-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has joined #wesnoth-dev 20140221 14:40:54< aquileia> At least I found a typo (not mine) while splitting the commits which messed up wmllint spellcheck 20140221 14:42:49-!- apoi [~andi@85-126-180-242.volume.xdsl-line.inode.at] has joined #wesnoth-dev 20140221 14:59:08< mattsc> fabi: I haven't followed the discussion lately and I haven't read up on the log over the last 12 hours yet, but just in case nobody has mentioned it yet: the new terrain view mode in the minimap currently gives me a black map. 20140221 14:59:28< mattsc> As in, all terrain is black. You can see units and villages. 20140221 14:59:37< mattsc> Does it work for everybody else? 20140221 15:01:08-!- cib0 [~cib@p5DD23020.dip0.t-ipconnect.de] has quit [Quit: Leaving] 20140221 15:08:20-!- mattsc [~mattsc@207.230.251.234] has quit [Quit: Computer's napping] 20140221 15:11:56-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has joined #wesnoth-dev 20140221 15:12:01-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140221 15:13:05-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140221 15:13:57-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 15:17:00< aquileia> Status message: I'm nearly done with splitting... 20140221 15:17:07< Soliton> aquileia: i wouldn't call that without description but yeah a commit that can be explained in just the title or summary line or what you call it is perfectly fine. 20140221 15:19:09< aquileia> I wrote a description anyhow while waiting, so the issue is solved in any case. Oh and by the way, vultraz was faster. But thanks - learning by doing doesn't work if nobody controls whether I do it right 20140221 15:19:09< wesbot> aquileia: Sometimes we are fast 20140221 15:19:56< aquileia> What? Was Status message a wesbot command? 20140221 15:20:28< zookeeper> that was fast 20140221 15:20:28< wesbot> zookeeper: Sometimes we are fast 20140221 15:20:34< zookeeper> so... nope :p 20140221 15:21:31< aquileia> I'm back in a few minutes 20140221 15:25:19-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer] 20140221 15:25:33-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev 20140221 15:30:52-!- mattsc [~mattsc@fw.hia.nrc.ca] has joined #wesnoth-dev 20140221 15:36:27< happygrue> make it fast 20140221 15:36:56< aquileia> will # wmllint: no spellcheck (until name->id) continue to ignore in the next file? 20140221 15:37:54< aquileia> and is the space after the sharp symbol a problem? 20140221 15:40:02< vultraz> the space is no problem 20140221 15:40:08< aquileia> ok 20140221 15:41:03< aquileia> I just wondered because the rest of the file has no id field, it'll ignore to the end... and beyond? 20140221 15:43:08-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140221 15:44:34-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 265 seconds] 20140221 15:46:08-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140221 15:55:56< iceiceice> Soliton: i get an issue if "idle" is a controller type because the server needs to know about that type, or it makes a pouty face: https://github.com/wesnoth/wesnoth-old/blob/master/src/server/game.cpp#L376 20140221 15:57:50-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 264 seconds] 20140221 15:57:52< iceiceice> if it were possible to interrupt an AI turn with "control", i would almost say it would be easier just to make this a new ai... but now i guess I will just end up copying a good deal of the display code and such for ais around 20140221 15:58:15-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140221 16:01:00-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 16:03:08< aquileia> Soliton, vultraz: Do I understand correctly that git push -f will overwrite my fork with every change I committed in my clone? I don't want to do something wrong and start from scratch... 20140221 16:03:34< vultraz> -f is very dangerous. 20140221 16:03:39< vultraz> I advise you not use it 20140221 16:03:51< vultraz> especially if you're new to git 20140221 16:03:55< aquileia> But I have to erase a previous commit 20140221 16:04:08< vultraz> is it blocking something? 20140221 16:05:08< aquileia> I reset it, split it up, and now I have to transfer these changes to the repo 20140221 16:05:44< aquileia> Else my PR would have a monster commit of 4000 lines 20140221 16:06:21< vultraz> curious, what did you do that changed 4k lines 20140221 16:06:24< vultraz> lines 20140221 16:06:40< aquileia> animation WML syntax 20140221 16:06:52< aquileia> UtBS is now lightweight 20140221 16:07:35< vultraz> that's...a lot of lines 20140221 16:08:06< Soliton> aquileia: yes. alternatively you can probably also make a new branch with your new commits and make a pull request from that. i don't know the details of that though. 20140221 16:08:34< aquileia> more that 200 are from a single unit from which I pasted a small excerpt yesterday... 20140221 16:08:43< Soliton> iceiceice: why do you need to use the control command? you don't really need to send anything to the server, no? 20140221 16:09:25< aquileia> vultraz: http://pastebin.com/im04n2bY That is only a tiny example, the real horror came later... 20140221 16:10:15< Ivanovic> shadowm: i don't know, i am just describing the status quo which was missing 20140221 16:10:37< vultraz> aquileia: so you got rid of a lot ofuseless stuff? 20140221 16:10:38< aquileia> Soliton: Right now it shows 6 commits ahead, 2 behind - am I good to go? 20140221 16:10:46< aquileia> vultraz: yes 20140221 16:10:57< vultraz> so...why can't you commit that 20140221 16:11:30< aquileia> One single line to deactivate a feature instead of manually reverting it with 6 macros 20140221 16:11:49< aquileia> Ok, two lines to be honest 20140221 16:11:52< Ivanovic> shadowm: i plan to release 1.11.10 in my morning hours 20140221 16:11:54< iceiceice> Soliton: it seems like i should be creating a new controller type "controller = idle", otherwise i could potentially get confuse players and developers 20140221 16:11:56< Ivanovic> so something like 10 to 11am 20140221 16:11:57< Soliton> aquileia: no idea about the context. i don't know the github UI by heart or anything. you need to figure out the details yourself or maybe someone else here can help you. 20140221 16:12:13< vultraz> aquileia: _8680_ could help but he's away 20140221 16:12:15< Ivanovic> meaning: in about 17h 20140221 16:12:21< iceiceice> because it wouldtn make sense for "controller" to have some other value and also some flag "idle = yes" or something 20140221 16:12:25< aquileia> But -f is okay in my case? 20140221 16:12:33< Soliton> aquileia: if you're worried about losing the changes you can also use format-patch to save them to be applied again by git am. 20140221 16:12:59< aquileia> I... don't understand at all 20140221 16:13:07< Soliton> aquileia: -f is ok if you push to your own fork/branch whatever that is not "truely public history". 20140221 16:13:23< aquileia> that's the case 20140221 16:13:44< aquileia> how do I do format-patch ? 20140221 16:13:54< Soliton> git help format-patch 20140221 16:13:59< aquileia> ok ok 20140221 16:14:12< Soliton> iceiceice: that doesn't explain why you have to tell the server about it. 20140221 16:15:06< iceiceice> you're right ideally i wouldn't 20140221 16:15:40< iceiceice> so i guess i had only a shaky grasp on how the server / control transfer actually works, 20140221 16:15:53< iceiceice> i didnt realize that the server doesnt have literally the same values for things like controller 20140221 16:15:55< mattsc> Ivanovic: I'll likely not get to making the OS X package until my afternoon/evening tomorrow (meaning: in about 36h), but I assume that's ok. 20140221 16:16:07< Ivanovic> mattsc: that is fine 20140221 16:16:18< iceiceice> it sounds like "idle" could just be a local state that only exists on the host 20140221 16:16:47< mattsc> Ivanovic: and while we're at it, I'm ready for the freeze. Everything that's still on my list at this time are bug fixes. 20140221 16:16:53< Soliton> iceiceice: the server only needs to be inivolved when changing control to a different client. (not sure why it even cares about ai... probably just for some silly message.) 20140221 16:17:02< Soliton> iceiceice: indeed. 20140221 16:17:03< vultraz> fabi: we have yet to decide what to do about the save schedule thing 20140221 16:17:12< vultraz> if it needs a new string we're running out of time 20140221 16:21:19< Soliton> iceiceice: the server is mostly a dumb relay of WML. it just knows some commands for meta game stuff like changing controllers, kicking, muting etc and WML where some security is needed like attack outcomes and team messages etc. 20140221 16:22:03< aquileia> Soliton: The folder to which I irected the output is created, but empty... 20140221 16:22:20-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20140221 16:24:37< Soliton> git format-patch HEAD~2 # saves last 2 commits 20140221 16:26:05< aquileia> Oh how dumb I am... 20140221 16:26:08< aquileia> Thanks 20140221 16:31:29< aquileia> And the PR is updated: https://github.com/wesnoth/wesnoth-old/pull/102 20140221 16:31:50< aquileia> split one commit inn five, I hope this is ok now 20140221 16:35:01< aquileia> vultraz: https://github.com/aquileia/wesnoth-old/commit/68d67dddb23106d3dfb58cca08aaec5133990073 20140221 16:35:08< aquileia> behold the horror 20140221 16:35:19-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has joined #wesnoth-dev 20140221 16:37:35< aquileia> zookeeper, shadowm : Anyone wants to review? 20140221 16:38:04< zookeeper> i doubt i have time tonight 20140221 16:40:40< aquileia> perhaps Coffee_irc wants to check what his syntax has achieved? 20140221 16:41:50< iceiceice> Soliton: regarding changing the warning to actually do the right thing -- I don't think I know enough about the engine to say if that's possible, my guess is that the people who wanted to "unify SP and MP" would have done this if they could? 20140221 16:42:11< vultraz> aquileia: dayum dat optimization 20140221 16:46:49-!- irker581 [~irker@ai0867.net] has quit [Quit: transmission timeout] 20140221 16:48:11-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20140221 16:49:19-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has joined #wesnoth-dev 20140221 16:54:07< aquileia> It'd be nice to get it in 1.12, so... any volunteers? https://github.com/wesnoth/wesnoth-old/pull/102 20140221 16:55:15-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 252 seconds] 20140221 16:55:46< aquileia> Or will this count as a bugfix because begin is deprecated... :p 20140221 16:57:24< aquileia> Hey, take a bugfix... and a tin-opener for this can of worms! 20140221 16:59:50< aquileia> happygrue: While I'm waiting for a response there... any news on the khalifate baseframes? 20140221 17:00:14< aquileia> I cropped some of them here: https://github.com/aquileia/wesnoth-resources/tree/master/khalifate 20140221 17:02:26< happygrue> ah, thanks aquileia, I had missed that 20140221 17:03:03< aquileia> I'll add mudafi and rasikh in a few minutes 20140221 17:03:05< happygrue> I'll take a look in an hour or so and if it all works I'll put them in 20140221 17:03:38< aquileia> Well, I'd prefer to discuss them before that 20140221 17:03:55< aquileia> e.g. the wyvern is 20140221 17:04:01< aquileia> \me finds no words 20140221 17:04:18< zookeeper> ...going to not be used? :p 20140221 17:04:32< aquileia> not in mainline at least 20140221 17:05:35< aquileia> except if a khalifate campaign pops up and convinces you all - which is unlikely in the next 24 hours 20140221 17:06:10< happygrue> aquileia: we talked about which Sleepwalker thought were ready right? And all the special stuff is just fair game for campaigns, I have no idea about it 20140221 17:06:33< happygrue> busy right now but I can pull up the PM and see which he thought were ready, I think we talked about it some days go 20140221 17:06:37< happygrue> afk for a bit 20140221 17:06:38< zookeeper> wyverns instead of falcons, now that would have been nice 20140221 17:06:56< aquileia> But sleepwalker told you which ones were ok artistically, not considering consistency 20140221 17:07:32-!- SigurdFD [~SigurdFD@24.154.98.89] has joined #wesnoth-dev 20140221 17:07:51< aquileia> You can't break unit lines completely 20140221 17:20:43-!- boucman [~rosen@2a02-8428-034f-f800-92e6-baff-fe93-a07d.rev.sfr.net] has joined #wesnoth-dev 20140221 17:20:43< aquileia> My 2ct: The Jundi line is my favorite, qatif-al-nar and rasikh are excellent, the mudafi has L1 dimensions but this is ok, the ghazi's pauldrons and the shuja's sword are oversized, the mighwar is pure fantasy and the monawish hangs on it 20140221 17:20:44-!- boucman [~rosen@2a02-8428-034f-f800-92e6-baff-fe93-a07d.rev.sfr.net] has quit [Changing host] 20140221 17:20:44-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140221 17:22:30< aquileia> So that makes 6 units I'd commit if it were up to me: jundi, muharib, batal, qatif-al-nar, mudafi, and rasikh 20140221 17:23:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140221 17:25:31< aquileia> Oh and I'd like to say that sleepwalker did these for fun (see r.wesnoth.org/p544361), not because they should go in mainline 20140221 17:26:20< aquileia> This is also why he varied the unit lines and added this epic wyvern sprite 20140221 17:27:51< aquileia> So I hope he doesn't mind if I see some problems with their mainline use 20140221 17:31:08< aquileia> Anyone wanting to comment on the PR or the khalifate sprites? Or is everyone busy to get in his last changes? 20140221 17:31:55-!- Gallaecio [~quassel@84.120.219.139.dyn.user.ono.com] has joined #wesnoth-dev 20140221 17:32:32< aquileia> I mean the khalifate are one of the main additions for 1.12 and there are probably different opinions on how to proceed 20140221 17:32:51< aquileia> Jetrel: ^ 20140221 17:33:50< aquileia> It will happen again... like before 1.11.9 when nobody put them in... 20140221 17:51:21-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev 20140221 17:53:17-!- TooLmaN [~TooLmaN@mail.thomsonplastics.com] has quit [Ping timeout: 252 seconds] 20140221 17:57:22-!- TooLmaN [~TooLmaN@mail.thomsonplastics.com] has joined #wesnoth-dev 20140221 18:00:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer] 20140221 18:00:16-!- exciton [chuck-the-@77.51.174.228] has joined #wesnoth-dev 20140221 18:02:55-!- exciton [chuck-the-@77.51.174.228] has quit [Read error: Connection reset by peer] 20140221 18:05:18-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev 20140221 18:06:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer] 20140221 18:06:15-!- irker886 [~irker@ai0867.net] has joined #wesnoth-dev 20140221 18:06:15< irker886> wesnoth: Chris Beck wesnoth-old:master eb1788566520 / src/game_controller.cpp: warning message fixup http://git.io/xXYubg 20140221 18:06:15< irker886> wesnoth: cbeck88 wesnoth-old:master 38afe48a4990 / src/game_controller.cpp: Merge pull request #103 from cbeck88/warning_message_fixup http://git.io/dnoDeA 20140221 18:10:16-!- exciton [chuck-the-@77.51.174.228] has joined #wesnoth-dev 20140221 18:10:50-!- ancestral [~ancestral@75-161-229-57.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20140221 18:18:10< happygrue> aquileia: I'm back now - no need to be pessimistic, I'd also like to see the units you agree with in 20140221 18:18:20< happygrue> and the others were never considered anyway I think? 20140221 18:18:36< aquileia> I tried to provoke feedback 20140221 18:18:49< happygrue> :P 20140221 18:19:47< happygrue> looking now, give me a bit 20140221 18:21:18< aquileia> I suppose sleepwalker would also add arif and monawish to that list, it's just that they would level to old units then 20140221 18:22:05< aquileia> and IIRC wesnoth usually ranks consistency above visuals 20140221 18:22:37-!- TooLmaN [~TooLmaN@mail.thomsonplastics.com] has quit [Quit: Off to save the world!] 20140221 18:24:03-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!] 20140221 18:26:33< aquileia> happygrue: If you want I could make a pull request of those you choose, but it's probably just as easy for you to put them in yourself 20140221 18:29:03< happygrue> I really have no opinon about it. level 1 units are used so much more than level 2 units that there is some case to be made for just having the best stuff available at level 1 regardless of what happens at level 2, but there is also a strong case for keeping the line steady 20140221 18:29:29< happygrue> unless someone else has strong opinions I would opt for the 6 you mentioned above and leave the others out for now 20140221 18:29:54< happygrue> that seems safe 20140221 18:30:07< happygrue> but I have no problem adding the others if art people think it's a good idea 20140221 18:31:48< aquileia> Well, good luck to get a response 20140221 18:35:42-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has joined #wesnoth-dev 20140221 18:36:49< happygrue> people respond when they have something to say and are available. I'm doing a bunch of different things right now. I assume other people are equally busy or just don't have an opinion on this. If you would like it instantly, sure, put those 6 in a pull request and I will click it 20140221 18:37:16< happygrue> Also: it's my birthday today, so wrap it up with a little bow ;) 20140221 18:37:38< happygrue> otherwise I'll get to it in a bit. 20140221 18:38:14< aquileia> Oh, sorry to bother you... and happy birthday! 20140221 18:39:23< aquileia> I guess due to the commit history I can't really wrap them up appropiately 20140221 18:39:31< mattsc> happygrue: happy birthday. (and no, I don't have an opinion on this - plus, I am trying to figure out why Micro AI deleting/changing doesn't work after reloading; looks like I have found a new bug in the AI mechanism itself, not the MAIs...) 20140221 18:44:49-!- exciton [chuck-the-@77.51.174.228] has quit [Read error: Connection reset by peer] 20140221 18:44:55< happygrue> thanks mattsc 20140221 18:45:02< happygrue> and yikes? 20140221 18:45:03-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev 20140221 18:46:21< mattsc> Well, it's an unusal case that probably nobody's ever been using so far because before the MAIs it was too complicated (and you don't need it very often even with them). 20140221 18:47:05< mattsc> It looks to me like the CA names/ids are not the same any more after a reload, which means you can delete all of them (I've confirmed that that works), but removing them by name fails ... 20140221 18:47:23< mattsc> Something like that. I'm looking into it. Fortunately, this does not have to be done before the freeze. 20140221 19:00:02< SigurdFD> Anyone: I can assist with testing / simple grunt work for the next 2 hours if needed. 20140221 19:02:46-!- Samual_ [~dioteckte@xonotic/core-team/Samual] has joined #wesnoth-dev 20140221 19:02:48< happygrue> mattsc: did you say you were getting a black map earler? 20140221 19:03:06< happygrue> I just logged onto the dev server and created a game and the whole screen is black XD 20140221 19:03:23< happygrue> going to try again... 20140221 19:03:28< mattsc> No, the map is fine. The minimap in one of the settings is black. 20140221 19:04:26-!- Samual [~dioteckte@xonotic/core-team/Samual] has quit [Ping timeout: 264 seconds] 20140221 19:05:53-!- trewe [~trewe@87.196.40.233] has joined #wesnoth-dev 20140221 19:08:30< happygrue> every game I load or create I get a blank screen for right now. Maybe I should rebuild I guess? Could it be some recent commit? 20140221 19:11:10< mattsc> happygrue: MP game? Local game? Let me try. 20140221 19:11:15< happygrue> any 20140221 19:11:21< happygrue> local, on the server, SP 20140221 19:11:24< happygrue> reloaded 20140221 19:12:03< happygrue> I can quit and the menu is fine, but all I see is blank 20140221 19:12:17< aquileia> SigurdFD: I suppose if noone else needs your help, there would be my pull request someone has to double-check... https://github.com/wesnoth/wesnoth-old/pull/102 20140221 19:13:27< mattsc> happygrue: works for me, version compiled ~14 hours ago. 20140221 19:15:04-!- _trewe [~trewe@232.53.54.77.rev.vodafone.pt] has joined #wesnoth-dev 20140221 19:15:18-!- trewe [~trewe@87.196.40.233] has quit [Ping timeout: 265 seconds] 20140221 19:15:26< aquileia> zookeeper and shadowm : Would it be ok for you if SigurdFD reviewed the PR and told you whether there are issues? 20140221 19:15:41< SigurdFD> aquileia: sorry, I'm not someone who could approve a pull request 20140221 19:17:00< happygrue> not sure what's wrong, but I guess I will rebuild (I'm a number of days old) and just make sure it's not that. 20140221 19:17:35< aquileia> But if you could verify the PR doesn't break something, perhaps a dev would just trust the both of us and merge? Just a possibility, because zookeeper doesn't have time to review himself 20140221 19:18:30< mattsc> happygrue: make sure your data directory is up-to-date too. In my case (Xcode) it sometimes does not when I build, for some mysterious reason, and that can cause all kinds of problems. 20140221 19:18:36< aquileia> A rather complicated constellation, but it'd take work from them if they agreed 20140221 19:18:42< mattsc> Likely not a problem in your case, just saying ... 20140221 19:19:51< aquileia> happygrue: I committed the khalifate images in a branch which unfortunately is based upon another PR, so I have to redo it... 20140221 19:21:42< SigurdFD> aquileia: even if so, it would take me a good bit longer than the time I have currently have available. 20140221 19:22:03< aquileia> ok, no problem 20140221 19:22:48-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev 20140221 19:23:20< mattsc> Hi crab_ 20140221 19:23:26< Crab_> hello 20140221 19:23:50< mattsc> I think I have stumbled upon a bug that I didn't know about in the RCA mechanism. 20140221 19:24:07< mattsc> Trying to remove a CA by name after reloading a savegame does not appear to work. 20140221 19:24:33< mattsc> Removing it in a scenario started from the beginning, and removing all CAs with [*] works. 20140221 19:24:41< mattsc> Is this something you are aware of? 20140221 19:25:13< Crab_> no, not aware. sounds like a bug 20140221 19:25:49< Crab_> do you have any simple how-to-reproduce instructions? 20140221 19:26:28< mattsc> Crab_: yes, give me a moment ... 20140221 19:26:47< mattsc> Crab_: so far, I have found that c->get_child() here: https://github.com/wesnoth/wesnoth-old/blob/master/src/ai/composite/component.cpp#L178 20140221 19:26:59< mattsc> returns null after reloading, but not before. 20140221 19:27:19< _8680_> aquileia, vultraz: Forcing a push (`git push --force` (`-f` is short for `--force`)) shouldn’t be too much of a problem if it’s to one’s own branch and/or repository, where it can’t overwrite other developers’ work. There is, however, still the risk of losing one’s own work if one’s not careful. 20140221 19:27:38< mattsc> Crab_: But I don't know why. The configs produced when using --debug-log=ai/mod look identical. 20140221 19:28:18< _8680_> If one’s force-pushing over one’s prior work, then generally it would be because one *wants* to overwrite that work. 20140221 19:28:30< _8680_> Accidents, however, are still possible. 20140221 19:28:50< Crab_> mattsc: maybe the C++ code loads the same config a bit differently from the save. 20140221 19:29:10< Crab_> PM me the how-to-reproduce instructions and I'll be happy to look at it 20140221 19:29:15< mattsc> Crab_: that would be my guess. Maybe the CA id's are not presistent or something 20140221 19:29:25< mattsc> Crab_: great! 20140221 19:29:28< mattsc> thanks 20140221 19:31:03-!- Crab_ [~Crab_@wesnoth/developer/crab] has quit [Quit: Crab_] 20140221 19:31:11-!- uruk-hai [~uruk-hai@1F2E8C08.catv.pool.telekom.hu] has joined #wesnoth-dev 20140221 19:35:04< uruk-hai> hi all! :) do i percieve it right that wesnoth is going to be participating in gsoc2014? 20140221 19:38:54< _8680_> aquileia: One of the advantages that Git has over less-branchy VCSs like SVN is that one can make many small commits — good for clarity, bug-fixing, and ease-of-review (as Soliton said) — on a private branch, and then that branch can be merged (with fast-forward disabled) into the master (or whichever) branch — an action that is itself represented as a commit (a ‘merge commit’) — and then, when viewing the commit log- 20140221 19:39:00< _8680_> -for the master branch, all those commits can be shown as just one commit — the merge commit, e.g., “Merge branch aquileia/utbs-animwml-update”. 20140221 19:40:03< aquileia> But then again a bisect wouldn't work? 20140221 19:40:54< _8680_> The commits are still there (if you don’t squash them), it’s just that you can view them in the logs as a single commit. 20140221 19:41:43< _8680_> One isn’t required to view them as a single commit if one doesn’t want to, either. 20140221 19:41:44< aquileia> That seems very convenient 20140221 19:42:43< aquileia> So next time... I do a branch on aquileia/wesnoth-old and do my changes there? Or do I have to branch the actual master each time? 20140221 19:43:10< _8680_> What do you mean by “the actual master”? 20140221 19:43:36-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has quit [Quit: leaving] 20140221 19:45:10< aquileia> o I have to branch aquileia/wesnoth-old or wesnoth/wesnoth-old to use it? 20140221 19:46:50< _8680_> To use what? 20140221 19:46:55-!- Bodhi-Baum [~Bodhi@dslb-084-063-040-175.pools.arcor-ip.net] has joined #wesnoth-dev 20140221 19:47:28< aquileia> The feature to get only one commit without loosing the detailed history 20140221 19:47:50< aquileia> happygrue: Happy birthday again: https://github.com/wesnoth/wesnoth-old/pull/104 20140221 19:48:38< _8680_> That works for any two branches; your branch being merged into master was only an example. 20140221 19:49:48< aquileia> So how do I get PR 99, 102, 104 to show in that way? They all are from branches 20140221 19:50:45< _8680_> If you’re staying up-to-date, the master branch should be the same in your local repository, your fork on GitHub (aquileia/wesnoth-old), and the authoritative (or upstream) repository (wesnoth/wesnoth-old). 20140221 19:50:54< aquileia> Although it's only relevant for 102 as the others are tiny 20140221 19:51:00< iceiceice> aquieia: "... the actual master ..." you would never branch the actual master most likely, you would simply creates branches on your fork of wesnoth-old 20140221 19:51:13< iceiceice> or more likely, on your local machine 20140221 19:51:30< iceiceice> and push the to aquileia / wesnoth-old 20140221 19:51:34< iceiceice> push *them 20140221 19:52:16< aquileia> but if I push them there, how can I have multiple PR at one time? 20140221 19:52:25< iceiceice> theres no limit to that 20140221 19:52:33< iceiceice> whenever you have a branch it can become a PR automatically 20140221 19:52:42< _8680_> aquileia: Use one branch for each PR. 20140221 19:52:52< iceiceice> i see 20140221 19:53:02< iceiceice> so your PR was merge aquileia master to wesnoth master 20140221 19:53:03-!- Bodhi-Baum [~Bodhi@dslb-084-063-040-175.pools.arcor-ip.net] has quit [Quit: Verlassend] 20140221 19:53:13< _8680_> If you push stuff to your fork’s master branch and then try to make a PR from that… well, don’t do that. 20140221 19:53:14< iceiceice> yeah i guess the more usual way would be , work locally on a topic branch 20140221 19:53:14< aquileia> yes 20140221 19:53:24< iceiceice> then push topic to aquileia/wesnoth-old 20140221 19:53:29< iceiceice> then make a PR of the topic 20140221 19:53:48< iceiceice> this way it makes it easy if you make mistakes along the way as well 20140221 19:53:51< iceiceice> so like, when i would start 20140221 19:53:53< iceiceice> i begin wtih 20140221 19:53:56< iceiceice> git checkout master 20140221 19:54:01< iceiceice> git pull upstream master 20140221 19:54:04< iceiceice> git push origin master 20140221 19:54:05< aquileia> But if topic is pushed... how to do a PR? 20140221 19:54:07< iceiceice> to get master synced everywhere 20140221 19:54:20< iceiceice> idk it just works in the github interface 20140221 19:54:28< iceiceice> whenever i push a branch to origin 20140221 19:54:37< iceiceice> because i originally made origin as a fork of wesnoth-old, 20140221 19:54:42< iceiceice> github just knows that i might want to make a PR of it 20140221 19:54:57< iceiceice> so when i go to the website it says "you pushed this branch 2 minutes ago, do you want to make a PR?" 20140221 19:55:52< aquileia> Ah, so it remembers there was the topic branch even though it is merged? 20140221 19:55:59< iceiceice> i dont ever merge it 20140221 19:56:07< iceiceice> the merge only happens when the PR is committed 20140221 19:56:23< aquileia> I meant pushe 20140221 19:57:00< iceiceice> yeah i mean when you push it that gives attention to the topic branch 20140221 19:57:31< iceiceice> anyways, after you push your topic branch, you can go on github and you will see exactly what the pull request will look like 20140221 19:57:37< _8680_> aquileia: Run `git log --graph` on a branch into which other branches have been merged, and search for “Merge”. Then do the same with `git log --graph --first-parent`. 20140221 19:57:37< iceiceice> i can show an example 20140221 19:58:45< iceiceice> heres a topic branch for something that will probably never actually be committed, but its an example anyways 20140221 19:58:46< iceiceice> https://github.com/cbeck88/wesnoth-old/compare/mp_settings_serialization 20140221 19:58:55< aquileia> So... I do a clean slate for my local master, branch it, push the branch, and a PR pops up? 20140221 19:59:03< iceiceice> yeah 20140221 19:59:10< iceiceice> and if the PR doesn't show up, 20140221 19:59:13< iceiceice> you can go to git hub 20140221 19:59:15< iceiceice> click on "branches" 20140221 19:59:18< iceiceice> and it will be listed there 20140221 19:59:22< iceiceice> you can click "compare" 20140221 19:59:26< iceiceice> which will show you the changes 20140221 19:59:37< iceiceice> and there will be a query "do you want to make a pr of this comparison 20140221 19:59:49< _8680_> aquileia: About commit messages — in general, a commit message should be formatted like an email message; a commit message’s summary line is equivalent to the subject line of an email, a commit message’s message body is equivalent to the message body of an email. 20140221 19:59:59-!- kex [~kex@89.205.75.19] has quit [Remote host closed the connection] 20140221 20:00:05< aquileia> Oh 20140221 20:01:00< aquileia> Then a bit more verbosity wouldn't hurt for the message body in future... 20140221 20:01:02< iceiceice> so, the other advantage of pushing topics to your origin before making PRs is that if you see something screwy you can still fix it 20140221 20:01:24< iceiceice> like, i will often see someting wierd, or decide the commits make more sense in a different order 20140221 20:01:27< iceiceice> and do git rebase -i master 20140221 20:01:39< iceiceice> or i guess in your case if you squashed too many you can git bisect 20140221 20:01:39< aquileia> Ok, I think I got it. 20140221 20:01:46< iceiceice> and then push --force origin to fix it all 20140221 20:02:21< _8680_> aquileia: The message body should be a full description and explanation of the changes that the commit makes, and the summary line should be a summary of that. 20140221 20:02:26< _8680_> aquileia: See also . 20140221 20:03:55< _8680_> Of course, project-specific standards take precedence; e.g., I’ve seen shadowm say to keep the summary line within 80 characters, rather than 50. 20140221 20:04:49< aquileia> I'll do my best to comply in future, but with so much information at once it might take a while 20140221 20:05:13< _8680_> Staying within 50 would still be good practice to better interoperate with external facilities like GitHub, which don’t know nor care about project-specific standards. 20140221 20:08:55< aquileia> I was at the limit - exactly 50 20140221 20:10:31< aquileia> happygrue: Should I add a changelog entry? 20140221 20:11:05< _8680_> Also see , if you didn’t before. 20140221 20:11:30< aquileia> I read the latter one 20140221 20:12:25< aquileia> But I'm new to git, so it is a little hard 20140221 20:14:34< aquileia> Right now I can't try, as my master is used for a PR 20140221 20:14:54-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Ping timeout: 252 seconds] 20140221 20:15:11-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 252 seconds] 20140221 20:17:20-!- iceiceice [~chris@207-237-132-90.ny.subnet.cable.rcn.com] has joined #wesnoth-dev 20140221 20:20:04< happygrue> uruk-hai: Wesnoth will participate if the application is approved. 20140221 20:20:27< happygrue> aquileia: changelog entry is needed, so that would be great 20140221 20:20:40< happygrue> "new baseframes for " 20140221 20:22:02< uruk-hai> happygrue: cool, thanks! :) i participated in gsoc13 and i just found wesnoth now. it's very impressing, so i am having a deeper look at the code and i just found this site: http://wiki.wesnoth.org/SummerOfCodeIdeas 20140221 20:22:10< uruk-hai> it's very helpful :D 20140221 20:23:40< irker886> wesnoth: mattsc wesnoth-old:master 47e78471b9dc / data/ai/micro_ais/scenarios/simple_attack.cfg: Simple Attack MAI test scenario: move Lua filter function into preload event http://git.io/TtkpfQ 20140221 20:23:43< happygrue> yep, feel free to ask any questions you have and someone who knows will eventually answer. ;) 20140221 20:24:19< uruk-hai> thank you :) 20140221 20:24:42< uruk-hai> btw all these ideas all very interesting to me, i can't even decide now :D 20140221 20:25:33< Ivanovic> wesbot: seen lipkap 20140221 20:25:33< wesbot> Ivanovic: Sorry, I don't know of lipkap. 20140221 20:25:37< Ivanovic> wesbot: seen lipkab 20140221 20:25:37< wesbot> Ivanovic: The person with the nick lipkab last spoke 2d ago. 2d ago was here and on the channel #wesnoth with the message: Quit: Vannak idők, mikor menni kell 20140221 20:25:57-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 20:28:30< aquileia> are 75 chars ok for before wrapping in the changelog? 20140221 20:28:38< uruk-hai> wow, so i am not the only hungarian here... :D 20140221 20:30:31< Coffee_irc> ping aquileia 20140221 20:32:13< aquileia> pong 20140221 20:32:24< Coffee_irc> notice my nick came up before 20140221 20:32:24< aquileia> hello 20140221 20:32:28< Coffee_irc> hi 20140221 20:32:40< Coffee_irc> you doing much with the new animation syntax? 20140221 20:32:56< aquileia> A 4000 line pull request 20140221 20:33:04< aquileia> So... yes 20140221 20:33:05< Coffee_irc> lol 20140221 20:33:27< Coffee_irc> can I take a look? 20140221 20:34:11< aquileia> In fact there is nobody to review it - it'd b great if you investigated 20140221 20:34:29< Coffee_irc> is it https://github.com/wesnoth/wesnoth-old/pull/104 ? 20140221 20:34:35< aquileia> https://github.com/wesnoth/wesnoth-old/pull/102 20140221 20:34:59-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has quit [Read error: Connection reset by peer] 20140221 20:35:03< happygrue> mattsc: when you say my /data dir, you mean just syncing up to current before building, right? 20140221 20:35:04< aquileia> 104 is a birthday present to happygrue 20140221 20:35:18< Coffee_irc> yeah, I was wondering where all the code was ;) 20140221 20:35:25< happygrue> hehe 20140221 20:35:44< happygrue> thanks aquileia, not going to be able to push it until I can get my build working to test it in game first 20140221 20:35:51< happygrue> and my build failed :( 20140221 20:36:09-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has joined #wesnoth-dev 20140221 20:36:14< happygrue> and I'm busy again! \o/ 20140221 20:36:47< mattsc> happygrue: well, in principle building _should_ sync the data directory, but I know that Xcode does not always do so (I'm speaking of syncing between the repository and build directories) 20140221 20:37:33 * zookeeper has a bad habit of leaving scenario rewrites for the last minute 20140221 20:38:27< zookeeper> also, a bug: events without primary units fail to trigger if there _is_ a [filter] block. 20140221 20:38:35< zookeeper> like, a new turn event for instance 20140221 20:39:00< happygrue> has anyone built in the past two hours? My errors have to do with https://github.com/wesnoth/wesnoth-old/commit/38afe48a4990e58272d6ee9dcbb5c78c47e616a5 20140221 20:39:04< happygrue> from what I can tell 20140221 20:40:25< aquileia> iceiceice: you changed singleplayer to single player ? 20140221 20:40:30< iceiceice> is that bad? 20140221 20:40:50< iceiceice> i did it instinctively i guess 20140221 20:40:53< happygrue> but I don't know if it is something that I am doing wrong or not. but I'm getting an undefined reference at that point 20140221 20:41:02< aquileia> It is inconsistent with "multiplayer" you use before 20140221 20:41:10< _8680_> happygrue: Travis has: . 20140221 20:41:16< iceiceice> yeah but single is a word and multi is a prefix 20140221 20:41:50< iceiceice> hmm 20140221 20:42:09< iceiceice> i think it built fine on mine... 20140221 20:42:13< _8680_> I’ll support ^^^. 20140221 20:42:22< _8680_> Though I’d have said “single-player”. 20140221 20:43:06< mattsc> happygrue: what system are you building on? 20140221 20:43:12< happygrue> like I said, maybe it's something I'm doing or not doing 20140221 20:43:19< happygrue> windows with code::blocks 20140221 20:44:07< mattsc> happygrue: my build failed too, it's because shadowm added files, so you need to add those to your project 20140221 20:44:14< mattsc> ... or wait for somebody else to do it 20140221 20:44:23< happygrue> mmm 20140221 20:44:35< happygrue> well, gotta be afk a bit, I'll look again when I can 20140221 20:44:54< aquileia> I agree, single-player seems the best 20140221 20:44:55< iceiceice> _8680_, aquileia: the main point of that fixup commit was to make it so the caption was "warning" rather than an "error" with a body "warning: ...", if anyone wants to rephrase go right ahead, aquileia i would be happy to recommit 20140221 20:45:49< mattsc> happygrue: fyi, after I add those, the build passes, so that is likely your problem. But I can't help you with a Windows build. 20140221 20:47:24< iceiceice> ok, im going to change it via a web interface commit i guess, as i dont want to change branches right now 20140221 20:47:55< aquileia> iceiceice: I'm no native speaker, so my opinion is insignificant as soon as someone else appears 20140221 20:48:31< iceiceice> it looks like you guys are right, it is hyphenated on wikipedia also :) 20140221 20:48:32< iceiceice> http://en.wikipedia.org/wiki/Single-player_video_game 20140221 20:48:42< mattsc> happygrue, fabi: and another fyi: starting an MP game with the build I just completed does not produce a black screen, but the minimap is still black. 20140221 20:50:10< irker886> wesnoth: cbeck88 wesnoth-old:master 179c18ae2714 / src/game_controller.cpp: fixup warning message http://git.io/DYa9TA 20140221 20:50:13-!- Crendgrim [~crend@wesnoth/forum-moderator/crendgrim] has quit [Quit: No Ping reply in 180 seconds.] 20140221 20:50:38-!- Crendgrim [~crend@37-4-131-59-dynip.superkabel.de] has joined #wesnoth-dev 20140221 20:50:46-!- Crendgrim [~crend@37-4-131-59-dynip.superkabel.de] has quit [Changing host] 20140221 20:50:46-!- Crendgrim [~crend@wesnoth/forum-moderator/crendgrim] has joined #wesnoth-dev 20140221 20:51:50-!- Samual_ is now known as Samual 20140221 20:55:00< irker886> wesnoth: mattsc wesnoth-old:master 35410430730d / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Update Xcode project http://git.io/L6LeSg 20140221 20:56:50-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev 20140221 20:56:54-!- ancestral [~ancestral@63.92.240.233] has quit [Client Quit] 20140221 20:57:08-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev 20140221 20:58:31< aquileia> Coffee_irc: So all [frame]s should be specified? 20140221 20:58:48< Coffee_irc> aquileia: ? 20140221 20:58:59< Coffee_irc> I am reviewing the pull request and leaving notes 20140221 20:59:12< Coffee_irc> not too many actually, it is well done 20140221 20:59:31< Coffee_irc> but the idle animation for the archer will play for female units the wrong frame I think 20140221 21:00:53< iceiceice> random question for any one who might know: does anyone know how well wesnoth runs on mac / windows systems under a linux emulator? 20140221 21:01:08< Coffee_irc> iceiceice: just fine 20140221 21:01:29< Coffee_irc> I can run wesnoth on windows xp virtual machine 20140221 21:01:33< iceiceice> does it improve any of these graphical issues that people complain about? 20140221 21:01:52< Coffee_irc> well, I don't rally complain much about graphics myself 20140221 21:02:17< iceiceice> yeah i feel like at least the way i use wesnoth, i woudlnt want it to be full screen anyways 20140221 21:02:41< iceiceice> but at least this is something we could tell people as a workaround 20140221 21:02:47< Coffee_irc> new graphics cards don't have much issues with playing something not stressful to the card like wesnoth 20140221 21:03:13< Coffee_irc> even cheap <$50 one like I have 20140221 21:03:26-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai] 20140221 21:03:41< iceiceice> yeah i guess any graphics card at all is more than wesnoth needs 20140221 21:04:38< _8680_> BfW doesn’t use graphics cards, or so I’ve heard. 20140221 21:04:48< Coffee_irc> _8680_: lol 20140221 21:05:21< Coffee_irc> when you render pngs you use the graphics card 20140221 21:05:22< zookeeper> i'm sure all the graphics bits go through the graphics cards, but i guess that's about it :p 20140221 21:05:25< aquileia> Well, SDL2 is on the way! 20140221 21:05:47-!- SigurdFD [~SigurdFD@24.154.98.89] has quit [] 20140221 21:06:07< _8680_> At least, I’m told SDL 1 does all rendering in the CPU. 20140221 21:06:26< iceiceice> you wait until 1.14, we might use the graphics card to speed up AI computations :p 20140221 21:07:50< Ivanovic> lipkab: the pandora port works nicely in latest git master 20140221 21:08:16< Ivanovic> just managed to test it and the speed for showing the story images of two brothers is okay, unchanged to 1.11.9 20140221 21:08:39< aquileia> Coffee_irc: I thought I had messed it up - when I created archers via debug with random gender, I only got males 20140221 21:08:41< irker886> wesnoth: Chris Beck wesnoth-old:master 3d65f9741c74 / src/ (playturn.cpp playturn.hpp): Option abort -> Option Save and Abort http://git.io/scd7BA 20140221 21:08:43< irker886> wesnoth: Chris Beck wesnoth-old:master 712c3feb1a53 / changelog: update changelog http://git.io/VtuFJg 20140221 21:08:45< irker886> wesnoth: cbeck88 wesnoth-old:master 25c1a9bfc64b / changelog src/playturn.cpp src/playturn.hpp: Merge pull request #105 from cbeck88/save_and_abort http://git.io/9L9hBg 20140221 21:08:51< _8680_> Given what I’ve heard of how AI computations work, that seems like a GPGPU-appropriate task, but it also seems like to large an effort to expect it to be completed in just two years. 20140221 21:08:59< aquileia> But the campaign itself creates females as well 20140221 21:09:01< _8680_> s/to large/too large/ 20140221 21:09:37< _8680_> But maybe I’m overestimating the difficulty of converting the AI to GPGPU. 20140221 21:09:37< iceiceice> _8680_: maybe you are right about that 20140221 21:09:43< Coffee_irc> aquileia: what's happening with the desert star? 20140221 21:09:45< iceiceice> y i really can't say 20140221 21:10:12< Coffee_irc> aquileia: oh, you are using a base unit 20140221 21:10:22< aquileia> I compared with the Shyde and it's really just an additional halo 20140221 21:10:55< aquileia> So I cloned all animations with base unit 20140221 21:10:58< Coffee_irc> aquileia: given the description, I suppose that makes sense 20140221 21:11:48-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 21:11:50< aquileia> While playing you can't be sure, but in the code it's clear there is nothing new 20140221 21:12:03< Coffee_irc> aquileia: all good 20140221 21:12:24< Coffee_irc> aquileia: next up is the divine incarnation 20140221 21:12:32< Coffee_irc> why have you removed the contents? 20140221 21:14:33< aquileia> Another base unit 20140221 21:14:36-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 21:14:57< Coffee_irc> aquileia: you can always override it if the contents don't match 20140221 21:15:39< aquileia> I checked th archer - it is visible for 1 frame, after that the bow is in front 20140221 21:16:22< Coffee_irc> aquileia: if ou make the idle animation the male one, then you can substitute the female variant with the base image 20140221 21:16:27< Coffee_irc> *you 20140221 21:16:37-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 265 seconds] 20140221 21:16:48< Coffee_irc> this is how the red mage line works 20140221 21:17:11< aquileia> I thought perhaps the one frame can be substituted, I'm searching something appropriate 20140221 21:17:36< Coffee_irc> in the substitution you can change the length of the idle animation as well 20140221 21:17:41< Coffee_irc> just for the female variant 20140221 21:17:54< Coffee_irc> if it makes sense to do so 20140221 21:22:04< irker886> wesnoth: mattsc wesnoth-old:master dd14b85d554f / changelog: Update changelog http://git.io/eKmnRQ 20140221 21:25:13< Coffee_irc> aquileia: apart from the 2 notes I put in the pull request looks good to me 20140221 21:25:45< Coffee_irc> thanks, that's a fair amount of work you did there 20140221 21:25:48< aquileia> but why attack_frame? 20140221 21:26:47< Coffee_irc> aquileia: because that's what was in the old code for the corrupted elf? 20140221 21:27:02< Coffee_irc> on the attack 20140221 21:28:12< aquileia> ... no? 20140221 21:28:21< Coffee_irc> looks like it to me ;) 20140221 21:28:31< Coffee_irc> otherwise the attack frame is not being used anywher 20140221 21:28:35< Coffee_irc> *anywhere 20140221 21:29:04< Coffee_irc> talking about the sword attackfo the corrupted elf 20140221 21:29:11-!- Upth [~ogmar@108-85-91-228.lightspeed.frokca.sbcglobal.net] has quit [Ping timeout: 260 seconds] 20140221 21:29:54-!- Upth [~ogmar@108-85-91-228.lightspeed.frokca.sbcglobal.net] has joined #wesnoth-dev 20140221 21:30:03< aquileia> Both old and new version have [frame] and not [attack_frame] 20140221 21:30:45< aquileia> Ah, I understand 20140221 21:31:10< Coffee_irc> the image is the wrong one 20140221 21:32:16< aquileia> yes - I always looked at the frame and never at the image 20140221 21:33:18-!- LordBob_ [~LordBob_@2a01:e34:ee82:47e0:21e:c2ff:fe01:261f] has joined #wesnoth-dev 20140221 21:33:42< Coffee_irc> hopefully the new syntax will make this less likely to occur in the future when any new unit animations might be made 20140221 21:34:31< LordBob_> hi team 20140221 21:34:43< Coffee_irc> hello 20140221 21:35:20< iceiceice> hi LordBob 20140221 21:35:41-!- uruk-hai [~uruk-hai@1F2E8C08.catv.pool.telekom.hu] has quit [Quit: Leaving] 20140221 21:36:05< LordBob_> I've got some free time at last. We're still not frozen before the immanent 1.12, are we ? 20140221 21:36:35< LordBob_> (got a couple of finished pieces that I can commit as soon as my repo is up to date) 20140221 21:36:41< aquileia> some hours to go 20140221 21:37:01< LordBob_> good, that should do it :) 20140221 21:37:34< aquileia> Coffee_irc: I inserted a separate idle for the female, but it doesn't display 20140221 21:38:00< Coffee_irc> aquileia: might have to move the other idle above the [female] part 20140221 21:38:08< aquileia> I did 20140221 21:38:35< Coffee_irc> does it match the number of frames? 20140221 21:38:43< Coffee_irc> [frame] blocks that is 20140221 21:38:45< aquileia> Could it be because both match the filter and so they are added? 20140221 21:38:55< aquileia> different blocks 20140221 21:39:24< Coffee_irc> aquileia: can you pastebin it? 20140221 21:39:40< happygrue> Can someone please test and push this: https://github.com/wesnoth/wesnoth-old/pull/104 20140221 21:39:57< happygrue> I won't be able to test it and have run out of time, I may not get to it before the release, not sure 20140221 21:40:31< happygrue> maybe it doesn't even need to be tested, I just like to look at stuff in game before I commit 20140221 21:40:32< aquileia> http://pastebin.com/u9FYi7Ty 20140221 21:40:50< aquileia> I suppose the [frame] count has to be the same? 20140221 21:41:15< Coffee_irc> aquileia: yes 20140221 21:41:34< aquileia> The 2500 was for test reasons in case you wonder 20140221 21:42:10< Coffee_irc> if you can make a semi-decent "idle animation" from combining the existing female base sprites that would be good, but otherwise just use the base frame for no idle 20140221 21:42:23< Coffee_irc> that's how I would do it 20140221 21:43:46< AI0867> Coffee_irc: what's with the [attack_frame] thing? 20140221 21:43:58< aquileia> A misunderstanding 20140221 21:44:22< Coffee_irc> one of the attack images wasn't displaying in the pull request 20140221 21:44:44< aquileia> he spoke about the -attack version of the image, and I thought he meant the frame type 20140221 21:45:45< Coffee_irc> aquileia: you could make an idle animation by using the first bow frames for the female elf, lifing the bow without the projectile and back down? 20140221 21:46:02< Coffee_irc> don't know if it is worth it though 20140221 21:46:39< aquileia> I'd either do the same movement or just do a static replacement 20140221 21:47:57< Coffee_irc> aquileia: ok 20140221 21:47:57< iceiceice> lol, this is a good error message: "You are about to open a security breach in Wesnoth. Are you sure you want to continue? If you have downloaded add-ons, do not click 'ok'! They would instantly take over your computer. You have been warned." 20140221 21:49:06< Coffee_irc> iceiceice: I fail to see the humor in that :P 20140221 21:49:07< aquileia> Trying the static replacement still plays the animation... 20140221 21:49:43< Coffee_irc> aquileia: have you quit wesnoth and started it again? 20140221 21:49:59< aquileia> F5 20140221 21:50:51< aquileia> the same after restart 20140221 21:50:58< Coffee_irc> hmm 20140221 21:51:24< aquileia> and by the way... idles aren't affected by acceleration settings? 20140221 21:51:51< Coffee_irc> aquileia: no they are not 20140221 21:52:06< aquileia> ok 20140221 21:53:01< Coffee_irc> aquileia: look at the core arch mage file 20140221 21:53:19< Coffee_irc> this achieves the effect of replacing the idle animation with static one for the [female] variant 20140221 21:53:23 * aquileia will do 20140221 21:56:56< irker886> wesnoth: Emilien Rotival wesnoth-old:master b9418a52f120 / images/icons/ (54 files in 2 dirs): Added some 30x30 action and arrow icons that were missing http://git.io/27Ujqw 20140221 21:56:58< irker886> wesnoth: Emilien Rotival wesnoth-old:master 69e09f7f0e26 / data/core/ (3 files in 3 dirs): New generic wraith portrait http://git.io/5NuS4A 20140221 21:57:48< LordBob_> vultraz : ^ 20140221 21:58:05< LordBob_> That had been due for quite some time 20140221 21:58:39< aquileia> I don't get it - I do exactly the same 20140221 21:58:44< LordBob_> And now, the mudcrawler 20140221 21:59:11< Coffee_irc> aquileia: can you post the whole file on pastebin 20140221 22:00:18< aquileia> http://pastebin.com/unC73eQe 20140221 22:01:24< iceiceice> Coffee_irc: i feel we might as well write "If you do this, your computer monitor will turn into a gateway to hell, and demons will pull you in never to be heard from again. You have been warned." 20140221 22:01:25< aquileia> LordBob_: Oh, frames or portrait? 20140221 22:01:37< LordBob_> portrait 20140221 22:02:27< aquileia> Ok, base_unit will automatically take these for the small mudcrawler as well 20140221 22:02:34< LordBob_> I'd started that portrait like...two years ago, finished it last year, then waited another 6 months before I completed the lines 20140221 22:03:11< LordBob_> oh wait, you mean the mudcrawler, not the writh. Wraith portrait, mudcrawler frames 20140221 22:03:59< aquileia> Normal mudcrawler? 20140221 22:04:05-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has quit [Ping timeout: 252 seconds] 20140221 22:04:55< LordBob_> Yup. I did the standard attack/defense/death/ranged set last year, but left a nasty twist in the attack frames 20140221 22:04:56< Coffee_irc> iceiceice: much better ;) 20140221 22:05:19< LordBob_> So I'm off to fix that at last 20140221 22:05:40< aquileia> There are going to be real melee frames? Or do you speak of the ranged one? 20140221 22:06:39< LordBob_> I did both. The frames are already committed, but I don't know if they were propoerly wired in. 20140221 22:06:39< aquileia> Oh wait... these aren't those for the Giant Mudcrawler already in the game? 20140221 22:06:45< Coffee_irc> aquileia: I think the problem with the desert archer is with gender distinction 20140221 22:06:49< LordBob_> the very same 20140221 22:06:52< Coffee_irc> all the debug units are male 20140221 22:07:05< aquileia> I used a non-debug unit 20140221 22:07:35< Coffee_irc> aquileia: the unit_type says all should be male 20140221 22:07:35< aquileia> first UtBS scenario, move to the village and you immediately gat a female one 20140221 22:08:02< aquileia> s/gat/get 20140221 22:08:36< shadowm> vultraz: The AtS E1S11.2 -> E1S12 transition relies on shroud_data internally through Lua. 20140221 22:09:06< shadowm> If it's an engine feature, you'd better assume somebody out there uses it. 20140221 22:09:22< aquileia> LordBob_: I thought you spoke of the L1, and in this case there is a clone in UtBS ehich I edited this morning. If you speak about the giant one, this doesn't interfere 20140221 22:09:24< Coffee_irc> aquileia: your file works for me 20140221 22:09:33< Coffee_irc> aquileia: the female one does not move on idle 20140221 22:09:59< LordBob_> yup, it's the giant mudcrawler I'm working on 20140221 22:11:12< aquileia> Aaaah 20140221 22:11:15-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev 20140221 22:11:17< shadowm> AI0867: Surely wesnothd wouldn't run as root in that case, right? 20140221 22:11:27< Coffee_irc> aquileia: I'm off to work soon, but let me know when you are happy with the pull request and I can pull it through 20140221 22:11:31< iceiceice> ok i have basically implemented an idle controller mode now, i'm now sort of testing / evaluating what adjustments need to be made, if anyone wants to have a look here's my branch: https://github.com/cbeck88/wesnoth-old/compare/idle_controller 20140221 22:11:51< aquileia> I'll try to get it ready the next 15 minutes 20140221 22:12:06< Coffee_irc> aquileia: no hurry, I won't be able to pull it for a couple of hours 20140221 22:12:19< shadowm> aquileia: # wmllint: no spellcheck is supposed to be used only on the same line to not spellcheck or the preceding one. 20140221 22:12:20< aquileia> Ok 20140221 22:12:51< Coffee_irc> oh, the 22nd is the feature freeze :P 20140221 22:12:56< aquileia> shadowm: What happened for the divine avatar, then? 20140221 22:14:27< Coffee_irc> aquileia: well, if you need to get it in earlier it looks all good to me, but I have to head off 20140221 22:14:48< shadowm> aquileia et al: Unit image updates that do not delete existing files ("image not found") have never been particularly frowned upon post-feature-freeze, btw. Animations are not included in the set of data that has to be synchronized in MP or replays. 20140221 22:16:20< shadowm> _8680_: When I say I prefer within 80 chars instead of 50 that's my personal preference, really. I find GitHub's 69 characters limit particularly ridiculous. 20140221 22:16:50< shadowm> zookeeper: Last-minute rewrites are always a bad idea. :( 20140221 22:17:14< shadowm> mattsc, happygrue: Oops, I forgot to build on my Windows VM afterwards. 20140221 22:17:33< shadowm> Coffee_irc: Wesnoth doesn't really use your graphics card. 20140221 22:18:43< shadowm> Coffee_irc: All Wesnoth does is entirely restricted to the CPU on the system's virtual memory. Your operating system will eventually get Wesnoth's render output and it may or may not finally render it onto a hardware framebuffer. 20140221 22:19:02< shadowm> But it's not Wesnoth's responsibility to do so and it's the final result in any case. 20140221 22:19:06-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 22:19:35-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 22:19:46-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit] 20140221 22:19:47< shadowm> LordBob_: Hi! 20140221 22:19:56< shadowm> Okay, I'm done reading the backlog. 20140221 22:20:08< LordBob_> hehe.Hi Shadowm 20140221 22:20:29< iceiceice> fabi: actually if you have a moment, I think I have a few quick questions you might be able to help me with 20140221 22:20:31-!- exciton_ [chuck-the-@77.51.174.228] has joined #wesnoth-dev 20140221 22:20:40< shadowm> LordBob_: When redesigning our UI widgets, did you by any chance do anything for progress bars? 20140221 22:20:41-!- Gambit [~derek@pa-67-234-76-186.dhcp.embarqhsd.net] has joined #wesnoth-dev 20140221 22:20:46-!- Gambit [~derek@pa-67-234-76-186.dhcp.embarqhsd.net] has quit [Changing host] 20140221 22:20:46-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev 20140221 22:21:11< AI0867> shadowm: I think start-stop-daemon and the like can take care of that? 20140221 22:21:11< shadowm> aquileia: I see a lot of back-and-forth activity regarding PR #102. Can I review it now? 20140221 22:21:22< aquileia> Not yet 20140221 22:21:32< shadowm> AI0867: I don't have systemd, never used it. 20140221 22:21:39< aquileia> Coffee verified all but two files are ok 20140221 22:21:50< aquileia> I'm doing a last change 20140221 22:23:19< aquileia> It's a little bit jumpy, but I think it is ok as an idle 20140221 22:23:31< LordBob_> shadowm: good point. I've been willing to do something about them for ages, however from what little I understood they're not handled via wml so I could never find the files to updatre 20140221 22:24:15-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 260 seconds] 20140221 22:24:37< LordBob_> if you know enough on the subject to provide a short brief, I'll wip up something. Any sort of glowie stuff will be better than the current flat bar... 20140221 22:24:39< fabi> shadowm: The progress bar is drawn by raw sdl commands iirc. 20140221 22:24:46< fabi> iceiceice: hi 20140221 22:24:49< shadowm> LordBob_: Yeah, all three versions of the progress bar are hardcoded. 20140221 22:24:58< LordBob_> oh, hi fabi 20140221 22:25:01< shadowm> (The loadscreen progressbar, the GUI1 progressbar, and the GUI2 progressbar.) 20140221 22:25:35< iceiceice> fabi: i'm trying to set up an idle controller mode, it should basically work the same as if there is an observer controlling the side which is not doing anything 20140221 22:25:35< shadowm> fabi: Hi. I've been trying to get your attention for days. :\ 20140221 22:25:49< shadowm> fabi: I need you to review some commits. 20140221 22:25:55< iceiceice> i'm not sure exactly what the engine loop should be, i'm sort of making guesses based on what other things look like and seeing what happens 20140221 22:26:07< iceiceice> shadowm's stuff is probably more important, i will keep chugging away :) 20140221 22:26:40< LordBob_> shadowm, fabi: So the current code says something like "take flat blue rectangle and stretch it", right ? 20140221 22:27:17< shadowm> LordBob_: It's more like "draw flat blue rectangle with these specific dimensions", then "draw slightly lighter blue rectangle with smaller dimensions", and so on. 20140221 22:27:28< LordBob_> Ugh. 20140221 22:27:29< fabi> LordBob_: It says draw blue pixel at x,y 20140221 22:27:35< shadowm> Not necessarily in that order, but you get the idea. 20140221 22:28:20< shadowm> Of course, that could be changed to use image files if there was something appropriate for a progress bar. 20140221 22:28:54< shadowm> I tried using the scrollbar slider's main image for the GUI2 progress bar and the results were less than spectacular due to stretching. 20140221 22:28:59< aquileia> shadowm: 102 can be pulled now 20140221 22:29:14< LordBob_> So we could instead have it do "take [bar with gradient image file] and stretch, overlay [glowie stuff image file] on the right" ? 20140221 22:29:30< fabi> shadowm: I can't help you much this evening, maybe the rest of the weekend I will find some time. 20140221 22:29:59< shadowm> LordBob_: Yeah, at least it's easier for the GUI2 one (used for connecting to the add-ons server). 20140221 22:30:13< shadowm> fabi: Wel, one of the commits involves translatable strings and... see the topic. 20140221 22:31:23< shadowm> fabi: It's not that large: https://github.com/wesnoth/wesnoth-old/commit/1ce9448b1e92aebd91f341517811600a1c4dec39 20140221 22:31:54< LordBob_> Ok. One progress bar coming, right after the mudcrawler 20140221 22:32:14< fabi> shadowm: They are fine. I already commented on them some days ago. 20140221 22:32:50< aquileia> shadowm: And Coffee already reviewed it, he just couldn't wait for the last commit with the fixes 20140221 22:34:33< shadowm> fabi: The Pandora one is only useful for the Pandora, right? 20140221 22:35:27< shadowm> LordBob_: No need to hurry, I don't think I'll work on it during the upcoming hours before the freeze. :( 20140221 22:36:18< LordBob_> Aw :s 20140221 22:36:49< LordBob_> Are we freezing for the stable release this time ? 20140221 22:37:06< shadowm> Yes. 20140221 22:37:09< shadowm> No. 20140221 22:37:24< LordBob_> Pick one ? 20140221 22:37:24< shadowm> I mean, not for the stable release, but for the start of the beta series for it. 20140221 22:38:25< LordBob_> This means we won't have the opportunity to update thoses bars in the stable release, right ? 20140221 22:38:55< LordBob_> Or are these sort of cosmetic features acceptable exceptions ? 20140221 22:38:57< shadowm> It depends on how intrusive the code changes turn out to be. 20140221 22:39:32< shadowm> I may do it anyway since the loadscreen and the widgets are fairly isolated units. 20140221 22:39:43< LordBob_> Ok. Let me cross those fingers 20140221 22:40:11< LordBob_> By the way, I've also got the new favicon ready. Where do you want it committed ? 20140221 22:42:08< irker886> wesnoth: Ignacio R. Morelle wesnoth-old:master e2eebe817e6d / projectfiles/CodeBlocks/wesnoth.cbp: CodeBlocks project update http://git.io/BHXeJw 20140221 22:42:26< shadowm> LordBob_: The resources repository: https://github.com/wesnoth/resources 20140221 22:42:34-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Remote host closed the connection] 20140221 22:42:36< shadowm> Formerly known as the /resources dir in the main repository. 20140221 22:42:49< shadowm> happygrue: Updated the CB project file. 20140221 22:46:12< shadowm> aquileia: Re https://github.com/aquileia/wesnoth-old/commit/783a8be66b02203fd7104254ec7ee02b132dd692, wouldn't this mean that the melee attack ends up listed after the ranged attack in the attack dialog? 20140221 22:46:23< shadowm> Not that it's terribly relevant since the player is never in command of that unit type. 20140221 22:47:53< shadowm> Regarding the [else] path deletion in https://github.com/aquileia/wesnoth-old/commit/ff9e674927f40c11c68da9190035e7399e8b9c65 , what was Coffee_irc 's verdict? I must've missed it. 20140221 22:49:26< shadowm> Otherwise looks good to me, I'll merge it as soon as I take care of some stuff at home. 20140221 22:49:36-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has quit [Quit: Page closed] 20140221 22:50:26-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has joined #wesnoth-dev 20140221 22:50:48< aquileia> shadowm: Yes, the ranged is above 20140221 22:50:50< shadowm> fabi: Also, you don't happen to have a fix for the LoW bigmaps (or lack thereof) there? I may commit my own if you [Ddon't. 20140221 22:52:11< zookeeper> what's wrong with it? i'm not volunteering for anything, just curious 20140221 22:52:30< aquileia> shadowm: he din't comment directly on the else path, but he didn't complain when reviewing 20140221 22:53:00< shadowm> zookeeper: There is no bigmap picture beneath the paths for scenario 2 and every other scenario I've played up to this point. 20140221 22:53:29< shadowm> Apparently there's a macro inclusion missing from every scenario's [story][part] containing the journey markers. 20140221 22:53:59< zookeeper> right. that sure does sound like a problem :p 20140221 22:54:49< shadowm> I mean, the journey markers are there, just not the map, which is provided by a separate macro. 20140221 22:56:30< aquileia> shadowm: And I tested it - no difference after omitting the else 20140221 22:58:07-!- mattsc [~mattsc@fw.hia.nrc.ca] has left #wesnoth-dev [] 20140221 23:00:13-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev 20140221 23:03:04-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140221 23:04:39-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev 20140221 23:04:49-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 252 seconds] 20140221 23:09:53-!- timotei_ [~timotei@wesnoth/developer/timotei] has quit [Quit: leaving] 20140221 23:10:19-!- timotei_ [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev 20140221 23:19:15< aquileia> zookeeper: Do you prefer if I run wesnoth-resources in parallel or should it be merged with wesnoth/resources ? Keeping it separate would definitely make it easier to update 20140221 23:24:48-!- exciton_ [chuck-the-@77.51.174.228] has quit [Read error: Connection reset by peer] 20140221 23:25:03-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev 20140221 23:31:40-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai] 20140221 23:33:26-!- mjs-de [~mjs-de@f048209017.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140221 23:37:00< zookeeper> aquileia, i dunno, but if i'm asked to merge something then i guess the one which requires the least clicks from me... 20140221 23:37:52< aquileia> So I'll keep it separate - 0 klicks 20140221 23:38:07< aquileia> s/klicks/clicks 20140221 23:50:41-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140221 23:53:53< irker886> wesnoth: ln-zookeeper wesnoth-old:master 30d5f78fa278 / / (5 files in 4 dirs): Rewrote 'Captured'. http://git.io/HGTDqg 20140221 23:54:00 * zookeeper hopes it's better than the old one 20140221 23:54:24-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140221 23:54:51-!- _8680_ [~8680@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Ping timeout: 272 seconds] 20140221 23:55:20< zookeeper> if anyone has EI saves with which to test then that would be nice, but i don't think it can be terribly broken considering how many times i've tested it myself 20140221 23:56:18-!- _8680_ [~8680@2002:4404:712c:0:112e:dda:fdf1:bb4] has joined #wesnoth-dev --- Log closed Sat Feb 22 00:00:32 2014