--- Log opened Wed Sep 09 00:00:15 2015 20150909 00:14:30-!- Appleman1234 [~Appleman1@KD111239008131.au-net.ne.jp] has quit [Ping timeout: 255 seconds] 20150909 00:17:03-!- irker137 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150909 00:17:03< irker137> wesnoth: Elias Pschernig wesnoth:master 1961c43f1640 / data/tools/unit_tree/update-wmlunits: [wmlunits] clear /data/add-ons http://git.io/vZsOZ 20150909 00:37:28-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150909 00:48:47-!- legoktm [~quassel@wikipedia/Legoktm] has quit [Quit: No Ping reply in 180 seconds.] 20150909 00:49:51-!- [Relic] [~Relic]@2602:306:33a3:6d30:393c:5de7:e3cf:695d] has quit [Ping timeout: 246 seconds] 20150909 00:49:54-!- legoktm [~quassel@2604:a880:800:10::1c2:b001] has joined #wesnoth-dev 20150909 00:50:17-!- legoktm is now known as Guest45399 20150909 00:53:28-!- [Relic] [~Relic]@2602:306:33a3:6d30:393c:5de7:e3cf:695d] has joined #wesnoth-dev 20150909 00:56:40< irker137> wesnoth: Elias Pschernig wesnoth:master 225234b12173 / data/tools/wmlunits: [wmlunits: log used memory for pre-pass] http://git.io/vZsWv 20150909 01:11:00-!- Appleman1234 [~Appleman1@KD106161084048.au-net.ne.jp] has joined #wesnoth-dev 20150909 01:19:56< irker137> wesnoth: Elias Pschernig wesnoth:master 2cdcae629495 / data/tools/wmlunits: [wmlunits] fix typo http://git.io/vZs4b 20150909 01:26:55-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150909 01:28:03-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20150909 01:28:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20150909 01:29:21-!- Guest45399 [~quassel@2604:a880:800:10::1c2:b001] has quit [Changing host] 20150909 01:29:21-!- Guest45399 [~quassel@wikipedia/Legoktm] has joined #wesnoth-dev 20150909 01:30:35-!- Guest45399 is now known as legoktm 20150909 01:33:49-!- Jozrael [~Jozrael@192.91.144.19] has quit [Read error: Connection reset by peer] 20150909 01:35:13< mattsc> Grmpf; I am going to give up on trying to install Snow Leopard on this computer 20150909 01:41:01< shadowm> Aginor: Re your question earlier, hard to say without seeing the actual changes. 20150909 01:47:34-!- Appleman1234 [~Appleman1@KD106161084048.au-net.ne.jp] has quit [Ping timeout: 260 seconds] 20150909 01:57:28-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150909 02:00:13-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 256 seconds] 20150909 02:00:13-!- wedge010 is now known as wedge009 20150909 02:21:12-!- bumbadadabum [~bumbadada@wesnoth/developer/bumbadadabum] has quit [Ping timeout: 250 seconds] 20150909 02:36:14-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has quit [Ping timeout: 240 seconds] 20150909 02:36:16-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20150909 02:42:33-!- Turuk [~Turuk@wesnoth/forum-moderator/turuk] has quit [Ping timeout: 246 seconds] 20150909 02:44:40-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20150909 02:44:40-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20150909 02:44:54-!- Appleman1234 [~Appleman1@KD111239020075.au-net.ne.jp] has joined #wesnoth-dev 20150909 02:47:59-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has joined #wesnoth-dev 20150909 02:52:11-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has quit [Quit: http://quassel-irc.org - Chat comfortably. Anywhere.] 20150909 02:56:00-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has joined #wesnoth-dev 20150909 03:20:34-!- Appleman1234 [~Appleman1@KD111239020075.au-net.ne.jp] has quit [Ping timeout: 250 seconds] 20150909 03:21:21< Aginor> shadowm: put all the options(...) statement close to the top, before any dependencies of the project is puilled in 20150909 03:21:38< Aginor> shadowm: I'll do the reorder as a PR 20150909 03:30:13-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20150909 03:38:00-!- jinblack [~jinblack@128.111.48.6] has quit [Remote host closed the connection] 20150909 04:14:05-!- jinblack [~jinblack@ip184-187-174-106.sb.sd.cox.net] has joined #wesnoth-dev 20150909 04:16:49-!- Appleman1234 [~Appleman1@KD106161082219.au-net.ne.jp] has joined #wesnoth-dev 20150909 04:26:26-!- subliun [~quassel@unaffiliated/subliun] has joined #wesnoth-dev 20150909 04:31:31-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has joined #wesnoth-dev 20150909 04:38:01-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20150909 04:49:37-!- [Relic] [~Relic]@2602:306:33a3:6d30:393c:5de7:e3cf:695d] has quit [Quit: I press the magic X and all the weirdos go away!] 20150909 05:05:26-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has quit [Ping timeout: 240 seconds] 20150909 05:12:26-!- irker137 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20150909 05:14:25-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150909 05:15:31-!- oldlaptop [~quassel@50-107-94-87.adr02.mskg.mi.frontiernet.net] has joined #wesnoth-dev 20150909 05:20:46-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has joined #wesnoth-dev 20150909 05:28:57-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20150909 05:29:24< Catoptromancy> zookeeper, server 3 20150909 05:33:37< zookeeper> cool, give me 5 mins... 20150909 05:40:40< zookeeper> ok, got the log? 20150909 05:41:16< Catoptromancy> ya 20150909 05:41:20< Catoptromancy> heh still playing 20150909 05:41:24< Catoptromancy> trying to finish this one 20150909 05:41:40< Catoptromancy> can probably upload it now 20150909 05:41:47-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 256 seconds] 20150909 05:42:45< shadowm> Hm, what are you doing with server3? 20150909 05:43:12< zookeeper> testing the random map side placement OOS mystery 20150909 05:43:22< shadowm> On the trunk or 1.13 server? 20150909 05:43:26< zookeeper> 1.12 20150909 05:43:36< shadowm> Oh okay, never mind then. 20150909 05:43:53< Catoptromancy> http://www.geocities.ws/catodemos/wesnoth/newlog3.txt 20150909 05:44:00< Catoptromancy> not sure how useful 20150909 05:44:04< Catoptromancy> can compare logs I guess 20150909 05:44:13< Catoptromancy> i do not see any desyncs 20150909 05:45:06< zookeeper> err, you sure you ran the right build? i don't see the logging which my patch adds 20150909 05:45:29< Catoptromancy> not sure if I applied patch right 20150909 05:45:35< Catoptromancy> that is the right builds 20150909 05:45:39< Catoptromancy> its 100+ mbs 20150909 05:46:20< Catoptromancy> in main wesnoth directory 20150909 05:46:25< Catoptromancy> $patch -p1 < gistfile1.txt 20150909 05:49:39< zookeeper> well, i cannot know 20150909 05:50:14< Catoptromancy> what command would you use to apply a patch? 20150909 05:50:22< zookeeper> i have no idea 20150909 05:50:59-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Quit: wedge009] 20150909 05:50:59< zookeeper> which is why i said that you don't need to apply a patch 20150909 05:50:59-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150909 05:53:42< Catoptromancy> ill make a unpack to a new dir 20150909 05:53:51< Catoptromancy> and just read what the patch is doing and paste it in the code 20150909 06:00:07< Catoptromancy> hm 20150909 06:01:06< zookeeper> you'll know whether it's working, if by the time the game starts your log has the string "placings before sorting" in it 20150909 06:06:31< Catoptromancy> heh found the place to paste it 20150909 06:06:35< Catoptromancy> sorta 20150909 06:11:02< Catoptromancy> make -j 3 20150909 06:11:09< Catoptromancy> heh hopefully wont take forever 20150909 06:11:43< zookeeper> it won't, as long as you're not making it rebuild everything 20150909 06:12:26< Catoptromancy> i think I mangled something before 20150909 06:12:38< Catoptromancy> made a fresh directory 20150909 06:24:43< zookeeper> so, what's going on? 20150909 06:25:22-!- Appleman1234 [~Appleman1@KD106161082219.au-net.ne.jp] has quit [Ping timeout: 252 seconds] 20150909 06:26:19< Aginor> probably still compiling :D 20150909 06:26:59< Catoptromancy> heh 20150909 06:30:35< Aginor> I can finally head home from work, then I have a letter of resignation to write, dinner to eat and then I can finally do some wesnoth stuff :) 20150909 06:33:51-!- Kwandulin [~Miranda@p5B009FD2.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150909 06:37:44< Catoptromancy> harddrive out of space 20150909 06:54:19-!- jinblack [~jinblack@ip184-187-174-106.sb.sd.cox.net] has quit [Ping timeout: 250 seconds] 20150909 06:54:29< Catoptromancy> zookeeper, http://pastebin.com/LBpXip9s 20150909 06:54:30< Catoptromancy> = ( 20150909 06:54:32< Catoptromancy> i dunno 20150909 06:56:01< zookeeper> i can't know what you did 20150909 06:57:07< Catoptromancy> http://www.geocities.ws/catodemos/wesnoth/play_controller.cpp 20150909 06:57:41< zookeeper> well you completely mangled the code 20150909 06:57:57< Catoptromancy> heh I am good at that 20150909 06:57:59< zookeeper> so could you just paste in the code as i suggested? 20150909 06:58:13< Catoptromancy> even with + symbols? 20150909 06:58:18< zookeeper> no 20150909 06:58:26< Catoptromancy> i tried to squeeze it in there 20150909 06:58:59< zookeeper> < zookeeper> or you can replace the function in play_controller.cpp with this, if applying the patch isn't easy: https://gist.github.com/ln-zookeeper/7d2d5e4a68de453b6418 20150909 06:59:10< zookeeper> < zookeeper> that is, replace the current place_sides_in_preferred_locations() function in play_controller.cpp with that 20150909 06:59:31< Catoptromancy> so one line? 20150909 06:59:36< zookeeper> no 20150909 06:59:37< zookeeper> all of it 20150909 06:59:37< Catoptromancy> I do not know much about code 20150909 06:59:44< Catoptromancy> i did put all of it 20150909 07:00:01< zookeeper> ok, wait a minute and i'll write out the exact instructions 20150909 07:00:10< Catoptromancy> maybe send the .cpp? 20150909 07:00:15< Catoptromancy> swap in a single file 20150909 07:00:18< Catoptromancy> probably easier 20150909 07:00:55-!- Turuk [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has joined #wesnoth-dev 20150909 07:00:57< zookeeper> sure, that'll work 20150909 07:01:19-!- Turuk is now known as Guest21682 20150909 07:01:27< zookeeper> https://dl.dropboxusercontent.com/u/63964618/wesnoth/play_controller.cpp 20150909 07:02:27< Catoptromancy> compiled up nicely 20150909 07:02:36< Catoptromancy> might be another 10 minutes for the rest 20150909 07:03:50-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 07:13:02-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150909 07:13:32< Catoptromancy> zookeeper, im in server 20150909 07:13:38< zookeeper> yay 20150909 07:18:06-!- celticminstrel is now known as celmin|sleep 20150909 07:18:52-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has joined #wesnoth-dev 20150909 07:19:54< Catoptromancy> http://www.geocities.ws/catodemos/wesnoth/newlog4.txt 20150909 07:19:57< Catoptromancy> http://www.geocities.ws/catodemos/wesnoth/newlog4.bz2 20150909 07:21:14< zookeeper> that build you're using still doesn't have that logging code in it 20150909 07:21:27< Catoptromancy> arg 20150909 07:21:33< Catoptromancy> i used $wesnoth 20150909 07:21:40< Catoptromancy> instead of $./wesnoth 20150909 07:21:50< zookeeper> oops :> 20150909 07:21:52< Catoptromancy> so used installed one, not debugger 20150909 07:22:15< Catoptromancy> 1 more time 20150909 07:22:18< zookeeper> sure 20150909 07:22:46-!- Appleman1234 [~Appleman1@KD111239018195.au-net.ne.jp] has joined #wesnoth-dev 20150909 07:23:47-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has quit [Ping timeout: 268 seconds] 20150909 07:27:42< Catoptromancy> http://www.geocities.ws/catodemos/wesnoth/newlog5.txt 20150909 07:27:44< Catoptromancy> http://www.geocities.ws/catodemos/wesnoth/newlog5.bz2 20150909 07:28:05< zookeeper> perfect 20150909 07:28:38< zookeeper> i'll start comparing the output... 20150909 07:28:44< Catoptromancy> = ) 20150909 07:30:03< zookeeper> a-ha 20150909 07:31:00< zookeeper> std::sort sorts it differently on the clients 20150909 07:33:40< zookeeper> well, i believe i now know exactly what goes wrong, but not yet why 20150909 07:33:44< zookeeper> \o/ 20150909 07:34:27< Catoptromancy> maybe my system sources 20150909 07:35:09< zookeeper> i imagine it could very well depend on compiler or stl lib versions or something 20150909 07:36:01< zookeeper> but it should be relatively straightforward to fix the problem now 20150909 07:36:05< zookeeper> thanks! 20150909 07:36:15< Catoptromancy> awesome 20150909 07:39:19-!- Guest21682 [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has quit [Read error: Connection reset by peer] 20150909 07:45:39< zookeeper> it seems, how std::sort sorts equal elements varies by platform/compiler/something... so if the map placement scoring produces equal scores, those may end up in different order on different clients, leading to sides being placed to different castles -> OOS 20150909 07:47:14< zookeeper> apparent solutions would be to either expand the placing_info < operator to also check side and pos, or to just hand sort a different comparison function to use 20150909 07:48:47< shadowm> std::stable_sort exists. 20150909 07:49:00< zookeeper> oh, neat 20150909 07:49:14< zookeeper> Catoptromancy, want to test a fix now or tomorrow? :P 20150909 07:49:20< Catoptromancy> can do now 20150909 07:51:39< zookeeper> cool. in play_controller.cpp on line 391 change "std::sort" to "std::stable_sort" 20150909 07:53:05< zookeeper> (and nothing else needed) 20150909 07:56:00< Catoptromancy> built and in server 20150909 07:56:19< zookeeper> i'm on the server but you're not :P 20150909 07:56:30< Catoptromancy> soon heh 20150909 07:57:34 * zookeeper is super excited 20150909 08:01:02-!- joet [~joet@host86-163-221-140.range86-163.btcentralplus.com] has joined #wesnoth-dev 20150909 08:02:44< zookeeper> it works \o/ 20150909 08:03:16< Catoptromancy> wooo 20150909 08:03:47< zookeeper> shadowm, good tip :p 20150909 08:04:06< Catoptromancy> probably have a picky compiler 20150909 08:04:45< zookeeper> doesn't need to be picky, just needs to do differently one little detail which it's allowed to do differently 20150909 08:05:11< zookeeper> anyway... i guess we can count that mystery solved? it only took, what, >9 months? 20150909 08:05:20< Catoptromancy> heh ya 20150909 08:05:27< Catoptromancy> we have been playing almost everyday 20150909 08:05:34< Catoptromancy> lots of save games at turn 2 20150909 08:05:41< Catoptromancy> and reload server 20150909 08:05:47< zookeeper> oh dear 20150909 08:07:02< zookeeper> you having the fix won't prevent OOS unless everyone else has it too, and i don't know when 1.12.5 might be released 20150909 08:07:29< Catoptromancy> other people reporting it? 20150909 08:07:37< zookeeper> well, it _might_ prevent it if you're really lucky, but i doubt it 20150909 08:08:20< zookeeper> i don't recall if anyone else has reported it 20150909 08:10:19< shadowm> Possibly at the end of the month/start of next month. Don't quote me on that, though. 20150909 08:13:51-!- irker377 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150909 08:13:51< irker377> wesnoth: Lari Nieminen wesnoth:master cc9cf1a8a5fe / src/game_state.cpp: Avoid side placement OOS by using std::stable_sort http://git.io/vZG4j 20150909 08:15:00< irker377> wesnoth: Lari Nieminen wesnoth:1.12 dd532114f177 / src/play_controller.cpp: Avoid side placement OOS by using std::stable_sort http://git.io/vZGBt 20150909 08:16:26< shadowm> Changelogs and R_N probably, since if I understand correctly this is a visible issue. 20150909 08:17:51< zookeeper> yeah 20150909 08:26:57-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20150909 08:27:16< zookeeper> i guess anything that goes to R_N should go to players_changelog too? 20150909 08:31:11-!- bumbadadabum [~bumbadada@wesnoth/developer/bumbadadabum] has joined #wesnoth-dev 20150909 08:31:36< irker377> wesnoth: ln-zookeeper wesnoth:master bb4238ee30dc / RELEASE_NOTES changelog players_changelog: Updated changelogs and RELEASE_NOTES http://git.io/vZGEh 20150909 08:31:54< irker377> wesnoth: ln-zookeeper wesnoth:1.12 a6c4084c2492 / RELEASE_NOTES changelog players_changelog: Updated changelogs and RELEASE_NOTES http://git.io/vZGuT 20150909 08:34:37< zookeeper> Catoptromancy, want your heroic efforts recorded in the "Miscellaneous Contributors" credits? :P 20150909 08:34:50< Catoptromancy> was just a bug report 20150909 08:34:51< Catoptromancy> heh 20150909 08:35:31-!- mjs-de [~mjs-de@f048034207.adsl.alicedsl.de] has joined #wesnoth-dev 20150909 08:43:29-!- rayblade53 [~chatzilla@124.109.10.167] has joined #wesnoth-dev 20150909 08:44:40-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer] 20150909 08:44:48-!- rayblade53 is now known as vultraz 20150909 08:45:17-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20150909 08:45:17-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20150909 08:47:39-!- bumbadadabum [~bumbadada@wesnoth/developer/bumbadadabum] has quit [Ping timeout: 256 seconds] 20150909 08:59:14-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Remote host closed the connection] 20150909 08:59:38-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150909 09:00:23-!- msteiger [c02c2008@gateway/web/freenode/ip.192.44.32.8] has joined #wesnoth-dev 20150909 09:00:52< msteiger> hey @all 20150909 09:01:25< msteiger> I was wondering if the rule processing was all done in Lua 20150909 09:02:09-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 250 seconds] 20150909 09:02:31< zookeeper> rule processing? you mean the game rules logic? 20150909 09:02:42< msteiger> terrain definition mostly 20150909 09:03:01< msteiger> I'd like to use the tile definitions in a "research" project at uni 20150909 09:03:17< zookeeper> no, they're on the c++ side 20150909 09:03:38< msteiger> as I understand it, the alignment of tiles is specified in WML 20150909 09:03:46< zookeeper> i mean, the logic for processing the terrain graphics rules (which are written in WML) all happens in c++ 20150909 09:04:20< msteiger> the spec is in terrain-graphics.cfg and terrain.cfg, right? 20150909 09:05:16< zookeeper> the spec is in http://wiki.wesnoth.org/TerrainGraphicsWML (and http://wiki.wesnoth.org/TerrainWML), but terrain-graphics.cfg is where the rules are written, yes 20150909 09:05:55< msteiger> hmm .. we're all Java folks here and hoped we could just use a lua wrapper 20150909 09:06:00< zookeeper> (but it mostly uses macros which live in core/terrain-graphics/) 20150909 09:06:06< msteiger> ok thanks 20150909 09:06:21-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 256 seconds] 20150909 09:06:42< zookeeper> i don't think there's any feasible way to utilize our terrain graphics rules for external purposes 20150909 09:06:47< msteiger> so we'd need to wrap the C++ code in a library or write a Java-based parser I guess 20150909 09:08:04< zookeeper> for one, most of the actual WML code for the rules is buried under tons of WML preprocessoring, the actual logic of how exactly a given terrain is drawn is sometimes very difficult to uncover 20150909 09:08:51< msteiger> that's good to know - I had some difficulties when digging into it 20150909 09:09:22< zookeeper> if for some reason one really needed to do it anyway, i'd suggest outputting the raw preprocessed WML and thus getting the rules as-is without any preprocessor cruft... but then you'd have a massive pile of hard-to-decipher rules 20150909 09:09:39< zookeeper> what is it that you really want to do with them? :P 20150909 09:10:18< msteiger> we have this economy simulation and would like to visualize some of the interactions on a 2D terrain 20150909 09:10:35< msteiger> it's a hex grid, so the Wesnoth tiles would fit in great (they also look great) 20150909 09:11:19< msteiger> I'm extracting the terrain (biome) definition from a Java world generator 20150909 09:11:29-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150909 09:11:47< msteiger> so I have a mapping from grid-pos to terrain-type 20150909 09:12:17< msteiger> what's missing is the assignment of terrain-type to Wesnoth tile image file (modulo rotation, overlays, etc) 20150909 09:12:56< zookeeper> right 20150909 09:12:58< msteiger> I also have a (simple) renderer for hex-grids 20150909 09:13:06< msteiger> does that make sense? 20150909 09:13:20< zookeeper> i guess 20150909 09:13:59< zookeeper> there's been a few (?) attempts at an online map viewer which can render wesnoth maps, but i don't think any of them handle terrain transitions, but just draw the base tiles 20150909 09:14:37< msteiger> that should be fairly straightforward I would assume 20150909 09:15:00< msteiger> if you just copy a handful of base images and refer to them 20150909 09:15:58-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 09:17:02< zookeeper> yeah, you just need to map each terrain to an image, which would be easy enough to do by hand 20150909 09:17:22< zookeeper> transitions and multi-hex images (for example mountains) are really the tricky part 20150909 09:18:19< zookeeper> here's one such viewer: http://mproud.com/wesnoth/canvas/ 20150909 09:18:37< msteiger> great - thanks! I was just searching the web for such a viewer 20150909 09:18:54< msteiger> do you think it's feasible to wrap the whole thing in a library? 20150909 09:19:52< zookeeper> no idea 20150909 09:20:14< msteiger> hm ok - than it's probably not trivial at least 20150909 09:20:14< zookeeper> http://forums.wesnoth.org/viewtopic.php?t=36714 20150909 09:21:34< msteiger> I see two options now: live with a small set of hand-made mappings or write parser for the pre-processed WML rules 20150909 09:22:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 272 seconds] 20150909 09:22:14< msteiger> the rule format is specific for Wesnoth, right? 20150909 09:22:40< zookeeper> very much so 20150909 09:23:08< msteiger> ok 20150909 09:23:30< msteiger> thank you - you saved me a lot of time 20150909 09:23:36< zookeeper> and note that there's literally thousands of individual rules 20150909 09:24:15< msteiger> I was hoping that a simple parser could deal with the majority of transition rules at least 20150909 09:24:19< zookeeper> i don't even know if it's >10k or not 20150909 09:24:37< msteiger> there was a command line tool to dump the pre-processed rules, right? 20150909 09:24:52< Aginor> msteiger: you may wish to see if there's a java library that can import tiled hexagonal maps 20150909 09:25:31< msteiger> for rendering? 20150909 09:26:14< zookeeper> i think there's something with which you can dump the preprocessed rules (or more likely all WML), but i don't know/recall what it is 20150909 09:26:54< vultraz> --preprocess? 20150909 09:28:09< msteiger> ah - that's easy 20150909 09:28:11< msteiger> thanks 20150909 09:29:29< zookeeper> all the terrain graphics rules are in [terrain_graphics] tags, [terrain] tags only define the individual terrains (= their terrain codes and gameplay effects etc) 20150909 09:32:46< msteiger> will give it a try - thanks again for your help 20150909 09:32:51< msteiger> you guys have been very helpful 20150909 09:33:58-!- Kwandulin [~Miranda@p5B009FD2.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150909 09:38:35-!- bumbadadabum [~bumbadada@wesnoth/developer/bumbadadabum] has joined #wesnoth-dev 20150909 09:45:31< Soliton> zookeeper: nice work on the OOS fix! maybe a quick look over other std::sort calls would be in order. 20150909 09:49:55< zookeeper> a very quick look suggests no other dangerous uses 20150909 09:50:26< zookeeper> and by suggests i mean "nothing jumps out as being obviously wrong" 20150909 09:51:44-!- bumbadadabum [~bumbadada@wesnoth/developer/bumbadadabum] has quit [Remote host closed the connection] 20150909 09:56:38-!- msteiger [c02c2008@gateway/web/freenode/ip.192.44.32.8] has quit [Quit: Page closed] 20150909 09:59:07-!- Kwandulin [~Miranda@p5B009FD2.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150909 10:03:59-!- Appleman1234 [~Appleman1@KD111239018195.au-net.ne.jp] has quit [Remote host closed the connection] 20150909 10:04:35< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 95bab79eab49 / src/ (unit_display.cpp unit_display.hpp): Allow unit_attack() to play an optional list of extra sounds on a hit http://git.io/vZqc1 20150909 10:04:37< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 f6c6c482de6e / src/ (game_config.cpp game_config.hpp): Added list of customizable poison/slow/petrify sounds to game_config http://git.io/vZqcM 20150909 10:04:39< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 9f27fb73f44b / src/actions/attack.cpp: Play poison/slow/petrify sounds from game_config when status inflicted http://git.io/vZqcD 20150909 10:04:41< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 212ef61fff52 / src/unit_animation.cpp: Use the poison sound from game_config in "poisoned" animations http://git.io/vZqcy 20150909 10:04:43< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 d89ab75b6374 / src/game_config.cpp: Fixed custom status sounds not getting read http://git.io/vZqcS 20150909 10:04:45< irker377> wesnoth: gfgtdf wesnoth:sdl2 252d723dfba1 / src/terrain_builder.cpp: remove support for [terrain_graphics][tile]loc=x,y http://git.io/vZJM5 20150909 10:04:47< irker377> wesnoth: gfgtdf wesnoth:sdl2 3f0839b98ae4 / src/terrain_builder.cpp: Merge pull request #484 from wesnoth/gfgtdf-patch-terrain_loc http://git.io/vZJhi 20150909 10:04:49< irker377> wesnoth: mattsc wesnoth:sdl2 f06030b0f5d5 / data/ai/micro_ais/ (4 files in 2 dirs): Fast Micro AI: add support for [avoid] tags http://git.io/vZUJf 20150909 10:04:51< irker377> wesnoth: mattsc wesnoth:sdl2 10ee2f65d49f / data/ai/micro_ais/cas/ca_fast_combat.lua: Fast Micro AI: enable support of the default attacks aspect http://git.io/vZUOI 20150909 10:04:53< irker377> wesnoth: gfgtdf wesnoth:sdl2 8a70775cb384 / src/game_initialization/configure_engine.cpp: attempt to fix mp entry point selection http://git.io/vZUgi 20150909 10:04:55< irker377> wesnoth: gfgtdf wesnoth:sdl2 6c1e64a4e44c / src/game_initialization/mp_game_utils.cpp: attempt to fix assertion failure at connect_engine.cpp:876 http://git.io/vZU2x 20150909 10:04:57< irker377> wesnoth: Celtic Minstrel wesnoth:sdl2 e046f713ed1e / src/unit_types.cpp: When patching movetypes, don't let default= override everything http://git.io/vZU9z 20150909 10:04:59< irker377> wesnoth: Celtic Minstrel wesnoth:sdl2 cf18825a821c / src/unit_types.cpp: Merge branch 'CelticMinstrel/movetype' http://git.io/vZU9g 20150909 10:05:01< irker377> wesnoth: Andreas Löf wesnoth:sdl2 a4b957c347db / / (8 files in 4 dirs): Merge branch 'master' into sdl2 http://git.io/vZGQg 20150909 10:05:03< irker377> wesnoth: mattsc wesnoth:sdl2 5533d5728ac5 / data/ai/micro_ais/ (cas/ca_fast_combat.lua cas/ca_fast_combat_leader.lua micro_ai_wml_tag.lua): Fast Micro AI: separate out attacks by AI leader http://git.io/vZIKf 20150909 10:05:05< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 5c2927f52df2 / src/actions/attack.cpp: Moved extra_hit_sounds to a smaller scope http://git.io/vZqc9 20150909 10:05:07< irker377> wesnoth: mattsc wesnoth:sdl2 67f868306e8d / data/ai/micro_ais/cas/ (ca_fast_attack_utils.lua ca_fast_combat.lua ca_fast_combat_leader.lua): Fast Micro AI: clean up unused debug output http://git.io/vZISe 20150909 10:05:10< irker377> wesnoth: Elvish_Hunter wesnoth:sdl2 78e03f33f357 / data/tools/wmllint-1.4: wmllint-1.4: removed tabs http://git.io/vZLRh 20150909 10:05:11< irker377> wesnoth: Elvish_Hunter wesnoth:sdl2 3cbbede2717c / data/tools/GUI.pyw: GUI.pyw: use specific tooltip font http://git.io/vZLRj 20150909 10:05:13< irker377> wesnoth: Elvish_Hunter wesnoth:sdl2 814d9d14781c / data/tools/GUI.pyw: GUI.pyw: allow changing tooltip text at runtime http://git.io/vZL0e 20150909 10:05:15< irker377> wesnoth: Elvish_Hunter wesnoth:sdl2 2e574252cb74 / data/tools/GUI.pyw: GUI.pyw: added more tooltips http://git.io/vZL0v 20150909 10:05:17< irker377> wesnoth: Ignacio R. Morelle wesnoth:sdl2 39033be9d3af / src/ (quit_confirmation.cpp quit_confirmation.hpp): Doxygen and other comment formatting http://git.io/vZtmv 20150909 10:05:20< irker377> wesnoth: Ignacio R. Morelle wesnoth:sdl2 e13126208078 / data/scenario-test.cfg: Rephrase a bit of unwieldy Lua that causes issues with my text editor http://git.io/vZtmf 20150909 10:05:23< irker377> wesnoth: soliton- wesnoth:sdl2 85a5c1c9c79a / src/ (6 files in 2 dirs): Merge pull request #478 from ln-zookeeper/status_sounds http://git.io/vZqcH 20150909 10:05:25< irker377> wesnoth: Wedge009 wesnoth:sdl2 05bbd701db28 / src/attack_prediction_display.cpp: Correct transparent damage graphs in SDL2 http://git.io/vZGQ2 20150909 10:05:27< irker377> wesnoth: ln-zookeeper wesnoth:sdl2 e4ed29c0ce23 / data/ (38 files in 13 dirs): Removed all uses of the now unnecessary SOUND:SLOW and SOUND:POISON http://git.io/vZqwh 20150909 10:05:29< irker377> wesnoth: ln-zookeeper wesnoth:sdl2 632b7f3a6300 / data/game_config.cfg: Defined slow/poison/petrify status sounds (same as hardcoded defaults) http://git.io/vZq6S 20150909 10:05:31< irker377> wesnoth: ln-zookeeper wesnoth:sdl2 30fa10eb291d / changelog: Updated changelog http://git.io/vZq69 20150909 10:05:33< irker377> wesnoth: Andreas Löf wesnoth:sdl2 fedf2478d3e3 / / (55 files in 20 dirs): Merge branch 'master' into sdl2 http://git.io/vZGQa 20150909 10:05:35< irker377> wesnoth: Andreas Löf wesnoth:sdl2 530ff130be33 / src/attack_prediction_display.cpp: Merge pull request #485 from wedge009/SDL2_damage_graphs http://git.io/vZGQV 20150909 10:06:03< Aginor> that's horrible :/ 20150909 10:09:30< zookeeper> hard to argue with that 20150909 10:11:00< Aginor> it didn't want to fast forward and I didn't want to squash commits 20150909 10:11:14< Aginor> maybe I could have tried rebasing 20150909 10:19:09-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150909 10:26:31-!- Turuk [~Turuk@174.97.3.219] has joined #wesnoth-dev 20150909 10:26:55-!- Turuk is now known as Guest36788 20150909 10:27:58-!- zombah [~zombah@2a02:28:3:1:214:4fff:fe47:5920] has joined #wesnoth-dev 20150909 10:30:17-!- Guest36788 [~Turuk@174.97.3.219] has quit [Client Quit] 20150909 10:30:36-!- Guest36788 [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has joined #wesnoth-dev 20150909 10:30:54-!- Guest36788 [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has quit [Client Quit] 20150909 10:31:37-!- Turuk_ [~Turuk@wesnoth/forum-moderator/turuk] has joined #wesnoth-dev 20150909 10:32:40-!- Turuk_ [~Turuk@wesnoth/forum-moderator/turuk] has quit [Client Quit] 20150909 10:37:17-!- Turuk_ [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has joined #wesnoth-dev 20150909 10:39:37-!- Turuk_ [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has quit [Changing host] 20150909 10:39:37-!- Turuk_ [~Turuk@wesnoth/forum-moderator/turuk] has joined #wesnoth-dev 20150909 10:39:37-!- Turuk_ is now known as Turuk 20150909 10:40:26< irker377> wesnoth: Elias Pschernig wesnoth:sdl2 1961c43f1640 / data/tools/unit_tree/update-wmlunits: [wmlunits] clear /data/add-ons http://git.io/vZsOZ 20150909 10:40:28< irker377> wesnoth: Elias Pschernig wesnoth:sdl2 225234b12173 / data/tools/wmlunits: [wmlunits: log used memory for pre-pass] http://git.io/vZsWv 20150909 10:40:30< irker377> wesnoth: Elias Pschernig wesnoth:sdl2 2cdcae629495 / data/tools/wmlunits: [wmlunits] fix typo http://git.io/vZs4b 20150909 10:40:32< irker377> wesnoth: Lari Nieminen wesnoth:sdl2 cc9cf1a8a5fe / src/game_state.cpp: Avoid side placement OOS by using std::stable_sort http://git.io/vZG4j 20150909 10:40:34< irker377> wesnoth: ln-zookeeper wesnoth:sdl2 bb4238ee30dc / RELEASE_NOTES changelog players_changelog: Updated changelogs and RELEASE_NOTES http://git.io/vZGEh 20150909 10:40:36< irker377> wesnoth: Andreas Löf wesnoth:sdl2 763db0efe945 / / (6 files in 4 dirs): Merge branch 'master' into sdl2 http://git.io/vZGpe 20150909 10:44:27-!- Shackra [~Jorge@186.177.2.148] has quit [Ping timeout: 265 seconds] 20150909 10:53:07-!- ypnos [~ypnos@lme51.informatik.uni-erlangen.de] has left #wesnoth-dev ["Quake"] 20150909 11:43:32-!- Kwandulin [~Miranda@p5B009FD2.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150909 12:06:35-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has joined #wesnoth-dev 20150909 12:07:55-!- joets [~joet@host86-152-153-240.range86-152.btcentralplus.com] has joined #wesnoth-dev 20150909 12:09:11-!- joet [~joet@host86-163-221-140.range86-163.btcentralplus.com] has quit [Ping timeout: 264 seconds] 20150909 12:10:06-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 250 seconds] 20150909 12:10:19-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150909 12:17:00< wedge009> Has the master been all muddled up again? 20150909 12:21:25-!- [Relic] [~Relic]@2602:306:33a3:6d30:7910:df48:f161:1904] has joined #wesnoth-dev 20150909 12:25:15-!- Turuk [~Turuk@wesnoth/forum-moderator/turuk] has quit [Ping timeout: 256 seconds] 20150909 12:46:36-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 272 seconds] 20150909 12:47:03-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has joined #wesnoth-dev 20150909 12:47:03-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has quit [Changing host] 20150909 12:47:03-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 12:50:57-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150909 13:01:54-!- louis94 [~~louis94@109.133.211.155] has joined #wesnoth-dev 20150909 13:06:57-!- jcnewjersey [~jcnewjers@pool-108-35-38-39.nwrknj.fios.verizon.net] has joined #wesnoth-dev 20150909 13:16:09-!- Kwandulin [~Miranda@p5B009FD2.dip0.t-ipconnect.de] has joined #wesnoth-dev 20150909 13:17:58-!- Turuk [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has joined #wesnoth-dev 20150909 13:18:20-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150909 13:18:48-!- Turuk is now known as Guest92638 20150909 13:27:56-!- joets [~joet@host86-152-153-240.range86-152.btcentralplus.com] has quit [Remote host closed the connection] 20150909 13:30:46-!- joet [~joet@host86-152-153-240.range86-152.btcentralplus.com] has joined #wesnoth-dev 20150909 13:31:53< irker377> wesnoth: mattsc wesnoth:master e9f77d1dbff7 / data/ai/micro_ais/ (cas/ca_fast_combat_leader.lua micro_ai_wml_tag.lua): Fast Micro AI: add optional parameters for attacks by AI leader http://git.io/vZZF8 20150909 13:47:10< irker377> wesnoth: mattsc wesnoth:master 74b54da6911c / data/ai/micro_ais/ (cas/ca_fast_combat_leader.lua micro_ai_wml_tag.lua): Fast Micro AI: fix a typo in a parameter name http://git.io/vZZhY 20150909 14:00:55-!- louis94 [~~louis94@109.133.211.155] has quit [Ping timeout: 268 seconds] 20150909 14:02:39-!- caoraivoso3 [2e32007c@gateway/web/freenode/ip.46.50.0.124] has joined #wesnoth-dev 20150909 14:02:47< caoraivoso3> hello there 20150909 14:04:33-!- celmin|sleep is now known as celticminstrel 20150909 14:10:07-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 246 seconds] 20150909 14:12:30-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 240 seconds] 20150909 14:30:51< irker377> wesnoth: Elias Pschernig wesnoth:master 00516dddbe66 / data/tools/unit_tree/update-wmlunits: [units.wesnoth.org] always clean up error log http://git.io/vZnsj 20150909 14:30:59-!- Kwandulin [~Miranda@p5B009FD2.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20150909 14:31:07< celticminstrel> Where's wesnothd's main entry point? 20150909 14:31:48< celticminstrel> ...oh wait, I forgot that was in a completely separate group in XCode. 20150909 14:31:54 * celticminstrel tries server.cpp. 20150909 14:32:05< irker377> wesnoth: gfgtdf wesnoth:master fe3f317cbc71 / src/ (carryover.cpp carryover.hpp): use config object to store menu items in carryover http://git.io/vZnGR 20150909 14:32:07< irker377> wesnoth: gfgtdf wesnoth:master 402a97e1fc94 / src/game_events/wmi_container.cpp: fix some code formatting http://git.io/vZnG0 20150909 14:32:09< irker377> wesnoth: gfgtdf wesnoth:master adc5eca39923 / src/ (config.cpp config.hpp): add optional string key parameter to config::append_children http://git.io/vZnGE 20150909 14:32:13< irker377> wesnoth: gfgtdf wesnoth:master 368a4ab284ec / src/reports.hpp: fix indention http://git.io/vZnGu 20150909 14:32:13< irker377> wesnoth: gfgtdf wesnoth:master 12e839b9b7ab / src/ (5 files in 2 dirs): remove level_ member of game_lua_kernel http://git.io/vZnGz 20150909 14:32:15< irker377> wesnoth: gfgtdf wesnoth:master 4103ae29f50c / src/ (play_controller.cpp play_controller.hpp): remove unused play_controller::start_turn_ variable http://git.io/vZnGg 20150909 14:32:18< irker377> wesnoth: gfgtdf wesnoth:master 4afe65b4da30 / src/ (6 files): move it_is_a_new_turn_ variable to tod_manager http://git.io/vZnG2 20150909 14:32:19< irker377> wesnoth: gfgtdf wesnoth:master 12b901933a1f / src/ (14 files in 4 dirs): make the unit id manager a member of game_board http://git.io/vZnGa 20150909 14:32:21< irker377> wesnoth: gfgtdf wesnoth:master 41e363a3fd71 / src/reports.cpp: fix a segfault caused by wesnoth.theme_items http://git.io/vZnGV 20150909 14:32:23< irker377> wesnoth: gfgtdf wesnoth:master 9ac0434c1d18 / src/play_controller.cpp: use play_controller::player_number_ to write [snapshot]playing_team= http://git.io/vZnGw 20150909 14:32:25< irker377> wesnoth: gfgtdf wesnoth:master 58874bdd0bec / src/ (game_state.cpp game_state.hpp play_controller.cpp): remove level_ from game_state class http://git.io/vZnGr 20150909 14:34:34-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has joined #wesnoth-dev 20150909 14:34:34-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has quit [Changing host] 20150909 14:34:34-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 14:35:02< celticminstrel> Hmm, the main entry point is in fact main(), and it doesn't seem to include SDL anywhere, so why is server_main.m even needed? 20150909 14:35:27-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc] 20150909 14:39:02< elias> celticminstrel: ther's: #include "network.hpp" 20150909 14:39:08< elias> which includes SDLnet.h 20150909 14:42:22< celticminstrel> Ah. 20150909 14:43:02-!- legoktm [~quassel@wikipedia/Legoktm] has quit [K-Lined] 20150909 14:43:10< celticminstrel> Does SDL_net.h include (directly or indirectly) SDL_main.h? 20150909 14:43:35< celticminstrel> Or I could check for myself. 20150909 14:45:52< elias> i don't know 20150909 14:46:10-!- legoktm [~quassel@2604:a880:800:10::1c2:b001] has joined #wesnoth-dev 20150909 14:46:34-!- legoktm is now known as Guest17574 20150909 14:48:18-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 240 seconds] 20150909 14:48:18< elias> i also seem to remember that wesnoth uses boost::asio, but seems not 20150909 14:48:33< celticminstrel> I think wesnoth does but the server doesn't. 20150909 14:49:00< celticminstrel> I wonder if the server still works in SDL2. Aginor, did you try it? 20150909 14:49:19< celticminstrel> I seem to recall reading that Wesnoth was accessing private things in SDL_net. 20150909 14:50:02< celticminstrel> ...I thought it was the campaign server that used SDL_net though... 20150909 14:50:11-!- Guest17574 [~quassel@2604:a880:800:10::1c2:b001] has quit [K-Lined] 20150909 14:51:19-!- legoktm_ [~quassel@2604:a880:800:10::1c2:b001] has joined #wesnoth-dev 20150909 14:55:05< celticminstrel> Also by the way Aginor, XCode is set to compile with -Werror and -Wunused, it looks like whatever you're using possibly isn't? 20150909 15:01:28-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev 20150909 15:01:28-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host] 20150909 15:01:28-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20150909 15:01:50< celticminstrel> Unless it's just a compiler difference. 20150909 15:02:12-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20150909 15:02:26-!- travis-ci [~travis-ci@ec2-54-87-25-251.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 15:02:27< travis-ci> gfgtdf/wesnoth-old#526 (level_removal - 752853e : gfgtdf): The build has errored. 20150909 15:02:27< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79483405 20150909 15:02:27-!- travis-ci [~travis-ci@ec2-54-87-25-251.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 15:02:45-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 15:04:55< celticminstrel> The -Werror setting leads to a few weird things though, like putting a prototype immediately preceding the definition... 20150909 15:06:18-!- caoraivoso3 [2e32007c@gateway/web/freenode/ip.46.50.0.124] has quit [Ping timeout: 246 seconds] 20150909 15:07:13< celticminstrel> Now I have a lot of link errors, the first of which is SDL_SetAlpha. 20150909 15:07:46< celticminstrel> The rest are all related to sdl::twindow. 20150909 15:07:53< celticminstrel> And wesnoth_main which is easy to fix. 20150909 15:08:23-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 15:08:24< travis-ci> gfgtdf/wesnoth-old#525 (level_removal - 151546b : gfgtdf): The build has errored. 20150909 15:08:24< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79481630 20150909 15:08:24-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 15:09:47-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has joined #wesnoth-dev 20150909 15:10:03-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20150909 15:10:42< celticminstrel> SDL_SetAlpha is referenced from lots of places. 20150909 15:11:06< celticminstrel> But twindow seems to only be referenced from CVideo. 20150909 15:14:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150909 15:15:32-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 268 seconds] 20150909 15:15:54-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 15:20:58-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150909 15:22:36-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has joined #wesnoth-dev 20150909 15:22:36-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 264 seconds] 20150909 15:26:37< celticminstrel> Ah, they're both just new source files that need to be included. 20150909 15:26:42-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 15:26:43< travis-ci> gfgtdf/wesnoth-old#528 (level_removal - 96c51c2 : gfgtdf): The build failed. 20150909 15:26:44< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79486747 20150909 15:26:44-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 15:35:29-!- Guest92638 [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has quit [Quit: Leaving] 20150909 15:36:59-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has joined #wesnoth-dev 20150909 15:36:59-!- boucman_work [~jrosen@80-15.80-90.static-ip.oleane.fr] has quit [Changing host] 20150909 15:36:59-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 15:43:49-!- prkc [~prkc@catv-89-134-159-103.catv.broadband.hu] has joined #wesnoth-dev 20150909 15:45:51-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 240 seconds] 20150909 15:46:00-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 15:46:01< travis-ci> gfgtdf/wesnoth-old#529 (level_removal - 905872a : gfgtdf): The build failed. 20150909 15:46:01< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79493145 20150909 15:46:01-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 15:46:26-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 15:50:00< celticminstrel> I said this in the wrong channel, whoops: "Well, it seems to work." 20150909 15:57:28-!- subliun [~quassel@unaffiliated/subliun] has quit [Ping timeout: 268 seconds] 20150909 15:58:49-!- travis-ci [~travis-ci@ec2-54-87-25-251.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 15:58:50< travis-ci> wesnoth/wesnoth#7327 (master - 58874bd : gfgtdf): The build was broken. 20150909 15:58:50< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/79482776 20150909 15:58:50-!- travis-ci [~travis-ci@ec2-54-87-25-251.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 16:05:03-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20150909 16:05:24-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20150909 16:05:32-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20150909 16:09:44-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 265 seconds] 20150909 16:13:03-!- Jozrael [~Jozrael@192.91.144.16] has joined #wesnoth-dev 20150909 16:15:27-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20150909 16:33:00-!- legoktm_ [~quassel@2604:a880:800:10::1c2:b001] has quit [Changing host] 20150909 16:33:00-!- legoktm_ [~quassel@wikipedia/Legoktm] has joined #wesnoth-dev 20150909 16:33:03-!- legoktm_ is now known as legoktm 20150909 16:39:50-!- ancestral [~ancestral@97-116-185-165.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20150909 16:40:36-!- zombah [~zombah@2a02:28:3:1:214:4fff:fe47:5920] has quit [Quit: Leaving] 20150909 16:43:43-!- travis-ci [~travis-ci@ec2-54-211-134-59.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 16:43:44< travis-ci> gfgtdf/wesnoth-old#532 (mp_replay_turn - ada8abc : gfgtdf): The build failed. 20150909 16:43:44< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79501737 20150909 16:43:44-!- travis-ci [~travis-ci@ec2-54-211-134-59.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 16:51:45-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 240 seconds] 20150909 16:54:46-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20150909 17:22:15-!- fabi [~quassel@176.0.15.19] has joined #wesnoth-dev 20150909 17:22:15-!- fabi [~quassel@176.0.15.19] has quit [Changing host] 20150909 17:22:15-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20150909 17:32:18-!- gfgtdf [~chatzilla@f054151021.adsl.alicedsl.de] has joined #wesnoth-dev 20150909 17:32:39-!- irker377 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20150909 17:39:31< gfgtdf> does anyonw knoe what im doing wrong? I disabled a boost test in this commit: https://github.com/gfgtdf/wesnoth-old/commit/ada8abc8ab580ffcbeccfba6ce4a37f5b0fbb980 but the travis report: https://s3.amazonaws.com/archive.travis-ci.org/jobs/79501761/log.txt still tells me it failed 20150909 17:49:24-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20150909 18:10:45-!- Elvish_Hunter [~elvish_hu@wesnoth/developer/elvish-hunter] has joined #wesnoth-dev 20150909 18:24:31-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 256 seconds] 20150909 18:25:39-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20150909 18:32:00< zookeeper> gfgtdf, i don't understand your multiplayer "back to turn X" PR. who is the option available to? 20150909 18:32:06< zookeeper> the host? 20150909 18:33:16-!- lr_ [4f2f9e13@gateway/web/freenode/ip.79.47.158.19] has joined #wesnoth-dev 20150909 18:34:49-!- lr_ [4f2f9e13@gateway/web/freenode/ip.79.47.158.19] has quit [Client Quit] 20150909 18:41:33-!- vifon [~vifon@bohdan.wu-be.de] has quit [Ping timeout: 246 seconds] 20150909 18:41:47< gfgtdf> zookeeper: to everyone 20150909 18:42:10< gfgtdf> zookeeper: the gamestate will just reset locally on that client and that client can then replay it to teh current gmestate 20150909 18:42:57-!- vifon [~vifon@bohdan.wu-be.de] has joined #wesnoth-dev 20150909 18:43:13-!- jinblack [~jinblack@128.111.48.6] has joined #wesnoth-dev 20150909 18:44:28< zookeeper> gfgtdf, right, so if for example you were afk on your opponent's turn, you can view a replay of the previous turn(s)? 20150909 18:44:51< gfgtdf> zookeeper: yes 20150909 18:46:31< zookeeper> okay, sounds useful 20150909 18:52:25-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20150909 18:55:05-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20150909 19:00:36-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 19:00:37< travis-ci> gfgtdf/wesnoth-old#533 (mp_replay_turn - 2a3284a : gfgtdf): The build has errored. 20150909 19:00:37< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79514727 20150909 19:00:37-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 19:07:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150909 19:09:13< shadowm> celticminstrel, elias: Only the add-ons client (yes, client, not server) uses Asio. 20150909 19:09:28< celticminstrel> ...client? 20150909 19:09:41< celticminstrel> Even when used from within Wesnoth? 20150909 19:09:52< celticminstrel> Or only the command-line client? 20150909 19:10:20< shadowm> I mean the add-ons client that is part of Wesnoth. The standalone command-line client uses something else entirely since it's written in Python. 20150909 19:13:26< Elvish_Hunter> That reminds me: elias, do you plan to try moving wmlunits and its dependencies to Python 3? That's the goal for our Python scripts 20150909 19:14:17< shadowm> baldras can only run python 3.1 atm (as a non-default alternative). 20150909 19:19:31-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20150909 19:21:43< elias> Elvish_Hunter: yes, I'd like to do that a lot 20150909 19:24:05< elias> i don't think i'd use any 3.2+ features only 20150909 19:24:24< elias> and wmlunits only should run in its VM afaik 20150909 19:24:49< elias> the wml parser itself is C++ anyway and the interface to it is Python3 as well as 2 20150909 19:24:51< celticminstrel> Is that the one that generates the HTML unit trees?. 20150909 19:24:58< elias> yeah 20150909 19:25:30< celticminstrel> I recall failing to get it to work locally. 20150909 19:25:36< elias> yeah 20150909 19:25:57< celticminstrel> I'm not sure if you were there for that. 20150909 19:27:07< elias> it needs some refactoring 20150909 19:28:31< elias> the whole thing started out as a simple tool to parse a .cfg file fpr nuits and create a .html for each... but then it got more and more options to handle campaigns and eras and talk to the addon server and handle inter-dependencies... 20150909 19:29:05< elias> so at this point it would be best to remove most of the options and just have it work with the fixed folder structure it uses on the server 20150909 19:29:15< Elvish_Hunter> And perhaps, try to make it run on Windows? 20150909 19:29:20< celticminstrel> I dunno. 20150909 19:29:41< celticminstrel> I think it'd be nice if I could generate my campaign's unit tree offline. 20150909 19:29:58< elias> well, I don't have access to Windows... but in theory it should work there 20150909 19:30:12< celticminstrel> But I'm not sure if that is in conflict with using a fixed folder structure. 20150909 19:30:21< elias> shouldn't be 20150909 19:30:52< elias> anyway, first step is Python3, I'll work on that tonight 20150909 19:31:08< Elvish_Hunter> Did you know that Microsoft released some free Windows VMs for testing purposes? Maybe you can use one of them 20150909 19:31:34< elias> maybe, I wouldn't mind trying 20150909 19:32:44< Elvish_Hunter> These VMs are available here: http://dev.modern.ie/tools/vms/ 20150909 19:34:38< elias> hmp, that's almost as big as the git clone wesnoth I just finished yesterday :/ 20150909 19:39:30-!- joet [~joet@host86-152-153-240.range86-152.btcentralplus.com] has quit [Ping timeout: 260 seconds] 20150909 19:47:48< Aginor> morning 20150909 19:49:56< celticminstrel> 'lo 20150909 19:50:38-!- travis-ci [~travis-ci@ec2-54-87-25-251.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 19:50:39< travis-ci> gfgtdf/wesnoth-old#534 (mp_replay_turn - 2a76263 : gfgtdf): The build has errored. 20150909 19:50:39< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79523657 20150909 19:50:39-!- travis-ci [~travis-ci@ec2-54-87-25-251.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 19:55:54-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20150909 19:57:06< shadowm> Aginor: Commit subject lines shouldn't have a trailing period. 20150909 19:57:18< shadowm> Spread the word. :p 20150909 19:57:57< shadowm> PR #486 seems fine to me... I assumed it was a bit more involved but it isn't. Curious how the ENABLE_SDL2 option worked then, though. 20150909 20:20:57-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20150909 20:21:52-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 20:21:53< travis-ci> gfgtdf/wesnoth-old#535 (mp_replay_turn - 5138061 : gfgtdf): The build passed. 20150909 20:21:53< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79534087 20150909 20:21:53-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 20:36:47-!- iwaim [~iwaim@2001:2c0:40e:2002:0:4:14:80] has quit [Ping timeout: 250 seconds] 20150909 20:37:06< Aginor> shadowm: it defaulted to off, hence it worked fine 20150909 20:37:22< Aginor> shadowm: it's not until I tried to default it to on that I realised things were broken 20150909 20:37:47< Aginor> I'll merge that PR into mainline later and then I'll carry on from there on sdl2 20150909 20:41:45-!- louis94 [~~louis94@109.133.211.155] has joined #wesnoth-dev 20150909 20:42:06-!- {V} [~V@105-70-ftth.on.nl] has quit [Ping timeout: 255 seconds] 20150909 20:43:12-!- {V} [~V@105-70-ftth.on.nl] has joined #wesnoth-dev 20150909 20:44:36-!- Elvish_Hunter [~elvish_hu@wesnoth/developer/elvish-hunter] has left #wesnoth-dev ["Ciao!"] 20150909 20:45:05-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Remote host closed the connection] 20150909 20:49:43-!- iwaim [~iwaim@rasteenie.alib.jp] has joined #wesnoth-dev 20150909 20:57:45-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 20:57:46< travis-ci> gfgtdf/wesnoth-old#536 (mp_replay_turn - 47cf5ac : gfgtdf): The build passed. 20150909 20:57:46< travis-ci> Build details : https://travis-ci.org/gfgtdf/wesnoth-old/builds/79540834 20150909 20:57:46-!- travis-ci [~travis-ci@ec2-54-80-14-117.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 21:03:36< celticminstrel> But I like having a trailing period. :| 20150909 21:07:08-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20150909 21:09:22-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20150909 21:10:31< shadowm> You wouldn't write a page heading like that. 20150909 21:12:26-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 240 seconds] 20150909 21:12:26-!- wedge010 is now known as wedge009 20150909 21:15:55< Aginor> https://travis-ci.org/wesnoth/wesnoth/jobs/79497309 20150909 21:16:00< Aginor> unknown location(0): fatal error in "test_1": memory access violation at address: 0x00000048: no mapping at fault address 20150909 21:16:15< gfgtdf> Aginor: y thats unrelated you the pr 20150909 21:16:24< gfgtdf> Aginor: its a bug in current wesnoth master 20150909 21:16:32< Aginor> could anyone help me to figure out what goes wrong 20150909 21:16:34< Aginor> ah, ok 20150909 21:16:58-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 250 seconds] 20150909 21:17:13< Aginor> thanks 20150909 21:17:46< Aginor> celticminstrel: I'll try to get to your PR tonight but I have a bunch of things on. It might not be until Saturday, but based on travis and your changes it's looking good 20150909 21:17:52-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20150909 21:17:59< Aginor> celticminstrel: I'll probably just merge after some testing 20150909 21:22:44-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Client Quit] 20150909 21:22:51-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20150909 21:23:57-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev 20150909 21:51:13-!- louis94 [~~louis94@109.133.211.155] has quit [Quit: Konversation terminated!] 20150909 21:54:17-!- irker920 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20150909 21:54:17< irker920> wesnoth: gfgtdf wesnoth:master d2545777625f / src/playsingle_controller.cpp: simplify fallback_ai_to_human_exception handling http://git.io/vZCNO 20150909 21:54:17< irker920> wesnoth: gfgtdf wesnoth:master 1172369dca92 / src/playsingle_controller.cpp: refactor playsingle_controller::play_side() http://git.io/vZCN3 20150909 21:54:17< irker920> wesnoth: gfgtdf wesnoth:master ded13b1cc84e / src/playsingle_controller.cpp: refactor playsingle_controller::before_human_turn http://git.io/vZCNs 20150909 21:54:18< irker920> wesnoth: gfgtdf wesnoth:master edd32073fafc / src/ (6 files): move play_side to play_controller http://git.io/vZCNG 20150909 21:54:19< irker920> wesnoth: gfgtdf wesnoth:master d74b85fffc47 / src/play_controller.cpp: set "side_number" in play_controller::do_init_side http://git.io/vZCNZ 20150909 21:54:21< irker920> wesnoth: gfgtdf wesnoth:master c910dc6533ea / src/playsingle_controller.cpp: remove a unneeded if http://git.io/vZCNn 20150909 21:54:23< irker920> wesnoth: gfgtdf wesnoth:master 11daa5113a20 / src/ (play_controller.cpp playturn.cpp): refactor maybe_do_init_side http://git.io/vZCNc 20150909 21:54:25< irker920> wesnoth: gfgtdf wesnoth:master c8f9b2b53078 / src/ (5 files): move function play_turn from playsingle_controller to play_controller http://git.io/vZCNC 20150909 21:54:27< irker920> wesnoth: gfgtdf wesnoth:master 9d9422a42324 / src/ (replay_controller.cpp replay_controller.hpp): refactor replay_controller http://git.io/vZCNW 20150909 21:54:29< irker920> wesnoth: gfgtdf wesnoth:master 942220da801c / src/ (play_controller.cpp play_controller.hpp): remove unused parameter http://git.io/vZCNl 20150909 21:54:31< irker920> wesnoth: gfgtdf wesnoth:master fab8b9dc303d / src/ (8 files in 2 dirs): dont keep [scenario]/[snapshot] config during play http://git.io/vZCN8 20150909 21:54:33< irker920> wesnoth: gfgtdf wesnoth:master 99c75bf9ae5a / src/ (5 files): use scoped_ptr for gamestate_ http://git.io/vZCN4 20150909 21:54:35< irker920> wesnoth: gfgtdf wesnoth:master 20fafdee28c7 / src/ (19 files in 3 dirs): simplify game_state construction http://git.io/vZCNB 20150909 21:54:37< irker920> wesnoth: gfgtdf wesnoth:master 8e875b845864 / src/ (5 files): move init_side_done_ to game_state class http://git.io/vZCNR 20150909 21:54:39< irker920> wesnoth: gfgtdf wesnoth:master 941f00e49164 / src/ (7 files): move player_number_ to game_state http://git.io/vZCN0 20150909 21:54:41< irker920> wesnoth: gfgtdf wesnoth:master ec8bf1e1f741 / src/ (9 files): move reset_gamestate function (reset_replay) to play_controller http://git.io/vZCNE 20150909 21:54:43< irker920> wesnoth: gfgtdf wesnoth:master cdb324c9d1f2 / src/ (replay_controller.cpp replay_controller.hpp): fix wml unit tests http://git.io/vZCNu 20150909 21:54:45< irker920> wesnoth: gfgtdf wesnoth:master 910641db40eb / src/ (6 files): fix view beeing temporarily reset in replay viewer http://git.io/vZCNz 20150909 21:54:47< irker920> wesnoth: gfgtdf wesnoth:master d85a71144646 / src/ (hotkey_handler_replay.cpp replay_controller.cpp replay_controller.hpp): improve replay button state check http://git.io/vZCNg 20150909 21:54:49< irker920> wesnoth: gfgtdf wesnoth:master dbe107fa4bbf / src/replay_controller.hpp: remove undefined function http://git.io/vZCNa 20150909 21:54:49< Catoptromancy> delicious spam 20150909 21:54:51< irker920> wesnoth: gfgtdf wesnoth:master 769d79a354b4 / src/replay_controller.cpp: simplify replay_controller::update_teams http://git.io/vZCNV 20150909 21:54:53< irker920> wesnoth: gfgtdf wesnoth:master b97bb35de91d / src/ (play_controller.cpp play_controller.hpp replay_controller.cpp): refactor play_controller::reset_gamestate http://git.io/vZCNw 20150909 21:54:55< irker920> wesnoth: gfgtdf wesnoth:master 7b9b85cd63cd / src/ (game_state.cpp game_state.hpp play_controller.cpp play_controller.hpp): move loading_game_ member to game_state class http://git.io/vZCNr 20150909 21:54:57< irker920> wesnoth: gfgtdf wesnoth:master 78755019c98e / src/ (6 files): add mp_replay_controller class http://git.io/vZCNo 20150909 21:54:59< irker920> wesnoth: gfgtdf wesnoth:master 81b6c3ab9957 / src/ (7 files): enable back to turn buttons in networked mp http://git.io/vZCNK 20150909 21:55:01< irker920> wesnoth: gfgtdf wesnoth:master 02990bafbfc2 / src/ (game_state.cpp game_state.hpp play_controller.cpp play_controller.hpp): fix some compiler warnings http://git.io/vZCN6 20150909 21:55:03< irker920> wesnoth: gfgtdf wesnoth:master 47cf5acf791a / src/tests/ (test_recall_list.cpp test_unit_map.cpp): disable broken test http://git.io/vZCNi 20150909 21:55:05< irker920> wesnoth: gfgtdf wesnoth:master 41d65f1d7505 / src/whiteboard/ (highlighter.cpp highlighter.hpp manager.cpp): fix a segfault when resetting replay http://git.io/vZCNX 20150909 21:55:07< irker920> wesnoth: gfgtdf wesnoth:master 7fc78c558659 / src/ (43 files in 6 dirs): Merge pull request #487 from gfgtdf/mp_replay_turn http://git.io/vZCN1 20150909 22:01:50< matthiaskrgr> woha 20150909 22:02:04< gfgtdf> Aginor: i commited a fix for the travis issue 20150909 22:02:14< gfgtdf> Aginor: (one of teh commits above) 20150909 22:02:31< gfgtdf> Aginor: you can push to teh pr to invoke a new travis build 20150909 22:07:40-!- mjs-de [~mjs-de@f048034207.adsl.alicedsl.de] has quit [Remote host closed the connection] 20150909 22:20:31-!- Turuk [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has joined #wesnoth-dev 20150909 22:20:41-!- Turuk [~Turuk@cpe-174-97-3-219.cinci.res.rr.com] has quit [Changing host] 20150909 22:20:41-!- Turuk [~Turuk@wesnoth/forum-moderator/turuk] has joined #wesnoth-dev 20150909 22:37:08-!- subliun [~quassel@unaffiliated/subliun] has joined #wesnoth-dev 20150909 22:37:33-!- travis-ci [~travis-ci@ec2-54-161-62-198.compute-1.amazonaws.com] has joined #wesnoth-dev 20150909 22:37:34< travis-ci> wesnoth/wesnoth#7337 (master - 7fc78c5 : gfgtdf): The build was fixed. 20150909 22:37:34< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/79559238 20150909 22:37:34-!- travis-ci [~travis-ci@ec2-54-161-62-198.compute-1.amazonaws.com] has left #wesnoth-dev [] 20150909 22:43:00-!- Shackra [~Jorge@186.177.2.148] has quit [Ping timeout: 264 seconds] 20150909 22:43:56-!- joet [~joet@host86-152-153-240.range86-152.btcentralplus.com] has joined #wesnoth-dev 20150909 22:49:06-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20150909 22:54:00-!- joet [~joet@host86-152-153-240.range86-152.btcentralplus.com] has quit [Quit: Leaving] 20150909 23:14:11< celticminstrel> Aginor, were you planning to do the SDL colour cursors thing? 20150909 23:25:17< Aginor> celticminstrel: it had kind of slipped off my radar, so no, not at this point 20150909 23:25:46< Aginor> That is probably something for 13.3 unless it's fairly quick 20150909 23:26:03< Aginor> we should raise a bug about it so it's not forgotten about again 20150909 23:26:12< celticminstrel> I think it could be quick, but I haven't looked more closely yet. 20150909 23:26:38< celticminstrel> There might already be a relevant bug. 20150909 23:27:07< Aginor> no, it needs to be changed for SDL2 (I think) 20150909 23:27:33-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20150909 23:28:11< celticminstrel> I don't know for sure, and maybe can't test since I think the Mac build completely disables them somehow, but I imagine the current implementation should work in SDL2. 20150909 23:30:22< celticminstrel> I'm not quite sure what I need to change to avoid that (maybe ancestral would know). 20150909 23:31:22< celticminstrel> Okay, so, do you think any more attention is needed from me on PR475? 20150909 23:32:21< celticminstrel> I'd like to get my foreach stuff finished... 20150909 23:34:16< Aginor> celticminstrel: wedge009 was looking at it a while back 20150909 23:34:31< celticminstrel> As for colour cursors, I'd be willing to work on it, but I'd prefer to wait until the sdl2 branch is merged to master, since switching back and forth between an SDL2 and SDL1.2 branch requires a full rebuild. 20150909 23:35:12< Aginor> celticminstrel: no, I think PR475 is good, but I need to do a final review and test. If nothing comes up I'll merge. Thanks :) 20150909 23:35:33< celticminstrel> You're saying wedge009 was looking at colour cursors or at PR475? 20150909 23:36:07< celticminstrel> Just make sure to merge manually, not with the merge button. :P 20150909 23:36:35< celticminstrel> You also might've noticed that I cherry-picked your SDL_main commit. 20150909 23:38:01< celticminstrel> I'm starting to think I should close the XCode project whenever I do any git operations, like checkout or rebase... it always starts indexing the moment anything changes. 20150909 23:39:16< celticminstrel> zookeeper: You around? 20150909 23:39:43< zookeeper> celticminstrel, i'd already be gone if i wasn't typing this :p 20150909 23:39:44< zookeeper> so good timing 20150909 23:40:01< zookeeper> what do you need? 20150909 23:40:46< irker920> wesnoth: gfgtdf wesnoth:master 90566fd08257 / src/ (game_state.cpp game_state.hpp play_controller.cpp play_controller.hpp): store the server request counter in the snapshot http://git.io/vZWcy 20150909 23:40:48< irker920> wesnoth: gfgtdf wesnoth:master 0f3d262946b0 / src/playsingle_controller.cpp: add a comment http://git.io/vZWcS 20150909 23:41:37< celticminstrel> zookeeper: I'd like your opinion on the details of my looping tags. http://forums.wesnoth.org/viewtopic.php?f=10&t=43047 20150909 23:42:06< celticminstrel> I know we've discussed it a little before. I'd like to finish it up soon, though. 20150909 23:43:14< zookeeper> well i can try to write a reply tomorrow 20150909 23:43:22< celticminstrel> Okay. 20150909 23:43:48< zookeeper> if you have anything specific you want me to comment on, i'll read the logs... 20150909 23:44:05< irker920> wesnoth: gfgtdf wesnoth:master 7a314517da83 / RELEASE_NOTES: Update RELEASE_NOTES http://git.io/vZWWY 20150909 23:46:58< celticminstrel> It's not covered in detail by that thread, but an opinion on my [break_if] and [continue_if] would also be welcome. 20150909 23:50:48-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 264 seconds] 20150909 23:51:11-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev 20150909 23:55:03< Aginor> celticminstrel: wedge009 has been looking at colour cursors with sdl2 20150909 23:55:17< celticminstrel> Ah, okay. 20150909 23:55:34< celticminstrel> Good to hear someone's already on it. 20150909 23:56:02< Aginor> celticminstrel: you wrote you cherry picked my commit; I take it you have tested my commit and it's working? - I made the changes blind and haven't tested myself :) 20150909 23:56:04-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20150909 23:56:33< celticminstrel> Your commit worked, yes, though I couldn't compile with just that since it didn't fix the same issue in the wesnothd. 20150909 23:56:58< celticminstrel> Also I'm pretty sure your commit broke the SDL1.2 build, which I think I fixed (but haven't tested). 20150909 23:58:16< celticminstrel> I also had to add some new source files to the XCode build - window.cpp and alpha.cpp. 20150909 23:58:45< celticminstrel> I saw a bunch of other source files in src/sdl/ that I don't recall being there before, but they didn't seem to be required for the build to work, so I didn't add them. 20150909 23:59:00< celticminstrel> Oh, I added compat.hpp too. 20150909 23:59:28< celticminstrel> Well, you can see what I did just by looking at the commit. :P 20150909 23:59:55< celticminstrel> The changes to events.?pp were because of -Werror -Wunused --- Log closed Thu Sep 10 00:00:10 2015