--- Log opened Wed Apr 08 00:00:23 2015 --- Day changed Wed Apr 08 2015 20150408 00:00:23< shadowm> I've explained before why refactoring changes are usually not stable branch material. Are you 100% certain this can't possibly break anything? 20150408 00:00:27< gfgtdf> shadowm: i just wanted to push it to my fork for a travis build. 20150408 00:00:54< gfgtdf> shadowm: it is required for fixing 'time over' events 20150408 00:02:22< gfgtdf> shadowm: i'm quite sure, its not a very complicated commit, we just add a base class toa class and then mode code from constructor/destructor to that base class 20150408 00:02:33< gfgtdf> s/mode/move 20150408 00:02:54< iceiceice> vultraz: there are many other ways to disable it or bypass it. but yeah i'll have to debug that. 20150408 00:03:28< shadowm> gfgtdf: Okay. 20150408 00:07:39< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 599504cee354 / data/tools/Makefile: Exclude data/test from reindent target http://git.io/veKWj 20150408 00:07:42< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 9ca00bdac6d5 / data/ (5 files in 5 dirs): wmlindent pass http://git.io/veKle 20150408 00:07:45< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 6e98e1fb40b9 / data/ (6 files in 6 dirs): wmlindent pass http://git.io/veKlv 20150408 00:07:48< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 62dd94a55a1b / data/tools/Makefile: Exclude data/test from reindent target http://git.io/veKlf 20150408 00:10:39< irker403> wesnoth: aquileia wesnoth:master 24d46b7a744c / src/addon/manager.cpp: addon manager: Allow comments in _server.ign http://git.io/veKlA 20150408 00:10:41< irker403> wesnoth: aquileia wesnoth:master 347cf2296d1d / src/addon/manager.cpp: drop support for 'single-file addons', part 2 http://git.io/veKlx 20150408 00:10:43< irker403> wesnoth: aquileia wesnoth:master ad65f1feea1b / src/addon/manager.cpp: Merge pull request #386 from aquileia/addon_single http://git.io/veKlp 20150408 00:11:37-!- aquileia [95acd0d3@gateway/web/freenode/ip.149.172.208.211] has joined #wesnoth-dev 20150408 00:11:49< aquileia> shadowm: Done 20150408 00:12:06< shadowm> Elvish_Hunter: You didn't run wmllint on the mainline campaigns, did you. :) 20150408 00:12:50< shadowm> aquileia: Okay, thanks. 20150408 00:13:04< vultraz> I thought 386 was nay-ed 20150408 00:13:31< aquileia> And if two repo admns had issues with your PR, wouldn't you prefer one of them to merge as well? 20150408 00:13:56< shadowm> Maybe if I didn't have push access. 20150408 00:14:16< shadowm> Or knew the admins weren't ridiculously busy with other things at the time. 20150408 00:14:23< aquileia> vultraz: I removed the offending change and re-enabled ../addon.pbl 20150408 00:14:35< vultraz> what was the offending change? 20150408 00:15:12< aquileia> well, disabling the old ../addon.pbl style 20150408 00:15:26< aquileia> sorry for being unclear 20150408 00:15:46< vultraz> so... what exactly was dropped, then 20150408 00:16:11< aquileia> ../addon.cfg & ../addon.ign 20150408 00:16:50< vultraz> ah, the forerunner of _main.cfg 20150408 00:17:27< vultraz> so all addon content must now be within the addon folder, except the pbl which may be outside? 20150408 00:17:50< aquileia> Yes, it's the only allowed exception now AFAICT 20150408 00:18:10< vultraz> Ok, good 20150408 00:18:17< aquileia> well, as long as you use the 1.13 addon manager - a 1.12 client can still upload the old style addons 20150408 00:21:04< shadowm> Until I manage to get some things done and break protocol compatibility with 1.5.x - 1.12.x clients in 1.13.1 or 1.13.2, anyway. 20150408 00:22:22< vultraz> Can someone do me a favor and tell me whether the quintain is showing up with old images in the tutorial 20150408 00:24:41< shadowm> aquileia: Is there a particular reason master and 1.12's versions of Dwarvish_Rune_Lord.cfg differ? 20150408 00:24:54< shadowm> THoT's. THoT's file with that name in units/. 20150408 00:25:06< vultraz> Yes 20150408 00:25:17< vultraz> New variation image, for one 20150408 00:25:26< vultraz> So he no longer becomes a lich 20150408 00:25:55< shadowm> And this can't be backported to 1.12? 20150408 00:26:31< shadowm> I guess because the unit id changes would break old saves of one or two scenarios. 20150408 00:27:18< vultraz> Let's restrict the save-breaking changes to master 20150408 00:27:55< aquileia> I'm off again... 20150408 00:28:00< shadowm> The description for the prerevelation unit has {SPECIAL_NOTES_ARCANE} but no arcane attacks, I'm removing that. 20150408 00:28:32< shadowm> "../../data/core/editor/help.cfg", line 14: possible misspelling "TODO" 20150408 00:28:42< shadowm> :( 20150408 00:28:42< aquileia> shadowm: I think the other unit inherits the description though? 20150408 00:28:57< shadowm> Yes. 20150408 00:29:20< shadowm> But wmllint doesn't see that AFAICT, and neither does the player if they check the prerevelation unit's description. 20150408 00:29:21< aquileia> And in that case you can't omit the note (we tried, but wmlint will complain) 20150408 00:29:32< shadowm> Oh, so it complains either way? Great. :\ 20150408 00:30:10< aquileia> You can of course copy the description and add the note, that would work I guess 20150408 00:30:12< shadowm> I think there's a way to get it to omit the special notes check, though, I'll get on it shortly. 20150408 00:30:40< shadowm> Hm. 20150408 00:31:08< shadowm> I don't know, I just want wmllint to not complain. I doubt many people check the description for special units like this anyway. 20150408 00:33:14< aquileia> That's how it is handled in master - vultraz copied the description: https://github.com/wesnoth/wesnoth/blob/master/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg#L28 & https://github.com/wesnoth/wesnoth/blob/master/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg#L78 20150408 00:34:22< shadowm> I'll get back to this after dealing with variation_id vs. variation_name in UtBS and TRoW. 20150408 00:34:34-!- aquileia [95acd0d3@gateway/web/freenode/ip.149.172.208.211] has quit [Quit: Page closed] 20150408 00:35:56< shadowm> Also HttT. 20150408 00:36:44-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20150408 00:39:32< shadowm> wmllint on help.cfg is a mess. 20150408 00:39:49< vultraz> yes 20150408 00:39:53< vultraz> and in editor help 20150408 00:40:00< shadowm> Were new topics added? 20150408 00:40:11< vultraz> No, I removed topics 20150408 00:40:50< vultraz> merged editor overview with editor toplevel 20150408 00:41:04< shadowm> I think somebody just didn't pay attention to the markcheck off/on sections. 20150408 00:41:06< vultraz> merged gameplay Fundamentals of Gameplay with gameplay toplevel 20150408 00:41:09< shadowm> I'm on it. 20150408 00:41:37< vultraz> merged introduction Overview with introduction toplevel 20150408 00:49:35< shadowm> "../../data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg", line 1598: unit speaks in his/her "die" event rather than "last breath" 20150408 00:49:46< shadowm> Who do I bother about this? 20150408 00:52:51< vultraz> I'll deal 20150408 00:53:03< gfgtdf> vultraz: i think i'll name teh function add_diaog_tree_node instead of add_diaog_tree_value 20150408 00:53:31< vultraz> gfgtdf: ok sounds good 20150408 00:53:37< shadowm> "../../data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg", line 1227: possible misspelling "{_AMOUNT}" 20150408 00:53:59< shadowm> I don't even want to check the file, but I hope it's not what I think it is. 20150408 00:54:08< vultraz> GROAN 20150408 00:54:11< vultraz> GROAN GROAN 20150408 00:55:27< shadowm> Okay, it's not. 20150408 00:55:54< shadowm> shadowm@nanacore:~/src/wesnoth% egrep -RI '".*{' po/*/*.pot 20150408 00:55:54< shadowm> po/wesnoth-low/wesnoth-low.pot:msgid "$left_behind_{NAME} and $l3_store_{NAME}[$i].name" 20150408 00:55:57< shadowm> po/wesnoth-low/wesnoth-low.pot:msgid "$left_behind_{NAME}|, $l3_store_{NAME}[$i].name" 20150408 00:56:16< shadowm> Idem for 1.12. 20150408 00:56:44< shadowm> (That's bad.) 20150408 00:57:33< shadowm> "../../data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg", line 1791: possible misspelling "un-life." 20150408 00:57:44< shadowm> Existing instances in mainline spell this as 'unlife' instead. 20150408 00:58:03< shadowm> Two of them come from the same campaign, too. 20150408 01:02:42< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 88b749f74104 / data/campaigns/The_Rise_Of_Wesnoth/units/ (Wesfolk_Lady.cfg Wesfolk_Leader.cfg Wesfolk_Outcast.cfg): TRoW: Use variation_id instead of variation_name http://git.io/veKw1 20150408 01:02:45< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 d0da4770b86c / data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg: UtBS: Use variation_id instead of variation_name http://git.io/veKwM 20150408 01:02:48< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 fe7ea2713af2 / data/campaigns/Heir_To_The_Throne/units/ (Battle_Princess.cfg Commander.cfg Fighter.cfg Lord.cfg Princess.cfg): HttT: Use variation_id instead of variation_name http://git.io/veKwD 20150408 01:02:51< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 8136147fee4f / data/core/help.cfg: Silence wmllint warnings by restoring missing markcheck exceptions http://git.io/veKwy 20150408 01:02:54< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 62765dae3aaa / data/ (campaigns/The_Rise_Of_Wesnoth/_main.cfg core/units.cfg): Promote a couple of wmllint spelling exceptions to core http://git.io/veKwS 20150408 01:02:57< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 9f3232f56782 / data/campaigns/Eastern_Invasion/scenarios/ (01_The_Outpost.cfg 05_Northern_Outpost.cfg): EI: Silence wmllint warnings about unrecognized units referred by id http://git.io/veKwH 20150408 01:03:00< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 450ba8a79922 / data/campaigns/The_Rise_Of_Wesnoth/units/ (Wesfolk_Lady.cfg Wesfolk_Leader.cfg Wesfolk_Outcast.cfg): TRoW: Use variation_id instead of variation_name http://git.io/veKwQ 20150408 01:03:03< irker403> wesnoth: Ignacio R. Morelle wesnoth:master eafbb57fb261 / data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg: UtBS: Use variation_id instead of variation_name http://git.io/veKw7 20150408 01:03:06< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 464fd88a88ed / data/campaigns/Heir_To_The_Throne/units/ (Battle_Princess.cfg Commander.cfg Fighter.cfg Lord.cfg Princess.cfg): HttT: Use variation_id instead of variation_name http://git.io/veKw5 20150408 01:04:49< gfgtdf> whe i try to do git rebase my editor tells me file '$@' does not exst, it seems like git is passing '$@' as agu,ent to teh editor instead of the file .git/COMMIT_EDITMSG anyone here had this problem before? 20150408 01:04:54< gfgtdf> when* 20150408 01:05:09< gfgtdf> i actualy am not sure whether this is a problme with the editor or with git 20150408 01:05:37< shadowm> Probably with Git assuming the system shell understands that syntax. 20150408 01:06:12< shadowm> Which is the case on Unix with bash or another Bourne-compatible shell as /bin/sh. 20150408 01:06:45< gfgtdf> shadowm: i dont know when this stated happening, it worked well a few days ago, also it passed the rebase-todo file to teh editor sucesfully 20150408 01:14:28< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 7dc4f627ce33 / data/tools/wmllint: wmllint: Print expected side num when reporting out-of-sequence sides http://git.io/veKKa 20150408 01:14:31< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 64fb60079566 / data/tools/wmllint: wmllint: Print expected side num when reporting out-of-sequence sides http://git.io/veKKV 20150408 01:19:41< irker403> wesnoth: Ignacio R. Morelle wesnoth:master ac2486be1e12 / data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg: NR: Silence out-of-sequence [side] warnings with wmllint http://git.io/veK6F 20150408 01:20:32< vultraz> shadowm: ok, the thing about speakingin a die event comes from a speaker=unit in a nested event inside a die event 20150408 01:20:37< vultraz> IMO, wmllint fail 20150408 01:21:10< shadowm> gfgtdf: This sounds like the carryover bug that's already fixed for 1.12.2? http://forums.wesnoth.org/viewtopic.php?f=4&p=583045#p583045 20150408 01:21:53< gfgtdf> shadowm: yes 20150408 01:22:41< gfgtdf> shadowm: you know what $@ in a shellscript means ? 20150408 01:23:03< vultraz> and why is it complaining about AMOUNT 20150408 01:23:07< vultraz> I have # wmllint: ignore 20150408 01:23:32< irker403> wesnoth: Charles Dang wesnoth:master 60a4696dc162 / data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg: NR S5a.1: fixed spelling of 'unlife' http://git.io/veKiz 20150408 01:24:18< shadowm> gfgtdf: It means "all positional parameters to this script/function starting from 1". When the expansion occurs within double quotes (`"$@"`), every parameter expands to a separate argument. This is in contrast to $*, where everything is crammed into a single argument with spaces within. 20150408 01:24:51< shadowm> E.g. "$@" will expand to "foo" "bar" "baz", and "$*" to "foo bar baz". 20150408 01:25:54< shadowm> vultraz: Because wmllint is special. 20150408 01:26:13< shadowm> We really need to teach it to do Pango so this kind of thing stops happening. 20150408 01:26:18< gfgtdf> shadowm: hm ok 20150408 01:26:38< shadowm> "../../data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg", line 248: possible misspelling "debuffs," 20150408 01:26:41< shadowm> "../../data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg", line 571: possible misspelling "minimap" 20150408 01:27:18< shadowm> I think we already spell it as 'minimap' elsewhere and wmllint doesn't complain, got to figure out why. 20150408 01:27:50< shadowm> Not sure whether "debuff" is acceptable jargon for the tutorial though. 20150408 01:28:23< vultraz> I think so 20150408 01:29:01< shadowm> I.e. if you asked numbers I'm sure he'd recommend a replacement that would take up more space. 20150408 01:29:12< vultraz> DON'T ASK NUMBERS 20150408 01:29:28< shadowm> Maybe I should then? :p 20150408 01:35:31< irker403> wesnoth: Ignacio R. Morelle wesnoth:master 7154143bae66 / data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg: NR: Silence spurious dead unit speaking warning by wmllint http://git.io/veKXN 20150408 01:38:01-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 01:38:50< gfgtdf> shadowm: ok i was able to fix the git problem by replacing the '\' in the editor path with '/' 20150408 01:43:05-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150408 01:49:25< shadowm> Blargh. 20150408 01:49:56< shadowm> wmllint emits a number of "[side] without type attribute" for LoW on master that don't happen on 1.12 with near-identical code. 20150408 01:50:50< shadowm> Hm, is "persistence" a valid [side] attribute on master? 20150408 01:51:02< vultraz> iirc it's persistant 20150408 01:51:07< vultraz> not -ence 20150408 01:51:09< shadowm> Found that wmllint uses "persistence" on master and "persistent" on 1.12. 20150408 01:52:00< iceiceice> evil, i say 20150408 01:52:14< shadowm> No results for "persistence" on src, just a typo that somehow never got fixed on master then. 20150408 01:52:24-!- gfgtdf_ [~chatzilla@x50abddc9.dyn.telefonica.de] has joined #wesnoth-dev 20150408 01:53:14< irker403> wesnoth: Ignacio R. Morelle wesnoth:master bbcf249a4631 / data/campaigns/Legend_of_Wesmere/utils/characters.cfg: LoW: Fix typo s/persistence/persistent/ in [side] WML http://git.io/veKSV 20150408 01:54:31-!- gfgtdf_ [~chatzilla@x50abddc9.dyn.telefonica.de] has quit [Client Quit] 20150408 01:55:37-!- gfgtdf [~chatzilla@x55b1ad7e.dyn.telefonica.de] has quit [Ping timeout: 264 seconds] 20150408 02:02:18-!- iwaim [~iwaim@2001:2c0:40e:2002:0:4:14:80] has quit [Ping timeout: 265 seconds] 20150408 02:02:38< shadowm> Hm. 20150408 02:03:03-!- iwaim [~iwaim@2001:2c0:40e:2002:0:4:14:80] has joined #wesnoth-dev 20150408 02:03:06< shadowm> Isn't wmllint's "# Changed in 1.11.15." section near the start relevant to 1.12 too? 20150408 02:04:19< shadowm> Okay, I don't see any changes between branches in wmllint that could explain the LoW issues. 20150408 02:04:27-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [] 20150408 02:05:42-!- [Relic] [~Relic]@2602:306:33a3:6d30:ad18:75b2:374e:f8f3] has quit [Quit: Leaving] 20150408 02:07:50< shadowm> vultraz, aquileia: The [part] where the bigmap is shown at the start of LoW scenario 1 isn't the same in master and 1.12. Do you know if this is intentional? 20150408 02:08:47< shadowm> I ran a dir-to-dir diff between master and 1.12 LoW and I see some suspicious things. 20150408 02:11:16< shadowm> A lot of suspicious things, and less than 1% are story/bigmap related. 20150408 02:11:31< shadowm> :\ 20150408 02:12:05< shadowm> So I fear master LoW has actually drifted behind 1.12 LoW. 20150408 02:12:27< shadowm> Or possibly the other way around. 20150408 02:13:21< shadowm> shikadibot: seen fabi 20150408 02:13:21< shikadibot> shadowm: The person with the nick fabi 27d 14h ago was here and on the channel #wesnoth-umc-dev with the message: Ping timeout: 256 seconds 20150408 02:13:26< shadowm> shikadibot: seen fendrin 20150408 02:13:26< shikadibot> shadowm: Sorry, I don't know of fendrin. 20150408 02:18:24< iceiceice> i think that vultraz fixed up some LoW things recently 20150408 02:18:29< iceiceice> but probably on master only i think 20150408 02:18:43< iceiceice> maybe you can just compare the histories in the LoW folder and see what commits correspond by inspection? 20150408 02:18:56< iceiceice> (using github interface i mean) 20150408 02:19:11< iceiceice> idk any good way to check if things were cherry-picked besides that 20150408 02:24:50-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 02:25:26-!- ancientcc [~ancientcc@27.115.116.220] has quit [Client Quit] 20150408 02:29:30-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 02:29:32< vultraz> shadowm: all I did to AtS was remove border_size and usage from the replace_map override, and save the maps and masks in the new format 20150408 02:29:36< vultraz> er 20150408 02:29:37< vultraz> LoW 20150408 02:29:39< vultraz> not AtS 20150408 02:29:41< vultraz> sorry 20150408 02:33:46< shadowm> iceiceice: I remember trying that before when Turuk was going to help with maintaining LoW a year ago. 20150408 02:34:25< shadowm> I think I decided I had less painful things to do with my time. 20150408 02:36:46-!- ancientcc [~ancientcc@27.115.116.220] has quit [Quit: Leaving] 20150408 02:49:20-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20150408 02:51:08-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 246 seconds] 20150408 02:52:23-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 02:55:57-!- ancientcc_ [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 02:57:31< shadowm> https://gna.org/bugs/index.php?23378 20150408 02:57:38< shadowm> I'd like one on my back too. 20150408 02:57:56-!- ancientcc [~ancientcc@27.115.116.220] has quit [Ping timeout: 240 seconds] 20150408 02:58:53-!- ancientcc_ [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 02:59:17-!- ancientcc_ [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 02:59:20-!- ancientcc_ [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 02:59:37-!- ancientcc_ [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 02:59:41-!- ancientcc_ [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:00:41-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 03:00:44-!- ancientcc [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:01:37< shadowm> iceiceice: Was this fixed in 1.12? https://gna.org/bugs/index.php?23243 20150408 03:02:12< iceiceice> check commit history 20150408 03:02:38< iceiceice> this was the one i force-pushed for yesterday :p 20150408 03:02:39< iceiceice> https://github.com/wesnoth/wesnoth/commit/42ce10d135d6347a807db431a16f8cfabc4b695c 20150408 03:03:08-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 03:03:12< iceiceice> i guess i should put the commit hashes in the bug tracker 20150408 03:03:12-!- ancientcc [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:04:19-!- ancientcc [~ancientcc@123.155.153.49] has joined #wesnoth-dev 20150408 03:04:22-!- ancientcc [~ancientcc@123.155.153.49] has quit [Max SendQ exceeded] 20150408 03:04:32< shadowm> I usually just post mentioning it's fixed in x and y branches. 20150408 03:04:44-!- ancientcc [~ancientcc@123.155.153.49] has joined #wesnoth-dev 20150408 03:04:49-!- ancientcc [~ancientcc@123.155.153.49] has quit [Max SendQ exceeded] 20150408 03:05:33-!- ancientcc [~ancientcc@123.155.153.49] has joined #wesnoth-dev 20150408 03:05:37-!- ancientcc [~ancientcc@123.155.153.49] has quit [Max SendQ exceeded] 20150408 03:09:33-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 03:09:37-!- ancientcc [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:22:07-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 03:22:13-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 03:35:49-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 264 seconds] 20150408 03:37:06< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 0bf751689452 / data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg: THoT: Alter Rune Lord's description for its post-reveal variation http://git.io/ve6k7 20150408 03:37:38< shadowm> 1.12 is wmllint and wmlindent-clean now. 20150408 03:39:59-!- travis-ci [~travis-ci@ec2-54-163-116-246.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 03:40:00< travis-ci> wesnoth/wesnoth#6230 (master - ac2486b : Ignacio R. Morelle): The build has errored. 20150408 03:40:00< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/57579047 20150408 03:40:00-!- travis-ci [~travis-ci@ec2-54-163-116-246.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 03:40:36-!- new_one [~new_one@128.42.81.71] has quit [Quit: WeeChat 1.1.1] 20150408 03:43:33-!- kex [~kex@89.205.29.105] has quit [Remote host closed the connection] 20150408 03:45:43< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 8f8419ad9d5b / changelog players_changelog: Update changelogs with an entry for bug #23440 (CVE-2015-0844) http://git.io/ve6Lg 20150408 03:46:21-!- ancientcc [~ancientcc@123.155.153.49] has joined #wesnoth-dev 20150408 03:46:28-!- ancientcc [~ancientcc@123.155.153.49] has quit [Max SendQ exceeded] 20150408 03:46:43< irker403> wesnoth: Ignacio R. Morelle wesnoth:master a1355fe15955 / changelog players_changelog: Update changelogs with an entry for bug #23440 (CVE-2015-0844) http://git.io/ve6LX 20150408 03:47:12-!- ancientcc [~ancientcc@123.155.153.49] has joined #wesnoth-dev 20150408 03:47:19-!- ancientcc [~ancientcc@123.155.153.49] has quit [Max SendQ exceeded] 20150408 03:48:02-!- ancientcc [~ancientcc@123.155.153.49] has joined #wesnoth-dev 20150408 03:48:10-!- ancientcc [~ancientcc@123.155.153.49] has quit [Max SendQ exceeded] 20150408 03:48:55-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 03:49:04-!- ancientcc [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:49:48-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 03:49:56-!- ancientcc [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:50:41-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 03:50:48-!- ancientcc [~ancientcc@27.115.116.220] has quit [Max SendQ exceeded] 20150408 03:51:34-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20150408 04:00:45< shadowm> gfgtdf: Oh, sorry, I missed earlier that you actually pushed the full fix for time over event syncing, hence my confusion. 20150408 04:01:13< shadowm> I was under the impression that you had decided against it. 20150408 04:02:32< irker403> wesnoth: Charles Dang wesnoth:master edd9f7f3d47f / data/campaigns/Northern_Rebirth/ (8 files in 2 dirs): NR: use death macros in remaining scenarios, instead of including the herodeaths http://git.io/ve6mk 20150408 04:03:44-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:03:49-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:04:17-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:04:22-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:05:28-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:05:33-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:06:29-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:06:34-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:07:01-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:07:07-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:07:34-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:07:39-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:07:58-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:08:04-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:08:30-!- ancientcc [~ancientcc@112.65.211.213] has joined #wesnoth-dev 20150408 04:08:39-!- ancientcc [~ancientcc@112.65.211.213] has quit [Max SendQ exceeded] 20150408 04:09:06-!- ancientcc [~ancientcc@123.157.71.137] has joined #wesnoth-dev 20150408 04:09:15-!- ancientcc [~ancientcc@123.157.71.137] has quit [Max SendQ exceeded] 20150408 04:09:44-!- ancientcc [~ancientcc@123.157.71.137] has joined #wesnoth-dev 20150408 04:09:54-!- ancientcc [~ancientcc@123.157.71.137] has quit [Max SendQ exceeded] 20150408 04:10:19-!- ancientcc [~ancientcc@123.157.71.137] has joined #wesnoth-dev 20150408 04:10:29-!- ancientcc [~ancientcc@123.157.71.137] has quit [Max SendQ exceeded] 20150408 04:11:00-!- ancientcc [~ancientcc@123.157.71.137] has joined #wesnoth-dev 20150408 04:11:09-!- ancientcc [~ancientcc@123.157.71.137] has quit [Max SendQ exceeded] 20150408 04:11:37-!- ancientcc [~ancientcc@123.157.71.137] has joined #wesnoth-dev 20150408 04:12:50-!- ancestral [~ancestral@174-20-187-184.mpls.qwest.net] has joined #wesnoth-dev 20150408 04:15:56-!- ancientcc [~ancientcc@123.157.71.137] has quit [Ping timeout: 252 seconds] 20150408 04:21:28< shadowm> ancestral: Did you make sure to enable PNG screenshot support in your builds? 20150408 04:21:54< shadowm> vultraz asked about that earlier in the logs. 20150408 04:22:29< ancestral> Sorry, is there something specific I need to do that is not already set? 20150408 04:22:37-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150408 04:22:44< ancestral> Or are you talking about library support 20150408 04:23:16< irker403> wesnoth: Charles Dang wesnoth:master 2557823855de / data/core/encyclopedia/geography.cfg: Added missing spelling exceptions http://git.io/ve63c 20150408 04:25:35< shadowm> Just building the relevant file. The easiest way to know would be to try creating a screenshot in-game yourself and see whether it's a *.png file or not. 20150408 04:25:57< ancestral> I’ll try it 20150408 04:26:11< shadowm> Scratch the "relevant file" part. I actually don't know. :/ 20150408 04:26:12< vultraz> I think the notification dialog is broken, though 20150408 04:26:21< vultraz> it still shows bmp size 20150408 04:26:25< vultraz> iceiceice saidhe would deal 20150408 04:26:30< shadowm> Oh. 20150408 04:26:30< iceiceice> hmm i thought 20150408 04:26:33< iceiceice> i did but maybe 20150408 04:26:38< iceiceice> well 20150408 04:26:41< vultraz> I haven't tested recently 20150408 04:26:43< iceiceice> i think it shoudl be saving a png file 20150408 04:26:44< vultraz> so if you have 20150408 04:26:49< shadowm> But it'll display the filename, which is what matters for ancestral's esting. 20150408 04:27:52< vultraz> ancestral: you need to add src/SDL_savePNG to the build, and have -DHAVE_PNG (I think) 20150408 04:28:07< vultraz> if any of this isn't done already 20150408 04:28:07< shadowm> HAVE_LIBPNG. 20150408 04:28:13< vultraz> yeah 20150408 04:28:17< vultraz> but with a D 20150408 04:28:32< shadowm> HAVE_LIBPNG. 20150408 04:28:32< iceiceice> ancestral: so i saw that there is a program that is suppose to be a really easy way to make app bundles, 20150408 04:28:40< shadowm> -D is just the flag. 20150408 04:28:43< iceiceice> called `dylibbundler` 20150408 04:28:45< vultraz> oh 20150408 04:28:46< vultraz> I see 20150408 04:28:49< shadowm> int size = disp.screenshot(filename, map_screenshot); 20150408 04:29:00< iceiceice> it is available on homebrew: https://github.com/Homebrew/homebrew/blob/master/Library/Formula/dylibbundler.rb 20150408 04:29:02< shadowm> I presume that doesn't stat the created file, does it? 20150408 04:29:10< iceiceice> shadowm: i dont think so 20150408 04:29:16< vultraz> I would assume not 20150408 04:29:26< shadowm> Yeah, it just computes the size from the generated surface. 20150408 04:29:56< iceiceice> i think ancestral was right, i think the png lib i picked was just kind of weak 20150408 04:30:04< shadowm> It should be easy to have it call file_size() instead. 20150408 04:30:18< shadowm> I mean filesystem::file_size(), I forget we moved everything there into a namespace. 20150408 04:30:54-!- Kwandulin [~Miranda@p5B008FFE.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 04:30:57< shadowm> As a bonus that would allow you to detect whether the screenshot failed for any reasons. 20150408 04:31:27< vultraz> iceiceice: do you have a replacement? 20150408 04:31:28< iceiceice> hmm 20150408 04:31:46< iceiceice> so its a bit wierd, 20150408 04:31:58< shadowm> iceiceice: So, what's the problem with the library? 20150408 04:31:58< iceiceice> the dialog isn't "here's a preview of the possible screenshot and how big it will be" 20150408 04:32:21< iceiceice> its "ok, the screenshots done, here's how big it turned out and hwere to find it" ? 20150408 04:32:30< shadowm> Yeah. 20150408 04:32:32< vultraz> Yes 20150408 04:32:33< iceiceice> ok i undestand 20150408 04:32:37< vultraz> why would it be anything different? 20150408 04:32:42< vultraz> that;s how everyone does screenshots 20150408 04:32:47< iceiceice> idk im not sure i ever saw one that works like that 20150408 04:33:00< iceiceice> but i dont play that many games :p 20150408 04:33:16< vultraz> it's how Steam does it 20150408 04:33:26< iceiceice> shadowm: there was a thread about it 20150408 04:33:27< shadowm> I don't think I've seen any that works like you say as built-in functionality in a game. External screenshot applications? Well, yes. 20150408 04:33:30< iceiceice> it doesnt do compression 20150408 04:33:33< iceiceice> it doesnt do jpeg 20150408 04:33:33< vultraz> you get a little popup with a thumbnail saying Screenshot Saved 20150408 04:33:44< shadowm> libpng does compression. 20150408 04:33:51< iceiceice> yeah but the interface i picked doesnt 20150408 04:33:52< shadowm> It's called lossless compression. 20150408 04:33:55< vultraz> We don't want jpg 20150408 04:34:08< vultraz> Jpg pictures absolutely SUCK for wesnoth 20150408 04:34:10< shadowm> The PNG format itself is only designed for lossless compression. 20150408 04:34:18< iceiceice> vultraz: thats what i assumed also but apparently i was wrong 20150408 04:34:22< iceiceice> there was that thread about it 20150408 04:34:33< shadowm> If you want lossy compression with PNG you are required to do your own fiddling around with palette downgrading and stuff. 20150408 04:34:37< iceiceice> https://gna.org/bugs/index.php?23245 20150408 04:35:07< shadowm> But seriously, the PNG writing functionality is doing its job. There's no need to overthink it. :p 20150408 04:35:19< iceiceice> ok good :) 20150408 04:35:22< shadowm> Whether we should use JPEG instead is highly debatable. 20150408 04:35:32< iceiceice> it wouldnt be instead, they wanted it as an additional option 20150408 04:36:00< shadowm> Whether we should use JPEG by default instead is highly debatable. 20150408 04:36:17< vultraz> Anything is better than bmp 20150408 04:36:19< ancestral> Thanks 20150408 04:36:22< shadowm> I mean, vultraz's favorite game uses JPEG I think. 20150408 04:36:41< ancestral> JPEG is great for the bandwidth-impared with the Internet 20150408 04:36:43< vultraz> Screenshots of 3D games don't suffer much from jpg 20150408 04:36:47< ancestral> *impaired 20150408 04:36:56< vultraz> Wesnoth is a pixel-based game, and therefor suffers 20150408 04:36:58< shadowm> But tell me, how hard is it to convert to JPEG for a Windows user? 20150408 04:37:12< ancestral> vultraz: I posted comparisons. It’s really not egregious 20150408 04:37:21< vultraz> Just need to open gimp and export 20150408 04:37:27< ancestral> There is inherently quite a bit of noise with most in-game content 20150408 04:37:35< vultraz> ancestral: yes, I saw. If we can get it looking like that, it would be ok, I guess 20150408 04:37:36< shadowm> I thought Paint since XP or so could both read PNG files and write JPEG files with a hardcoded quality preset. 20150408 04:37:38< ancestral> It’s not like text or geometric UI 20150408 04:37:47< vultraz> I don't use paint for anything 20150408 04:37:52< vultraz> does paint still exist in 8 20150408 04:37:56< shadowm> Yes. 20150408 04:38:20< shadowm> It changed a lot in Windows 7, though, so I don't know if what I said is still true. 20150408 04:38:30< vultraz> Alright 20150408 04:38:34< vultraz> but I do use gimp for this 20150408 04:38:47< shadowm> Yes, but you aren't a representative population sample. 20150408 04:39:49< shadowm> What I'd consider is the average user who doesn't have any software installed but Windows, a web browser, and Wesnoth -- hence I brought up Paint's format support. 20150408 04:40:10< shadowm> s/average/model clueless/ 20150408 04:40:55-!- esr [~esr@wesnoth/developer/esr] has quit [Ping timeout: 255 seconds] 20150408 04:40:57< shadowm> I suppose you could argue that the same user would be unable to tell the difference between PNG and JPEG and just try to upload the PNG file (and hopefully not be stuck in a crummy country with 3.5G mobile broadband Internet). 20150408 04:41:46< iceiceice> yeah i still have no real idea how to use the gimp 20150408 04:41:53< iceiceice> after years of refusing to read a tutorial 20150408 04:41:56< vultraz> :P 20150408 04:42:03< shadowm> Open file, export, select format and options, done. 20150408 04:42:09< iceiceice> i sometimes use tool crop 20150408 04:42:12< vultraz> Personally, I've come to the conclusion that photoshop is superior 20150408 04:42:28< iceiceice> yeah i have actually never used photoshop 20150408 04:43:05< shadowm> Me neither. 20150408 04:43:23< vultraz> Neither I, but I've seen enough to conclude that Gimp is horrible for drawing 20150408 04:43:25< iceiceice> i think i have sometimes used the layering stuff in the gimp 20150408 04:43:27< vultraz> Zero agrees 20150408 04:43:48< shadowm> I have tried Krita, which some people claim is better than the GIMP, though. Unfortunately, much like Firefox and Chrome, I seem to be too old to learn something new. 20150408 04:43:50< iceiceice> but it took me a really long time to understand the "floating layer" / "anchoring" stuff 20150408 04:44:00< iceiceice> like i had to stare at some stupid tutorial for a long time 20150408 04:44:06< shadowm> So I'm stuck with the GIMP because my brain can't learn anything else. 20150408 04:44:17< iceiceice> after that experience, with gimp its usually like, if i cant understand wtf is going on its undo immediately 20150408 04:44:41< iceiceice> with inkscape i feel safer to just plow ahead and believe that i can adjust things later in a way that i can understands 20150408 04:45:14< shadowm> Inkscape feels much more intimidating than the GIMP to me. 20150408 04:45:18< iceiceice> really? 20150408 04:45:20< iceiceice> i really like inkscape 20150408 04:45:32< iceiceice> i dont have like a tablet pad for drawing, 20150408 04:45:44< iceiceice> but with inkscape i mean... i feel like the interface is just easier 20150408 04:46:00< iceiceice> its actually a hell of a lot of like making figures in microsoft powerpoint 20150408 04:46:06< iceiceice> which i did a lot of in highschoool... 20150408 04:46:21< iceiceice> in powerpoint you basically just have objects 20150408 04:46:22-!- esr [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has joined #wesnoth-dev 20150408 04:46:22-!- esr [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has quit [Changing host] 20150408 04:46:22-!- esr [~esr@wesnoth/developer/esr] has joined #wesnoth-dev 20150408 04:46:29< iceiceice> and you can promote them to be "higher" or "lower" 20150408 04:46:35< iceiceice> and you can group them and move groups higher or lower 20150408 04:46:40< iceiceice> and that is all you do instead of layers 20150408 04:46:50< iceiceice> i find that much simpler 20150408 04:46:54< iceiceice> although surely less powerful 20150408 04:47:22< iceiceice> the "trace bitmap" feature of inkscape is really awesome imo 20150408 04:47:33< shadowm> I really never had any trouble grasping the concept of layers with the GIMP. 20150408 04:47:33< iceiceice> i have no idea how to do something like that without a tool like inkscape 20150408 04:47:50< shadowm> Masks, though... 20150408 04:48:35< shadowm> ancestral: Oh yeah, I've been meaning to ask you, do you check the IRC logs for highlights of your nick? 20150408 04:48:48< ancestral> No, I ought to though :( 20150408 04:49:28< shadowm> Yep. 20150408 04:51:04< shadowm> http://forums.wesnoth.org/viewtopic.php?f=33&t=41840 <- 1.12.2 announcement draft. 20150408 04:52:32< vultraz> are we releasing 1.12 today? 20150408 04:53:01< shadowm> vultraz: TOPIC. 20150408 04:53:05< zookeeper> it's too bad paint.net is windows-only, it's a really nice light and simple (well, not as simple as it used to be anymore) app 20150408 04:53:33< ancestral> I love Pixelmator (Mac-only) 20150408 04:53:36< shadowm> I even highlighted you with the definite tagging time. 20150408 04:53:41< iceiceice> shadowm: the first bug in "known bugs" is allegedly fixed now 20150408 04:54:05< shadowm> Oh yes, it's in the list of fixes right above that. 20150408 04:54:07 * vultraz casually reminds zookeeper of the music immediate issue he said he would deal with 20150408 04:54:21< iceiceice> the other two major bugs that i think should be mentioned are 20150408 04:54:30< iceiceice> "sides cannot be on multiple teams in multiplayer games" 20150408 04:54:32< zookeeper> vultraz, i haven't been able to since i haven't been able to grab a recent build anywhere 20150408 04:54:35< iceiceice> which was a severe regression from 1.10 i gues 20150408 04:54:39< shadowm> RELEASE_NOTES says "The "system default" language selection does not work, and results in no punctuation appearing in game. Please select your language of choice from the menu instead. [bug]22921[/bug]. This bug does not affect the official OS X packages." 20150408 04:54:46-!- ancientcc [~ancientcc@27.115.116.220] has joined #wesnoth-dev 20150408 04:54:47< shadowm> Wasn't this fixed in 1.12.1? 20150408 04:54:51< iceiceice> https://gna.org/bugs/index.php?23000 20150408 04:54:54< iceiceice> no it was not fixed 20150408 04:55:01< iceiceice> no one has agreed to fix it afaik 20150408 04:55:11< shadowm> https://gna.org/bugs/?22921 <- ? 20150408 04:55:11-!- ancientcc [~ancientcc@27.115.116.220] has quit [Read error: Connection reset by peer] 20150408 04:55:55< iceiceice> oh that 20150408 04:55:57< iceiceice> i think we did fix that 20150408 04:57:01< shadowm> Maybe I should take the full contents of the announcement's Known Bugs section and stick them in R_N. 20150408 04:57:32< iceiceice> or vice versa? 20150408 04:57:37< iceiceice> i'm confused 20150408 04:57:38< vultraz> System Default hhas always worked for me 20150408 04:58:36< zookeeper> on the aforementioned note, if anyone just happens to have a windows master build (recent enough to run current master, that is) for download somewhere, drop me a link 20150408 04:58:43< shadowm> Yeah, but it didn't for me for a while after 1.11.19 or so. 20150408 04:59:17< iceiceice> i forget what i was supposed tob e doing 20150408 04:59:21< iceiceice> oh, something about screen shot dialog 20150408 04:59:40< shadowm> So I think we just forgot to remove the relevant line from R_N. 20150408 05:00:20< iceiceice> zookeeper: i will compile one on mingw now 20150408 05:00:28< iceiceice> i think it should not take that long 20150408 05:01:47< iceiceice> ehh it will take a while 20150408 05:02:16< iceiceice> did we ever get jenkins running again? 20150408 05:02:32< iceiceice> nope 20150408 05:02:44< zookeeper> iceiceice, great, thanks 20150408 05:03:04< iceiceice> i guess its going pretty fast 20150408 05:03:07< iceiceice> it went through all of AI already 20150408 05:09:20< iceiceice> hmmm 20150408 05:09:24< iceiceice> this is actually kind of wierd: 20150408 05:09:24< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/hotkey/command_executor.cpp#L653 20150408 05:10:59< shadowm> I think there was a reason I didn't make :656 a call to gui2::show_error(). I'd need to check the diff for the commit where I introduced tscreenshot_notification. 20150408 05:16:12< shadowm> !commit 47ffd9ea2d0e3d5d46b35783d79321a638f7a620 20150408 05:16:13< shikadibot> shadowm: Revision 47ffd9ea2d0e (Ignacio R. Morelle) on Thu Dec 19 07:15:30 2013: 20150408 05:16:16< shikadibot> shadowm: gui2/tscreenshot_notification: New GUI2 dialog shown when taking screenshots 20150408 05:16:19< shikadibot> shadowm: 20150408 05:16:22< shikadibot> shadowm: It includes the following features: 20150408 05:16:24< shikadibot> shadowm: (+9 discarded lines) 20150408 05:16:27< shikadibot> shadowm: Web interface URL: https://github.com/wesnoth/wesnoth/commit/47ffd9ea2d0e 20150408 05:17:05< shadowm> Okay, so the reason is, 20150408 05:17:45< shadowm> I didn't pay attention to display::screenshot()'s implementation. 20150408 05:18:42< shadowm> In effect, it'll never return size 0 unless the framebuffer is 0-sized, and it certainly doesn't check whether the file write succeeds. 20150408 05:19:10< iceiceice> zookeeper: https://drive.google.com/file/d/0B54Q-3UjP5fiODNGbW05TmhkcTg/view?usp=sharing 20150408 05:19:23< shadowm> That makes command_executor:656 unreachable code, unless running with --nogui perhaps. 20150408 05:19:33< iceiceice> no i think it returns -1? 20150408 05:19:50< iceiceice> in some cases? 20150408 05:19:50< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/display.cpp#L778 20150408 05:19:53< shadowm> size = screenshot_surf->w * screenshot_surf->h; 20150408 05:19:57< shadowm> size = (2048 + size*3); 20150408 05:20:01< shadowm> return size; 20150408 05:20:17< shadowm> Oh yeah, I guess map screenshots are special. 20150408 05:20:53< shadowm> So special that it writes to std::cerr instead of bringing up an error dialog or notifying the caller. 20150408 05:21:23< iceiceice> yeah thats pretty special :p 20150408 05:21:33< shadowm> And then we call it mission accomplished and say the screenshot was done anyway. 20150408 05:21:58< shadowm> So display::screenshot() should be made to throw exceptions, I guess. 20150408 05:22:08< zookeeper> iceiceice, great, i'll take a look in... a little while 20150408 05:22:42< shadowm> Do note that there are other callers elsewhere. 20150408 05:23:26< shadowm> Oka, just the one, in the editor code. And some file I have lying around which isn't in the repository. 20150408 05:23:34< iceiceice> idk if it should throw an exception... 20150408 05:23:35< iceiceice> it could 20150408 05:24:42< shadowm> The map screenshot path fails if there isn't a map loaded or somehow can't create a surface (which is usually a symptom of things going to crap). 20150408 05:24:46< iceiceice> i think sometimes i've made a function that is naturally "void" but can fail, instead return boost::optional where the string inidcates an error 20150408 05:25:00< iceiceice> this guy returns an int already thoguh 20150408 05:25:37< iceiceice> do you really want to bring down the game if we fail to write a screenshot? 20150408 05:25:40< shadowm> Not having a map loaded (no idea how that's possible) is a distinct error from being unable to write the screenshot to disk. The latter case isn't even tested for at the moment. 20150408 05:25:45< iceiceice> i feel like whatever it does right now is probably fine 20150408 05:25:55< shadowm> Eh, I'd imagine the caller would catch the exceptions. :p 20150408 05:26:06< iceiceice> yeah if the exceptions dont need to be long range, 20150408 05:26:21< iceiceice> i think imo its better to just like, return a struct which explains all the stuff that happened 20150408 05:26:46< iceiceice> the main thing exception is good for is like, prompting the destruction of many things and a big jump back in call stack, 20150408 05:26:46< iceiceice> or 20150408 05:26:52< iceiceice> throwing from a constructor 20150408 05:27:02< iceiceice> to abort the creation of a deformed object 20150408 05:27:04< shadowm> ._. 20150408 05:27:40< shadowm> Anything that can allow a real error message to be meaningfully displayed with gui2::show_error() will do, really. 20150408 05:28:05< iceiceice> yeah 20150408 05:28:06< shadowm> And tell apart user or engine errors from failing to write the file to disk. 20150408 05:28:32< iceiceice> how many of the callers actually need to know the size? 20150408 05:28:44< iceiceice> i feel like maybe that doesnt need to be returned 20150408 05:29:28< shadowm> Yeah, tscreenshot_notification should probably stat the file by itself like tgame_cache_options does. 20150408 05:29:44< shadowm> So I could work on this after 1.12.2 if you don't feel like touching this code. 20150408 05:29:59< iceiceice> if you want 20150408 05:30:43< iceiceice> i started to screw around with it but lookign at diff i didnt do much of anything yet 20150408 05:32:01< shadowm> I think the main reason I didn't bother with changing the previous screenshot API is that I was in a hurry and hastily borrowed tscreenshot_notification from a branch wherein I was going to add PNG support as well. 20150408 05:41:24-!- ancestral [~ancestral@174-20-187-184.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150408 05:57:02-!- travis-ci [~travis-ci@ec2-54-226-91-37.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 05:57:03< travis-ci> wesnoth/wesnoth#6236 (master - a1355fe : Ignacio R. Morelle): The build passed. 20150408 05:57:03< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/57589420 20150408 05:57:03-!- travis-ci [~travis-ci@ec2-54-226-91-37.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 06:31:59< irker403> wesnoth: Charles Dang wesnoth:master 82f86d0435d7 / data/campaigns/Legend_of_Wesmere/ (4 files in 4 dirs): LoW: moved North Elves common village setup into a file http://git.io/ve6rv 20150408 06:32:14< vultraz> UGH 20150408 06:32:17< vultraz> I meant to say 20150408 06:32:19< vultraz> into a macro 20150408 06:32:27< vultraz> or out of a file 20150408 06:34:38< vultraz> Oh well 20150408 06:38:08-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 06:39:55< irker403> wesnoth: Charles Dang wesnoth:master 4a048741100b / data/campaigns/Legend_of_Wesmere/ (_main.cfg scenarios/_main.cfg): LoW: merged a useless file with main http://git.io/ve6Kb 20150408 07:09:44-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150408 07:27:33-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 252 seconds] 20150408 07:59:10-!- mjs-de [~mjs-de@f049109107.adsl.alicedsl.de] has joined #wesnoth-dev 20150408 08:10:30-!- Kwandulin [~Miranda@p5B008FFE.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150408 08:16:00-!- c74d is now known as Guest42134 20150408 08:16:54-!- Guest42134 [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Ping timeout: 256 seconds] 20150408 08:19:53-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 256 seconds] 20150408 08:24:31-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has joined #wesnoth-dev 20150408 08:25:06< irker403> wesnoth: Charles Dang wesnoth:master fb9a17beacd7 / data/campaigns/Eastern_Invasion/ (20 files in 2 dirs): EI: used death macros instead of including the whole file http://git.io/veiT6 20150408 08:25:09< irker403> wesnoth: Charles Dang wesnoth:master ef98feaf0fc4 / data/campaigns/Eastern_Invasion/scenarios/15_The_Council.cfg: EI S15: no death events needed in a cutscene http://git.io/veiTi 20150408 08:35:58-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 09:04:36-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 09:09:30-!- prkc [~prkc@4E5CD609.dsl.pool.telekom.hu] has joined #wesnoth-dev 20150408 09:32:58< irker403> wesnoth: Charles Dang wesnoth:master 8fd68e7bcf16 / data/campaigns/Eastern_Invasion/scenarios/01_The_Outpost.cfg: EI S1: recognize Dacyn in wmllint http://git.io/veiBb 20150408 09:45:57< irker403> wesnoth: Charles Dang wesnoth:master 2644da38c619 / data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg: NR S5a.1: changed track that plays if Abhai finds the RoJ http://git.io/veigf 20150408 10:01:55< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 0d566d81c863 / changelog: Add changelog entry for bug #23331 http://git.io/veirS 20150408 10:09:49< shadowm> vultraz, aquileia, iceiceice, gfgtdf: When marking a bug on the tracker as Fixed, please assign it to yourselves if it's assigned to None unless you have a good reason to disclaim responsibility on the fix. 20150408 10:10:47< vultraz> Noted 20150408 10:15:59-!- horrowin1 [~Icedove@2a02:810a:8b40:85c:21b:fcff:fee3:c3ff] has joined #wesnoth-dev 20150408 10:21:38< shadowm> I'm sure you all know that, but I just assigned to people a number of bug reports they forgot to reassign after fixing and posting links suggesting that they're taking full responsibility for the fixes. 20150408 10:25:49-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 250 seconds] 20150408 10:26:07-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 252 seconds] 20150408 10:27:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20150408 10:29:11-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 10:30:26< vultraz> Assigned myself the only unassigned bug I had fixed 20150408 10:38:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20150408 10:38:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 10:39:47-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20150408 10:40:06-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 10:41:11-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 10:43:42-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20150408 11:01:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 11:02:54-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20150408 11:04:04-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 11:06:24-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20150408 11:07:02-!- ancientcc [~ancientcc@140.207.223.189] has joined #wesnoth-dev 20150408 11:07:29-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 11:08:28-!- ancientcc [~ancientcc@140.207.223.189] has quit [Max SendQ exceeded] 20150408 11:08:46-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has quit [Ping timeout: 250 seconds] 20150408 11:08:55-!- ancientcc [~ancientcc@140.207.223.189] has joined #wesnoth-dev 20150408 11:08:58-!- ancientcc [~ancientcc@140.207.223.189] has quit [Max SendQ exceeded] 20150408 11:09:21-!- ancientcc [~ancientcc@140.207.223.189] has joined #wesnoth-dev 20150408 11:09:26-!- ancientcc [~ancientcc@140.207.223.189] has quit [Max SendQ exceeded] 20150408 11:09:51-!- ancientcc [~ancientcc@140.207.223.189] has joined #wesnoth-dev 20150408 11:09:57-!- ancientcc [~ancientcc@140.207.223.189] has quit [Max SendQ exceeded] 20150408 11:11:19-!- ancientcc [~ancientcc@140.207.223.189] has joined #wesnoth-dev 20150408 11:11:24-!- ancientcc [~ancientcc@140.207.223.189] has quit [Max SendQ exceeded] 20150408 11:11:49-!- ancientcc [~ancientcc@140.207.223.189] has joined #wesnoth-dev 20150408 11:11:55-!- ancientcc [~ancientcc@140.207.223.189] has quit [Max SendQ exceeded] 20150408 11:12:22-!- ancientcc [~ancientcc@27.115.116.213] has joined #wesnoth-dev 20150408 11:12:25-!- ancientcc [~ancientcc@27.115.116.213] has quit [Max SendQ exceeded] 20150408 11:12:52-!- ancientcc [~ancientcc@27.115.116.213] has joined #wesnoth-dev 20150408 11:12:57-!- ancientcc [~ancientcc@27.115.116.213] has quit [Max SendQ exceeded] 20150408 11:13:22-!- ancientcc [~ancientcc@27.115.116.213] has joined #wesnoth-dev 20150408 11:13:27-!- ancientcc [~ancientcc@27.115.116.213] has quit [Max SendQ exceeded] 20150408 11:13:52-!- ancientcc [~ancientcc@27.115.116.213] has joined #wesnoth-dev 20150408 11:13:57-!- ancientcc [~ancientcc@27.115.116.213] has quit [Max SendQ exceeded] 20150408 11:13:59-!- bumbadadabum_ [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20150408 11:14:06-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 11:24:45-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20150408 11:27:46-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 250 seconds] 20150408 11:30:12-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:32:05-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:34:19-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:34:24-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:34:54-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:34:58-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:35:25< irker403> wesnoth: Charles Dang wesnoth:master 2c5834ddea8f / data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg: NR S7a: big code cleanup http://git.io/vePID 20150408 11:36:05-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:36:11-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:37:09-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:37:33-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:37:55-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:37:59-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:38:37-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20150408 11:41:12-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:41:37-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:42:02-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:42:06-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:42:27-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:42:31-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:42:40-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 11:42:52-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:42:55-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:43:17-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:43:21-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:43:47-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:43:52-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:44:51-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:44:56-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:45:19-!- ancientcc [~ancientcc@211.162.34.206] has joined #wesnoth-dev 20150408 11:45:24-!- ancientcc [~ancientcc@211.162.34.206] has quit [Max SendQ exceeded] 20150408 11:45:45-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:45:50-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:46:11-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:46:15-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:46:52-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:46:55-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:47:12-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:47:15-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:47:37-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:47:40-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:47:57-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:48:01-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:48:22-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:48:26-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:48:48-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:48:52-!- ancientcc [~ancientcc@123.157.71.141] has quit [Max SendQ exceeded] 20150408 11:49:13-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:49:14-!- ancientcc [~ancientcc@123.157.71.141] has quit [Remote host closed the connection] 20150408 11:49:33-!- ancientcc [~ancientcc@123.157.71.141] has joined #wesnoth-dev 20150408 11:50:41-!- ancientcc [~ancientcc@123.157.71.141] has quit [Read error: Connection reset by peer] 20150408 11:55:15-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150408 12:32:20-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 12:40:17-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150408 12:45:14-!- gfgtdf [~chatzilla@x50abe74b.dyn.telefonica.de] has joined #wesnoth-dev 20150408 12:46:07< gfgtdf> shadowm: i somewhen fixed a bug related to default language in v 20150408 12:46:10< gfgtdf> https://github.com/wesnoth/wesnoth/commit/ae86186db772003cca62d2af6ed9553839af0f0d 20150408 12:46:25< gfgtdf> backported inn https://github.com/wesnoth/wesnoth/commit/ddefdbe53a4ab46347374e42f9459b91dc5e582e 20150408 12:54:45-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20150408 13:02:36-!- gfgtdf [~chatzilla@x50abe74b.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.91.1 [Firefox 37.0.1/20150402191859]] 20150408 13:47:53< zookeeper> iceiceice, where should i go for the .dll's needed with your build? it wants at least libhistory6.dll (and probably others too after that) 20150408 13:48:10< iceiceice> oh 20150408 13:48:20< iceiceice> i think i put a link to that already somewhere 20150408 13:48:24< iceiceice> either email or wiki 20150408 13:49:03< iceiceice> https://drive.google.com/open?id=0B54Q-3UjP5fiS3hjRVRGOWJfUk0&authuser=0 20150408 13:49:20< iceiceice> you should only need loony's deps otherwise 20150408 13:50:56< zookeeper> oh, yeah, it works with that .dll after i rename it 20150408 14:10:11< irker403> wesnoth: ln-zookeeper wesnoth:master ce9beb3c88cc / data/core/macros/sound-utils.cfg: Switch to intro music immediately http://git.io/veXqa 20150408 14:17:36-!- bumbadadabum_ is now known as bumbadadabum 20150408 14:21:51< zookeeper> hrhm. in some places i want to let the intro music finish first rather than have scenario music interrupt it when leaving the story screen. 20150408 14:21:54< zookeeper> i could either add a INTRO_THEN_SCENARIO_MUSIC alongside the current INTRO_AND_SCENARIO_MUSIC, or i could just add a "modifier" macro, like {INTRO_AND_SCENARIO_MUSIC foo.ogg bar.ogg}{LET_INTRO_MUSIC_FINISH} 20150408 14:22:24< zookeeper> or, rather, i already did both and now i'm just wondering which one to use 20150408 14:32:42-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150408 14:32:56-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 14:46:13-!- gfgtdf [~chatzilla@x50abe74b.dyn.telefonica.de] has joined #wesnoth-dev 20150408 14:46:18< gfgtdf> how much time left until 1.12.2 ? 20150408 14:47:00< gfgtdf> neverminf 20150408 14:47:17< gfgtdf> just noticed it is mention in teh channel topic 20150408 15:03:23-!- aquileia [95acd0d3@gateway/web/freenode/ip.149.172.208.211] has joined #wesnoth-dev 20150408 15:04:07< aquileia> gfgtdf: https://github.com/wesnoth/wesnoth/commit/68eaaad4fb 20150408 15:04:11< aquileia> error C2440: 'initializing' : cannot convert from 'boost::assign_detail::generic_list' to 'boost::container::flat_set,std::allocator<_Ty>>' 20150408 15:05:12< aquileia> Any idea why that might happen? After all, we both use MSVC 20150408 15:09:34< gfgtdf> aquileiahm no i dont, it didint happen to me 20150408 15:09:56< gfgtdf> aquileia: i think in teh wirse case you neede to add .convert_to_container>() at teh end of the list. 20150408 15:12:11< aquileia> also, I don't understand how it could be a list of const char [10] and contain longer entries... 20150408 15:12:56-!- [Relic] [~Relic]@2602:306:33a3:6d30:6c18:95e2:767:9cbb] has joined #wesnoth-dev 20150408 15:15:47< gfgtdf> aquileia: hm yes i was also suprised that the type is const char[10] 20150408 15:16:57< gfgtdf> aquileia: is that all erromessage you got from output ? 20150408 15:17:45< aquileia> no, I'll stop the fixed build and reproduce... 20150408 15:18:45< irker403> wesnoth: ln-zookeeper wesnoth:master 27eb87537439 / data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg: Tweaked playlist http://git.io/veXSA 20150408 15:19:40< aquileia> error C2440: 'initializing' : cannot convert from 'boost::assign_detail::generic_list' to 'boost::container::flat_set,std::allocator<_Ty>>' with _Kty=std::string, _Ty=std::string. No constructor could take the source type, or constructor overload resolution was ambiguous 20150408 15:20:02< aquileia> No real additional information, but here's the full error message 20150408 15:20:23< gfgtdf> aquileia: thats not a verygood erro message 20150408 15:20:37< gfgtdf> aquileia: so which of teh 'or' is it ? 20150408 15:21:32< gfgtdf> aquileia: you sure you took the error message from 'output' and not from erro list'' ? 20150408 15:21:41< aquileia> it also gives some unrelated warnings about BOOST_PP_EXPAND_I which are Boost 1.57 specific and will be suppressed in 1.58 20150408 15:22:25< aquileia> Yes, the one in error list is even less informative 20150408 15:24:17< gfgtdf> aquileia: maybe it helps to splicitly give teh template paramter, that is list_of(.. istread of list_of(.. ? 20150408 15:27:05< aquileia> Nope, that converion isn't unique/existent either 20150408 15:27:17< aquileia> conversion* 20150408 15:29:43< aquileia> gfgtdf: To make that clear, the explicit conversion with convert_to_container you suggested works 20150408 15:35:06< gfgtdf> aquileia: maybe you shoudl file a bugrport on boost. 20150408 15:35:30< aquileia> I'm currently searching through their tracker 20150408 15:40:33-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 15:40:53< irker403> wesnoth: ln-zookeeper wesnoth:master 45e9ecfb8abd / data/core/macros/sound-utils.cfg: Added a macro for letting intro music play out http://git.io/veXhV 20150408 15:42:31< irker403> wesnoth: ln-zookeeper wesnoth:master c2b7bd0f4b28 / / (6 files in 2 dirs): Revised music playlists for TB http://git.io/veXjo 20150408 15:42:46< zookeeper> ^ first example of how to get rid of annoying intro music interruptions after the story screen 20150408 15:45:41< aquileia> Sounds a bit like https://svn.boost.org/trac/boost/ticket/7364 from http://stackoverflow.com/questions/12352692/ambiguous-call-with-list-of-in-vs2010 and http://stackoverflow.com/questions/13285272/using-boostassignlist-of 20150408 15:46:15< aquileia> So basically, C++11 conversions adding ambiguity... 20150408 15:49:33< gfgtdf> aquileia: but teh point is that it wokrd well with std::set befor, and didnt work after it was changes to flat_set 20150408 15:51:55< aquileia> oh, right... 20150408 15:52:30< aquileia> C++11 shouldn't add conversions between boost types 20150408 15:53:17< aquileia> In that case, I have no idea what causes that bug 20150408 15:56:36< gfgtdf> aquileia: maybe it is a bug with flat_set 20150408 15:56:53< gfgtdf> aquileia: meanign flat_set missing some c++11 constructors or somthing. 20150408 16:01:20< irker403> wesnoth: Nils Kneuper wesnoth:master 3729dab8c2a8 / po/wesnoth-lib/es.po: updated Spanish translation http://git.io/ve1Lb 20150408 16:01:22< irker403> wesnoth: Nils Kneuper wesnoth:master 36604e1cb644 / po/wesnoth/gd.po: updated Scottish Gaelic translation http://git.io/ve1LN 20150408 16:01:24< irker403> wesnoth: Nils Kneuper wesnoth:1.12 157ae4f021ab / changelog players_changelog po/wesnoth-lib/es.po: updated Spanish translation http://git.io/ve1LA 20150408 16:01:26< irker403> wesnoth: Nils Kneuper wesnoth:1.12 025562fc8890 / changelog players_changelog po/wesnoth/gd.po: updated Scottish Gaelic translation http://git.io/ve1Lx 20150408 16:05:15< Ivanovic> shadowm: all stuff I received should be committed now, so from my side: ready for release 20150408 16:06:54< aquileia> gfgtdf: http://sohu.io/questions/704559/error-copying-objects-when-class-contains-boostcontainerflat-set 20150408 16:07:30< aquileia> "This limitation forces the user to define a const version of the copy assignment" 20150408 16:09:07< Ivanovic> shadowm: btw i can currently build both master as well as 1.12 20150408 16:10:53< aquileia> gfgtdf: I think just using the convert_to_container (and adding to the list_of) is the best solution for now... 20150408 16:15:30-!- kex [~kex@92.53.39.44] has joined #wesnoth-dev 20150408 16:24:08-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [Remote host closed the connection] 20150408 16:36:42-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has quit [Ping timeout: 256 seconds] 20150408 16:37:43-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 16:38:11-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 16:38:31-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150408 16:41:21-!- Kwandulin [~Miranda@p5B008FFE.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 16:47:36-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 252 seconds] 20150408 17:00:21-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 17:11:03-!- kex [~kex@92.53.39.44] has quit [Remote host closed the connection] 20150408 17:11:17-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 252 seconds] 20150408 17:16:33-!- gfgtdf [~chatzilla@x50abe74b.dyn.telefonica.de] has quit [Quit: ChatZilla 0.9.91.1 [Firefox 37.0.1/20150402191859]] 20150408 17:19:15-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [Remote host closed the connection] 20150408 17:23:48-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 17:23:55-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 17:34:57-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [Remote host closed the connection] 20150408 17:37:42-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20150408 17:51:40-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev 20150408 18:00:14-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection] 20150408 18:00:20-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20150408 18:00:51-!- Elvish_Hunter [~chatzilla@151.16.252.107] has joined #wesnoth-dev 20150408 18:01:10< Elvish_Hunter> Hi all 20150408 18:02:02< irker403> wesnoth: Elvish_Hunter wesnoth:master cde58d5c0f8a / data/tools/wmllint: wmllint: better fix for bug #23217 http://git.io/veML6 20150408 18:03:05< Elvish_Hunter> shadowm: I read your follow-up about bug #23217. Tell me if you like this new fix or if I should modify it again 20150408 18:04:38< Elvish_Hunter> This version of the fix, when detects a variation_name not marked as translatable, tells the user to "rename it as translation_id and/or mark it as translatable" 20150408 18:05:04< Elvish_Hunter> It can also be disabled by the # wmllint: markcheck off magic comment 20150408 18:08:23-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai] 20150408 18:13:36< irker403> wesnoth: Elvish_Hunter wesnoth:master e4bdab252817 / changelog src/unit_filter.cpp: SUF: added support for status= key http://git.io/veMsl 20150408 18:15:05-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 18:26:33< irker403> wesnoth: Elvish_Hunter wesnoth:master b406029bd6fd / data/tools/wmllint: Fixed typo in my former wmllint commit http://git.io/veMW8 20150408 18:26:57-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [Remote host closed the connection] 20150408 18:29:48< Elvish_Hunter> Yes, I accidentally wrote "translation_id" instead of "variation_id". Argh! 20150408 18:32:00< irker403> wesnoth: gfgtdf wesnoth:master 7dc59fcab50b / src/ (6 files in 2 dirs): Enable tree_view gui2 widget for lua http://git.io/veM42 20150408 18:32:02< irker403> wesnoth: gfgtdf wesnoth:master dce3e24c6cf8 / src/gui/widgets/ (tree_view_node.cpp tree_view_node.hpp): fix assertion failure in tree_view gui2 widget http://git.io/veM4V 20150408 18:32:04< irker403> wesnoth: gfgtdf wesnoth:master e4c6c8beef23 / src/ (6 files in 2 dirs): Merge pull request #396 from gfgtdf/lua_tree_view http://git.io/veM4w 20150408 18:38:17-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20150408 18:38:24-!- cib_ [~cib@p5DC75BAD.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150408 18:38:28-!- cib0 [~cib@p5DC75BAD.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150408 18:41:02< aquileia> Elvish_Hunter, gfgtdf: Was one of the last 6 commits a force push? 20150408 18:41:32< aquileia> shadowm: ^ 20150408 18:41:35< Elvish_Hunter> No. Why? I just did a normal "git push" 20150408 18:42:01< Elvish_Hunter> Well, three "git push", but still... 20150408 18:42:24< aquileia> When I did 'git pull --rebase' to get my commits ready, it didn't apply them and reported a force push 20150408 18:43:17< Elvish_Hunter> I did a git pull --rebase as well. But it applied my commits without reporting any issue 20150408 18:43:28< aquileia> Of course they still exist orphaned, but now I have to cherry-pick them all 20150408 18:44:01< aquileia> Elvish_Hunter: I didn't say that it was one of yours, gfgtdf committed as well 20150408 18:44:21< aquileia> but that was a PR merge... 20150408 18:44:27< Elvish_Hunter> I know, I was just explaining what I did ;-) 20150408 18:45:12< aquileia> Well, can't change it now, I'll just pick my commits one-by-one 20150408 18:51:36-!- gfgtdf [~chatzilla@x50abe74b.dyn.telefonica.de] has joined #wesnoth-dev 20150408 18:51:58< gfgtdf> shadowm: i think we should fix http://gna.org/bugs/?23454 before 1.12.2 20150408 18:57:33< irker403> wesnoth: gfgtdf wesnoth:1.12 408e6f300f03 / src/playcampaign.cpp: fix carryover in with scenario generation in mp http://git.io/veMrx 20150408 19:10:04-!- travis-ci [~travis-ci@ec2-54-226-91-37.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 19:10:05< travis-ci> cbeck88/wesnoth#165 (1.12.1 - eb0a47a : Ignacio R. Morelle): The build passed. 20150408 19:10:05< travis-ci> Build details : http://travis-ci.org/cbeck88/wesnoth/builds/57689116 20150408 19:10:05-!- travis-ci [~travis-ci@ec2-54-226-91-37.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 19:11:03< gfgtdf> Elvish_Hunter: i just clicked the green button in the pull request. 20150408 19:11:52< gfgtdf> aquileia: ^ 20150408 19:12:36< aquileia> gfgtdf: Well, another mystery, then 20150408 19:13:55< aquileia> git pull --rebase should be able to cope with merge commits, else it's rather useless 20150408 19:15:06-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Quit: Leaving.] 20150408 19:15:10< Elvish_Hunter> Could it be a problem with your local repo? What does "git status" say? 20150408 19:15:12-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150408 19:15:58< gfgtdf> aquileia: "git pull --rebase" does the same as "git rebase upstream/master" ? 20150408 19:16:51< aquileia> Can you rebase relative to remote branches? If so, then yes 20150408 19:18:54< gfgtdf> aquileia: yes you can, (ofc you have to fetch first to get the latest remote head) 20150408 19:19:33< aquileia> well, pull --rebase fetches for you as well, so it's a little more comfortable 20150408 19:20:23< Elvish_Hunter> Actually, it's possible to do a git pull --rebase upstream master: http://stackoverflow.com/questions/15602037/git-rebase-upstream-master-vs-git-pull-rebase-upstream-master 20150408 19:24:59< irker403> wesnoth: gfgtdf wesnoth:master f3e583f8765d / changelog: Update changelog http://git.io/veMHK 20150408 19:54:09-!- Kwandulin [~Miranda@p5B008FFE.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150408 19:59:49-!- ancestral [~ancestral@112.sub-70-197-202.myvzw.com] has joined #wesnoth-dev 20150408 20:00:23-!- ancestral [~ancestral@112.sub-70-197-202.myvzw.com] has quit [Client Quit] 20150408 20:02:52-!- SZ_Bot [SZ_Bot@27-83-235-80.dyn.estpak.ee] has joined #wesnoth-dev 20150408 20:02:57-!- Ravana_ [SZ_Bot@unaffiliated/ravana/x-2327071] has quit [Disconnected by services] 20150408 20:02:59-!- SZ_Bot is now known as Ravana_ 20150408 20:03:01-!- Ravana_ [SZ_Bot@27-83-235-80.dyn.estpak.ee] has quit [Changing host] 20150408 20:03:01-!- Ravana_ [SZ_Bot@unaffiliated/ravana/x-2327071] has joined #wesnoth-dev 20150408 20:12:15-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150408 20:15:21< shadowm> gfgtdf: I told you people to get stuff like this sorted out about 23 hours ago . 20150408 20:15:37< shadowm> How long do you think I should wait? 20150408 20:16:20< gfgtdf> shadowm: the report was filed very late 20150408 20:17:17< gfgtdf> shadowm: i already fixed it in http://git.io/veMrx it is not tested but im sure that it doesnt break cses that previuosly worked. 20150408 20:18:05< gfgtdf> shadowm: no neeed to wait form my side. 20150408 20:20:13< shadowm> Elvish_Hunter, gfgtdf, aquileia: So was it a force-push or was it not? If so, what commits were lost? 20150408 20:20:42-!- cib_ [~cib@p5DC75BAD.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20150408 20:21:06< gfgtdf> shadowm: i just merged my pr via github web interface. Also none of my commits were lost. 20150408 20:21:20< shadowm> Pulled successfully here moving my local 1.12 HEAD from 0d566d81c863e7fbc431599f24c0a491e9229838 to 408e6f300f0339f9e24f8136f43c6207bcce3587 via fast-forward merge. 20150408 20:21:22< Elvish_Hunter> shadowm: as I already explained, I didn't do any force push, and I don't seem to have lost any commit 20150408 20:21:39< aquileia> shadowm: It wasn't, it seems to have been an issue on my end 20150408 20:21:59< shadowm> Okay then, cool. 20150408 20:26:26< shadowm> gfgtdf: At this point you understand this stuff far better than me, so it's up to you to decide whether to backport before 1.12.2 or not. 20150408 20:26:32< shadowm> You have 34 minutes. 20150408 20:26:51< gfgtdf> shadowm: which stuff ? 20150408 20:27:02< shadowm> The fix for #23454. 20150408 20:27:11< shadowm> Elvish_Hunter: I took a look at your addition, it seems good. I ought to test it before backporting, though. 20150408 20:27:21< shadowm> Addition, change, thing. 20150408 20:28:35< gfgtdf> shadowm: I alredy commited it to 1.12, http://git.io/veMrx and i wouldnt call this backport 20150408 20:29:05< gfgtdf> shadowm: teh code in master works quite different so that bug shuldt not exist in master 20150408 20:29:20< Elvish_Hunter> shadowm: good ;-) On my end it seems to work well. Let me know if and when I can backport it 20150408 20:33:55< shadowm> Elvish_Hunter: It's missing one thing, though, which is complaining if there's a translatable variation_name but no variation_id (which *will* cause problems in-game if it ever gets translated). 20150408 20:34:12< shadowm> But as-is it's good to go for 1.12.2. 20150408 20:34:27< irker403> wesnoth: gfgtdf wesnoth:1.12 b8a55aa15bfd / src/playcampaign.cpp: fixup 'fix carryover in with scenario generation in mp' http://git.io/veD8w 20150408 20:35:34< gfgtdf> shadowm: ^ not sure whether this is needed. But it is clearer. 20150408 20:36:22< shadowm> I. Uh. 20150408 20:36:42< gfgtdf> ? 20150408 20:37:03< shadowm> I don't know what's going on there! :) 20150408 20:37:30< gfgtdf> shadowm: the 1.13 code is easier to understand :) 20150408 20:37:45< shadowm> I know there's a point to stuff like a = &b; b = *a; in some cases, but to be able to tell I'd need to know how the code in question works. 20150408 20:38:08< shadowm> Or a = *b; b = &a; in this case. 20150408 20:38:59-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150408 20:39:42< shadowm> Elvish_Hunter: That means you should backport now (though I'll do it anyway if you have to leave). 20150408 20:39:43< iceiceice> loonycyborg: can you compile 1.12 with this lib also? 20150408 20:39:44< iceiceice> https://drive.google.com/open?id=0B54Q-3UjP5fiS3hjRVRGOWJfUk0&authuser=0 20150408 20:39:59< Elvish_Hunter> shadowm: I'm working on it 20150408 20:40:02< iceiceice> that i linked to zookeeper earlier 20150408 20:40:14< shadowm> You mean 1.13.0, right? 20150408 20:40:17< iceiceice> oh 20150408 20:40:19< iceiceice> duh 20150408 20:40:20< iceiceice> thank you 20150408 20:40:29< iceiceice> yeah its only needed for 1.13.0 not 1.12 20150408 20:40:51< iceiceice> vultraz: when there was the "delete compatibility code" day 20150408 20:40:57< gfgtdf> shadowm: scenario is a config *, and starting_pos is a config. At this point scenario might not point to starting_pos but to some config C. we fix this my cyoping C to starting_pos and making scenario point to starting_pos. 20150408 20:41:01< iceiceice> did any of that get backported / was it supposed to? 20150408 20:41:06< gfgtdf> s/my/by 20150408 20:41:12< iceiceice> i think i did not do anything about hte unit traits warnings 20150408 20:41:23-!- travis-ci [~travis-ci@ec2-54-92-166-73.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 20:41:24< travis-ci> wesnoth/wesnoth#6255 (master - cde58d5 : Elvish_Hunter): The build passed. 20150408 20:41:24< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/57684202 20150408 20:41:24-!- travis-ci [~travis-ci@ec2-54-92-166-73.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 20:41:34< gfgtdf> i still think we shoudl get rid or hisrtpoy library 20150408 20:42:07< shadowm> gfgtdf: Ah, okay. 20150408 20:43:09< aquileia> shadowm: If I want to backport a change to the VC project files, which no packager uses, should I do that now or wait? 20150408 20:43:35< shadowm> Whenever you want as long as it's not within the "no commits allowed" window. 20150408 20:45:11< iceiceice> ok 20150408 20:45:22< iceiceice> i would like to delete the 1.11.x ability description code 20150408 20:46:29< iceiceice> im going to test very quickly and push it 20150408 20:46:37< iceiceice> unless someoen speaks against in the next 10 min 20150408 20:47:32< iceiceice> (meaning i will delete this function: https://github.com/wesnoth/wesnoth/blob/1.12/src/unit_types.cpp#L1547) 20150408 20:47:53< irker403> wesnoth: Elvish_Hunter wesnoth:1.12 a886387ad178 / data/tools/wmllint: wmllint: backported better fix for bug #23217 http://git.io/veDuC 20150408 20:48:43< Elvish_Hunter> shadowm: ^^ 20150408 20:51:44< shadowm> Elvish_Hunter: Much appreciated, thanks. 20150408 20:53:41< Elvish_Hunter> shadowm: I'm currently looking at wmllint's code, and I'm not sure if it'll be possible to implement also a variation_id= check 20150408 20:54:11< Elvish_Hunter> Perhaps I can make it so that wmllint will complain if it founds a [variation] tag without a variation_id= key 20150408 20:55:28< Elvish_Hunter> By the way, what could be the use of a [variation] without a variation_id? 20150408 20:55:55< shadowm> It'd probably cause all sorts of problems. 20150408 20:56:13< iceiceice> i think the help would be very confused 20150408 20:56:14< iceiceice> for one 20150408 20:56:26< shadowm> 1.12.x will take a variation_name with no variation_id, though, I'm sure you noticed that. 20150408 20:56:28< iceiceice> but it might be a hidden variation i guess 20150408 20:56:56< shadowm> If no variation_id is specified, it just assumes that the variation_name is the variation_id for backwards compatibility with 1.10.x. 20150408 20:57:36< iceiceice> man our headers are so screwed 20150408 20:57:47< iceiceice> why does changing unit_abilities.hpp cause map_label.cpp to be recompiled T_T 20150408 20:58:29< Elvish_Hunter> So just printing out "[variation] is missing required variation_id=" should be enough for 1.13, without trying a more complex rule? 20150408 20:58:31< shadowm> After the engine is done sorting out the id/name business, the help will use the name if present. I assume it'll fallback to the id otherwise. (These are the name and id the engine has already read from WML, which one is which in the actual WML doesn't matter for the help browser.) 20150408 20:59:11< shadowm> I guess we haven't decided yet whether to drop this compatibility code in 1.13.x, have we? 20150408 20:59:18< irker403> wesnoth: aquileia wesnoth:master 7323de9dbc7b / src/ (9 files in 4 dirs): Use brackets for boost includes http://git.io/veDVW 20150408 20:59:20< irker403> wesnoth: aquileia wesnoth:master e5814560bef5 / src/team.cpp: Fix boost list_of -> flat_set conversion on MSVC http://git.io/veDVl 20150408 20:59:22< irker403> wesnoth: aquileia wesnoth:master aad3e0d1f0b8 / projectfiles/ (6 files in 3 dirs): Convert /projectfles readme's to markdown http://git.io/veDV8 20150408 20:59:24< irker403> wesnoth: aquileia wesnoth:master 27b5f955ebcd / projectfiles/VC9/README.md: VC dependencies: Remove superfluous libraries http://git.io/veDVB 20150408 20:59:26< irker403> wesnoth: aquileia wesnoth:master 03e2f3fff86c / projectfiles/VC9/ (schema_generator.vcproj wesnoth.vcproj wesnothd.vcproj): VC project: Remove libintl include http://git.io/veDVR 20150408 20:59:48< shadowm> You all have a few more minutes while I do a last pot-update and bump versions. 20150408 21:00:12< Elvish_Hunter> shadowm: I'm good, thanks :-) 20150408 21:00:27< irker403> wesnoth: Chris Beck wesnoth:1.12 2656a5d07080 / src/ (unit_abilities.cpp unit_types.cpp unit_types.hpp): remove support for legacy-style unit abilities descriptions http://git.io/veDwf 20150408 21:00:29< irker403> wesnoth: Chris Beck wesnoth:1.12 c05460f8f2ba / data/tools/wmllint: Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12 http://git.io/veDwJ 20150408 21:01:03< shadowm> iceiceice: Hi. 20150408 21:01:19< shadowm> 2656a5d07080 isn't stable branch material. 20150408 21:01:33< iceiceice> we agreed several days ago it was 20150408 21:01:52< shadowm> And 'we' would be...? 20150408 21:01:57< iceiceice> also i wrote about 15 minutes ago "i would like to ... unless someone speaks against it in the next 10 min 20150408 21:02:34< shadowm> I missed that, also you didn't specify it was for 1.12. 20150408 21:03:56< iceiceice> shadowm: http://www.wesnoth.org/irclogs/2015/04/%23wesnoth-dev.2015-04-02.log 20150408 21:04:07< irker403> wesnoth: aquileia wesnoth:1.12 945f1be275e9 / projectfiles/VC9/ (schema_generator.vcproj wesnoth.vcproj wesnothd.vcproj): VC project: Remove libintl include http://git.io/veDrS 20150408 21:04:23< shadowm> Could you point me to a specific timestamp? 20150408 21:04:39< iceiceice> starting here 20150408 21:04:39< iceiceice> 20150402 19:51:34< iceiceice> idk, what do people think about this? 20150408 21:05:12< iceiceice> it looks like you were online but maybe you didnt read it 20150408 21:05:27< shadowm> 20150402 20:07:58< shadowm> The old argument was deprecating and removing three releases later or so. I don't think anyone is going to mind removing after a development cycle. 20150408 21:05:40< shadowm> When I said this I meant the development cycle proper. You can't just go and remove stuff from a stable branch. 20150408 21:06:10< iceiceice> release = 1.12.0, 1.12.1, 1.12.2 ? 20150408 21:06:13< shadowm> So that mean after both 1.11.x and 1.12.x. 20150408 21:06:24< iceiceice> apparently this code is from like earlier 1.11.x 20150408 21:06:44< shadowm> No, the previous practice was removing three *development* releases later. 20150408 21:07:05< shadowm> We've never *removed* things from a stable version unless it's to fix a security vulnerability. 20150408 21:07:09< iceiceice> i dont see why we cant remove that 20150408 21:07:19< iceiceice> nor did anyone else speak against it 20150408 21:07:28< iceiceice> if you want to revert, fine 20150408 21:07:34< iceiceice> not going to fight about it, i dont really care 20150408 21:07:41< iceiceice> i just vaguely remember that i said i would do this 20150408 21:07:45< iceiceice> after we discussed on irc 20150408 21:08:07< iceiceice> i was going to changelog it, but i will let you decide if you want to revert first 20150408 21:10:34< shadowm> AI0867, ancestral, aquileia, Elvish_Hunter, gfgtdf, iceiceice, Ivanovic, lipkab, loonycyborg, mattsc, Rhonda, Soliton, shadowm, vultraz, zookeeper, and anyone else who cares: Ready for 1.12.2? 20150408 21:10:44< aquileia> yes 20150408 21:10:47< iceiceice> other then possible changelog: yes 20150408 21:10:51< Elvish_Hunter> Ready 20150408 21:10:54< gfgtdf> yes 20150408 21:12:49< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 002c00b063bf / / (168 files in 29 dirs): pot and documentation update, no string changes http://git.io/veDix 20150408 21:12:52< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 343d05caa27f / src/ (unit_abilities.cpp unit_types.cpp unit_types.hpp): Revert "remove support for legacy-style unit abilities descriptions" http://git.io/veDip 20150408 21:12:55< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 eb5cae24dfbd / changelog players_changelog: Tweak changelog entry wording http://git.io/veDih 20150408 21:13:12< zookeeper> i don't recall any reason why i wouldn't be ready, so i guess i'll say i am 20150408 21:13:42< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 32dcdf6ecb92 / Doxyfile changelog players_changelog src/wesconfig.h: Version 1.12.2 http://git.io/veDPE 20150408 21:18:20-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 256 seconds] 20150408 21:20:18-!- travis-ci [~travis-ci@ec2-54-163-116-246.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 21:20:19< travis-ci> wesnoth/wesnoth#6256 (master - e4bdab2 : Elvish_Hunter): The build passed. 20150408 21:20:19< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/57685468 20150408 21:20:19-!- travis-ci [~travis-ci@ec2-54-163-116-246.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 21:22:29< shadowm> Not a fan of strict builds being enabled by default with cmake. 20150408 21:23:49< shadowm> Or translations being built in the step that runs with uid 0. 20150408 21:24:10-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 21:27:04< shadowm> The AI commits suicide with Konrad on turn 4, great. 20150408 21:31:29-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 265 seconds] 20150408 21:32:21< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 b3ca056d7c01 / changelog: Update changelog for bug #23217 http://git.io/veDHf 20150408 21:33:38< Elvish_Hunter> Well then, now I have to go. Bye! 20150408 21:33:39-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 21:34:10-!- Elvish_Hunter [~chatzilla@151.16.252.107] has quit [Quit: Ciao!] 20150408 21:34:47< shadowm> Why does DiD's first story screen start with the_city_falls.ogg? :p 20150408 21:35:44-!- iceiceice [~chris@50.245.222.235] has joined #wesnoth-dev 20150408 21:35:44-!- iceiceice [~chris@50.245.222.235] has quit [Changing host] 20150408 21:35:44-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150408 21:38:44-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [] 20150408 21:42:24< vultraz> Because the city might fall :P 20150408 21:42:47< gfgtdf> shadowm: what means "CVE-2015-0844 " ? 20150408 21:42:51< shadowm> The first few story screens don't match the track's tone of impending doom. 20150408 21:43:27< iceiceice> CVE-2015-0844 makes me fear impending doom 20150408 21:43:29< vultraz> I haven't gotten around to dealing with the music tracks yet 20150408 21:43:52< iceiceice> is it the name of the terminator robot which has been sent from the future to kill me? 20150408 21:44:24< zookeeper> shadowm, no idea 20150408 21:45:43< zookeeper> looks like esr's fault 20150408 21:46:51< zookeeper> vultraz, btw, since you're doing playlist updates as well, i might as well share my thoughts on something... 20150408 21:47:12< vultraz> I hadn't been, but I could 20150408 21:47:39< zookeeper> oh, i seemed to recall that you had, but maybe not then 20150408 21:49:19< gfgtdf> shadowm: for teh release notes i forgot to mention [get_global_variable] in teh list of things that casue OOS in older clients in time over events 20150408 21:49:28< zookeeper> anyway: i think we should use immediate=yes as little as possible when changing music mid-scenario; that is, unless the track really needs to change right there and then (as part of some huge surprise), one should consider rather using immediate,append=no,no 20150408 21:49:41< shadowm> gfgtdf: Okay., I'll add that to the post. 20150408 21:49:49-!- travis-ci [~travis-ci@ec2-54-89-120-95.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 21:49:50< travis-ci> wesnoth/wesnoth#6257 (master - b406029 : Elvish_Hunter): The build passed. 20150408 21:49:50< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/57687135 20150408 21:49:50-!- travis-ci [~travis-ci@ec2-54-89-120-95.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 21:50:16< zookeeper> hard cuts in music are really jarring, and if the idea is just to start using northerners.ogg after orcs are encountered, it'd be smoother to just replace the playlist but let the current track play out first 20150408 21:50:42< vultraz> zookeeper: so, you're recommending not using INCIDENTAL_MUSIC as much? 20150408 21:50:50< zookeeper> vultraz, yeah 20150408 21:51:16< iceiceice> what is the ETA on 1.13.0 again? 20150408 21:51:58< zookeeper> there's plenty of places where an immediate change is needed, but i think there's also a lot of places where it can and should be avoided... and there's probably a lot of places where we could insert "soft" playlist changes like that 20150408 21:53:16< zookeeper> start the scenario with a playlist of lighter tracks and change to heavier battle tracks later on 20150408 21:53:27< zookeeper> (as an example) 20150408 21:54:08< shadowm> I've still got that music switch crash nobody else gets on 1.12. 20150408 21:54:35< zookeeper> am i demented or why doesn't that ring a bell 20150408 21:55:06< shadowm> You forgot, because I asked you to try to reproduce for 1.12.1 too. 20150408 21:55:32< iceiceice> i wonder if its related to the XP problems? 20150408 21:55:41< shadowm> My suspicion is yes. 20150408 21:55:44-!- Haudegen [~quassel@85.124.51.57] has quit [Ping timeout: 250 seconds] 20150408 21:55:46< iceiceice> shadowm, i didn't know you get a music crash 20150408 21:55:56< iceiceice> did you get backtrace and stuff? 20150408 21:56:06< zookeeper> i might have a vague memory of something like that. i assume i tried to reproduce but couldn't? 20150408 21:56:40< vultraz> I don't think it deserves much priority if it's an XP thing 20150408 21:56:54< shadowm> I'm not on XP, vultraz, otherwise I wouldn't be concerned. :| 20150408 21:57:23< vultraz> That....doesn't make sense 20150408 21:57:23< shadowm> iceiceice, zookeeper: http://www.wesnoth.org/irclogs/2015/01/%23wesnoth-dev.2015-01-23.log , 20150123 21:59:43 onwards. 20150408 21:57:31< vultraz> You would not be concerned if you were on XP? 20150408 21:57:38-!- horrowin1 [~Icedove@2a02:810a:8b40:85c:21b:fcff:fee3:c3ff] has quit [Quit: horrowin1] 20150408 21:57:49< shadowm> vultraz I just said I get a crash bug that is most likely the same people get on XP. 20150408 21:58:02< shadowm> That may rule out it being a XP-specific thing. 20150408 21:58:04< gfgtdf> shadowm:also the "Gold carryover during MP campaigns is applied once by the host and " in know bugs is afaik exactly what the "Multiplayer campaign gold carryover fix" fixes 20150408 21:58:06< vultraz> Oh, I misunderstood 20150408 21:58:56< shadowm> There's a link to a paste in 20150123 22:38:02 with information from IIRC memcheck. 20150408 22:00:36< iceiceice> i wonder if we just aren't initializing music correctly in the sdl startup code 20150408 22:05:04< iceiceice> yeah i have no idea right now 20150408 22:05:36< shadowm> 20150408 19:04:35 error filesystem: Failed to get file status of /root/_main.cfg: Permission denied 20150408 22:05:40< iceiceice> are you using an older version of mixer? 20150408 22:05:42< shadowm> I forgot I wanted to silence these. 20150408 22:06:11< shadowm> libsdl-mixer1.12 1.2.12-11+b1 20150408 22:06:32< shadowm> libsdl1.2debian 1.2.15-10+b1 20150408 22:06:44< shadowm> libogg0 1.3.2-1 20150408 22:07:00< shadowm> libvorbis0a, libvorbisfile3 1.3.4-2 20150408 22:07:15-!- mjs-de [~mjs-de@f049109107.adsl.alicedsl.de] has quit [Remote host closed the connection] 20150408 22:07:52< irker403> wesnoth: Chris Beck wesnoth:master c3d5732c1107 / src/ (unit_abilities.cpp unit_types.cpp unit_types.hpp): remove support for legacy-style unit abilities descriptions http://git.io/veyfr 20150408 22:07:54< irker403> wesnoth: Chris Beck wesnoth:master 63dfc7cbe66f / changelog: update changelog http://git.io/veyfo 20150408 22:08:02< shadowm> gcc 4:4.9.2-2, libstdc++6 4.9.2-10, libc6 2.19-15, Linux 3.18.5. 20150408 22:10:09< iceiceice> its wierd that the function listed in the backtrace is "Mix_FadeInMusicPos" but we only seem to call "Mix_FadeInMusic" 20150408 22:10:15< iceiceice> i guess its probably a macro? 20150408 22:12:56< iceiceice> hmmmm 20150408 22:12:59< iceiceice> so why do we do this 20150408 22:13:26< irker403> wesnoth: shikadilord wesnoth: b3ca056d7c01 tagged as 1.12.2 20150408 22:13:35< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/sound.cpp#L611 20150408 22:13:50< iceiceice> i feel like we should not be calling mix_fadeoutmusic(0) 20150408 22:13:51< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/sound.cpp#L620 20150408 22:15:15-!- Haudegen [~quassel@85.124.51.57] has joined #wesnoth-dev 20150408 22:15:50< iceiceice> code is super old though 20150408 22:16:12< shadowm> I can assure you that scenario that first triggered the bug here didn't cause problems before. 20150408 22:16:31< shadowm> That's why my suspicion is broken code in a library. 20150408 22:17:36-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20150408 22:18:10< iceiceice> well i googled a little... 20150408 22:18:24< iceiceice> i guess its more common to see SIGFPE crashes in these functions 20150408 22:18:28< iceiceice> or at least those turn up more often 20150408 22:18:43< iceiceice> and then its related to durations being 0 20150408 22:18:45< shadowm> Upload in progress. 20150408 22:20:39< iceiceice> shadowm: so you think it is a linux lib and a windows lib that broke independently? 20150408 22:21:01< iceiceice> or its a bug in libvorbis that turns up in both i guess 20150408 22:21:12< shadowm> Latter. 20150408 22:21:32-!- shadowm changed the topic of #wesnoth-dev to: String-freeze STILL active for 1.12 branch | Stable version 1.12.2 tagged, announcement coming "eventually" | Development version 1.13.0 scheduled for April 12th | Wesnoth Developers Channel | Logs: http://irclogs.wesnoth.org 20150408 22:21:49< gfgtdf> shadowm: taht happen only one one spcific ogg fiel or on all files ? 20150408 22:22:15< gfgtdf> s/one one/on one 20150408 22:23:15< shadowm> Back when I was releasing 1.12.1 I said that when I first came across it I blamed silence.ogg, but now it's not specific to silence.ogg or playing any music at all. 20150408 22:23:18-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 245 seconds] 20150408 22:23:21-!- new_one [~new_one@128.42.64.187] has joined #wesnoth-dev 20150408 22:23:45< shadowm> loonycyborg, ancestral, mattsc: Time to do your magic. 1.12.2 is up on SF.net. 20150408 22:24:10< loonycyborg> ok 20150408 22:26:31-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 244 seconds] 20150408 22:26:32-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20150408 22:31:51< gfgtdf> shadowm: so if you remove the "sounds" folder the bug still happens ? 20150408 22:32:17< shadowm> I've also removed old version packages from f.w.o. 20150408 22:33:02< shadowm> gfgtdf: I have no idea but disabling music works. 20150408 22:33:39< shadowm> Is there a specific reason you suggest deleting the sounds dir? 20150408 22:35:18< gfgtdf> shadowm: hm neverbing i think teh reason was wrong 20150408 22:35:23< gfgtdf> shadowm: i here have asimilar bug 20150408 22:35:45< gfgtdf> shadowm: that makes teh game crash when i close teh game duting a mp game 20150408 22:36:05< gfgtdf> shadowm: it not onew of my own builds, it a buidl donwloaded from jenkins 20150408 22:36:16< gfgtdf> shadowm: it migth be related to sound but im not completely sure 20150408 22:36:48< irker403> wesnoth: Ignacio R. Morelle wesnoth:1.12 d4676ed1bdeb / Doxyfile changelog players_changelog src/wesconfig.h: Bump version http://git.io/veyYw 20150408 22:38:43< gfgtdf> shadowm: unfortunately that build give me no useful debug information at all 20150408 22:41:58< gfgtdf> shadowm: you got taht erro on 1.12 and master ? 20150408 22:59:16-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has joined #wesnoth-dev 20150408 23:03:34-!- HoneyLocust [~honeylocu@108-199-145-120.lightspeed.nsvltn.sbcglobal.net] has quit [Client Quit] 20150408 23:08:50< shadowm> I didn't try master at the time, I guess I'll check later. 20150408 23:20:18-!- kex [~kex@78.157.29.160] has quit [Remote host closed the connection] 20150408 23:22:29-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 248 seconds] 20150408 23:22:56-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20150408 23:24:39-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150408 23:31:42-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Remote host closed the connection] 20150408 23:35:24-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20150408 23:49:47-!- new_one [~new_one@128.42.64.187] has quit [Remote host closed the connection] 20150408 23:52:56-!- kex [~kex@78.157.29.160] has quit [Ping timeout: 240 seconds] 20150408 23:55:50< vultraz> aquileia: you seem to have broken master 20150408 23:55:53< vultraz> C:\Users\Charles\Documents\wesnoth-git\src\team.cpp|73|error: '>>' should be '> >' within a nested template argument list| 20150408 23:56:03< vultraz> C:\Users\Charles\Documents\wesnoth-git\src\team.cpp|73|warning: '>>' operator will be treated as two right angle brackets in C++0x [-Wc++0x-compat]| 20150408 23:56:10-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20150408 23:57:26-!- travis-ci [~travis-ci@ec2-54-163-116-246.compute-1.amazonaws.com] has joined #wesnoth-dev 20150408 23:57:27< travis-ci> wesnoth/wesnoth#6263 (master - 03e2f3f : aquileia): The build was broken. 20150408 23:57:27< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/57709787 20150408 23:57:27-!- travis-ci [~travis-ci@ec2-54-163-116-246.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150408 23:57:32-!- new_one [~new_one@128.42.92.149] has joined #wesnoth-dev --- Log closed Thu Apr 09 00:00:53 2015