--- Log opened Wed Jun 25 00:00:06 2014 --- Day changed Wed Jun 25 2014 20140625 00:00:06< shadowm> It also has no copyright statement. 20140625 00:02:14< shadowm> teambuilder.hpp is a "the whole implementation in the declaration" class, suspicious. 20140625 00:04:59< shadowm> It seems to be included from a single file so I guess that makes it considerably less suspicious. 20140625 00:05:01-!- ancestral [~ancestral@17.114.45.98] has quit [Quit: ancestral] 20140625 00:10:32< shadowm> gfgtdf, iceiceice: I'll leave it to you to check which items belong to you and which don't. 20140625 00:11:19< shadowm> I'm rather certain these are all recently (< 1 year) added files. 20140625 00:11:24< irker701> wesnoth: gfgtdf wesnoth:master e13775f31e55 / src/ (6 files): remove mp_game_settings::share_view/maps http://git.io/9k6rzg 20140625 00:12:38< shadowm> As a reminder, Doxygen documentation /** Looks like this */ and is peppered with commands from . 20140625 00:13:05< shadowm> Although we usually don't use more than @param, @code, and @verbatim. 20140625 00:13:37< shadowm> Also, we use the @-syntax, not backslashes. 20140625 00:14:22< shadowm> Finally, the importance of all this is that your documentation can be parsed and formatted nicely by editors that understand Doxygen comments, and Doxygen itself, which is used to generate the contents of . 20140625 00:14:42< shadowm> But I'm sure you knew all this already and were merely procrastinating on the formatting. 20140625 00:15:12-!- prkc [~prkc@5400907B.dsl.pool.telekom.hu] has quit [Remote host closed the connection] 20140625 00:15:30< shadowm> Oh, we also use @note and @return. 20140625 00:15:56< shadowm> Those should be fairly self-explanatory, especially if you look at existing usage. 20140625 00:19:48-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140625 00:21:05< iceiceice_> shadowm: unit_animation_component came out of unit, 20140625 00:21:09< iceiceice_> i dont believe i destroyed any documentation 20140625 00:21:23< shadowm> This all still counts as new code. 20140625 00:21:33-!- spoffy [~spoffy@host-80-47-182-115.as13285.net] has quit [Quit: leaving] 20140625 00:21:56< iceiceice_> about the unit_ptr, yeah i realized i used bad case, 20140625 00:21:57< iceiceice_> i can fix that 20140625 00:22:50< iceiceice_> teambuilder.hpp i made earlier, just to take code out of the game_data.hpp file 20140625 00:22:56< iceiceice_> that code is only used there though 20140625 00:23:11< iceiceice_> if someone finds another use for it then i guess should move impl to a compilation unit 20140625 00:24:25< iceiceice_> shadowm: unfortunately i know very little about how the animation parts of the engine actually work, 20140625 00:24:39< iceiceice_> the only comments iw ould be able to write about unit_animation_component are likely trivially obvious 20140625 00:24:49< iceiceice_> i only moved them out because it was obvious to me that they were animation related 20140625 00:25:20-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140625 00:29:14< iceiceice_> gfgtdf: thanks for pointing this out in action_wml, it's a mistake in my code 20140625 00:29:33< iceiceice_> does it say this anywhere else? 20140625 00:30:47< gfgtdf> iceiceice_: no that was the only occurane of "variable casted to bool" warning. 20140625 00:34:37< iceiceice_> i wonder why id dint get a warning for enum caste dto bool :/ 20140625 00:34:42< iceiceice_> or why travis didnt give one 20140625 00:36:16< iceiceice_> http://stackoverflow.com/questions/10464291/why-does-gcc-not-warn-when-an-enum-or-int-value-is-passed-on-as-a-functions-arg 20140625 00:36:22< iceiceice_> apparently there's no way to fix it :( 20140625 00:39:01< irker701> wesnoth: Chris Beck wesnoth:master 6ec86c98a246 / src/game_events/action_wml.cpp: fixup 0f5876fe38067c9783f41ab769e485dd8705e30e http://git.io/tx-2Xg 20140625 00:39:03< irker701> wesnoth: Chris Beck wesnoth:master 0982d9dc580d / src/ (8 files in 2 dirs): Merge branch 'master' of git://github.com/wesnoth/wesnoth http://git.io/DXm-UA 20140625 00:39:15< iceiceice_> gfgtdf: ^ 20140625 00:39:21< irker701> wesnoth: Ignacio R. Morelle wesnoth:master 6c5e9e37e06d / src/campaign_server/campaign_server.cpp: campaignd: Print the destination IP in the send_error() call http://git.io/uagu_g 20140625 00:39:24< irker701> wesnoth: Ignacio R. Morelle wesnoth:master 6b8e42dfe277 / src/campaign_server/campaign_server.hpp: campaignd: Add a typedef for the handlers map http://git.io/PSkaHQ 20140625 00:39:27< irker701> wesnoth: Ignacio R. Morelle wesnoth:master df54918c3629 / src/campaign_server/campaign_server.cpp: campaignd: Use find() to locate a request handler http://git.io/bp5dRw 20140625 00:39:30< irker701> wesnoth: Ignacio R. Morelle wesnoth:master efcf8f7b6aa4 / src/campaign_server/campaign_server.cpp: campaignd: Reject bad requests with an [error] block http://git.io/rWUpOQ 20140625 00:39:40< gfgtdf> ok 20140625 00:42:23< gfgtdf> iceiceice_: i think c++ should support named paramters as a language feature. 20140625 00:42:54< iceiceice_> yeah it would be a good thing 20140625 00:45:03< irker701> wesnoth: Ignacio R. Morelle wesnoth:master 46815ee00841 / src/campaign_server/campaign_server.hpp: campaignd: Document send_message/send_error's WML output and side-effects http://git.io/fjhPDQ 20140625 00:45:49< iceiceice_> idk i guess could use boost parameter: http://www.boost.org/doc/libs/1_36_0/libs/parameter/doc/html/index.html 20140625 00:45:54< iceiceice_> it mgiht make our compile times go to hell though 20140625 00:46:06-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140625 00:49:51-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140625 00:50:54< irker701> wesnoth: Ignacio R. Morelle wesnoth:master 6629fdf64e7d / src/server/ (server.cpp server.hpp): wesnothd: Only reset the commands FIFO stream when reloading if needed http://git.io/P_nqkg 20140625 00:52:12-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20140625 00:54:52-!- kex_ [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 00:57:33-!- Kexoth [~kex@93-142-130-167.adsl.net.t-com.hr] has quit [Ping timeout: 240 seconds] 20140625 01:07:59< irker701> wesnoth: Chris Beck wesnoth:master f88de7f5d0e7 / src/unit_animation_component.hpp: add doxygen comments to unit_animation_component.hpp http://git.io/KxBJ1Q 20140625 01:08:01< irker701> wesnoth: Chris Beck wesnoth:master c319e27bb077 / src/ (4 files in 2 dirs): Merge branch 'master' of git://github.com/wesnoth/wesnoth http://git.io/SlQcpg 20140625 01:25:34< irker701> wesnoth: Chris Beck wesnoth:master f9a02e0b23b6 / src/ (fake_unit_ptr.cpp fake_unit_ptr.hpp): add doxygen comments to fake_unit_ptr.?pp http://git.io/4K1dRw 20140625 01:28:37-!- sachith500 [~kvirc@112.134.0.186] has joined #wesnoth-dev 20140625 01:31:50< irker701> wesnoth: Chris Beck wesnoth:master 92fbce248bc3 / src/recall_list_manager.hpp: add doxygen comments to recall_list_manager.hpp http://git.io/cASP2g 20140625 01:36:07-!- kex_ [~kex@93-137-10-176.adsl.net.t-com.hr] has quit [Remote host closed the connection] 20140625 01:36:43-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 01:41:49-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has quit [Ping timeout: 272 seconds] 20140625 01:42:34< irker701> wesnoth: Chris Beck wesnoth:master bd0688d75bd6 / src/ (fake_unit_manager.cpp fake_unit_manager.hpp): add doxygen comments to fake_unit_manager.?pp http://git.io/OGdMEg 20140625 01:44:45< gfgtdf> iceiceice_: you knwo why we dont replace the units advancements with the cfg childs [advancement] in https://github.com/wesnoth/wesnoth/blob/master/src/unit.cpp#L235 ? 20140625 01:45:14< gfgtdf> iceiceice_: i think there were some complains about this bahviour some time ago 20140625 01:45:24< iceiceice_> no i dont know 20140625 01:45:26< iceiceice_> its probably a bug 20140625 01:45:39< iceiceice_> but i dont know 20140625 01:46:33< iceiceice_> do you know why we dont pass the unit type id at this line? 20140625 01:46:34< iceiceice_> https://github.com/wesnoth/wesnoth/blob/master/src/unit.cpp#L336 20140625 01:46:39< iceiceice_> like we do here when the unit advances? 20140625 01:46:45< iceiceice_> https://github.com/wesnoth/wesnoth/blob/master/src/unit.cpp#L863 20140625 01:46:49< iceiceice_> i think that is probably a bug 20140625 01:47:39< iceiceice_> also i dont like that that stuff happens in the constructor, it seems like a bad idea 20140625 01:48:01< iceiceice_> it means that if someone makes a private lua unit, it spawns its event(s)? 20140625 01:49:32< gfgtdf> iceiceice_: hmm yes it seems so 20140625 01:51:58< iceiceice_> maybe there should be a warning about that ont he wiki 20140625 01:52:06< iceiceice_> it reminds me of EliDupree's remarks 6 months ago 20140625 01:52:19< iceiceice_> where making a unit in lua causes oos if it requires randomness to generate 20140625 01:52:41< iceiceice_> idk 20140625 01:58:19< irker701> wesnoth: Chris Beck wesnoth:master bf510761d19e / src/fake_unit_manager.hpp: fixup bd0688d75bd6462f0496c3ea909fc33c62b3d246 http://git.io/O4-F1Q 20140625 02:14:02-!- sachith500|2 [~kvirc@112.134.150.8] has joined #wesnoth-dev 20140625 02:16:33-!- sachith500 [~kvirc@112.134.0.186] has quit [Ping timeout: 240 seconds] 20140625 02:19:20< gfgtdf> iceiceice_: ok i made a pr about the [advancement] thing https://github.com/wesnoth/wesnoth/pull/223 20140625 02:21:17< iceiceice_> gfgtdf: can't you just use "merge_children" for that or somehting? 20140625 02:21:39< iceiceice_> or append children? 20140625 02:21:48< iceiceice_> hmm maybe im wrong 20140625 02:23:07< iceiceice_> idk maybe you should ask dugi to test it? he has git i think 20140625 02:24:20< gfgtdf> iceiceice_: i didn't find any method in config that does that for me, plus i like my method :p 20140625 02:24:48< iceiceice_> hehe 20140625 02:25:01-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 264 seconds] 20140625 02:25:05< iceiceice_> we should have like a fancy boost page 20140625 02:25:08< iceiceice_> on the wiki or smoething 20140625 02:25:45< gfgtdf> iceiceice_: hm i think boost has its own wiki ? 20140625 02:25:48< iceiceice_> idk or i could just learn boost 20140625 02:25:50< iceiceice_> hehe 20140625 02:25:52< iceiceice_> *learn it properly 20140625 02:26:27< iceiceice_> ok i gtg, cu 20140625 02:26:28-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20140625 02:27:27-!- happygrue [~Wintermut@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140625 02:37:39-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140625 02:44:41< shadowm> I'm going to rebuild the trunk wesnothd. 20140625 02:45:23< shadowm> As always, if you know of any issues speaking against that, you have 10 minutes. 20140625 02:52:50-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 02:52:50< travis-ci> [travis-ci] gfgtdf/wesnoth-old#162 (unit_advancements - 4bb214d : gfgtdf): The build passed. 20140625 02:52:50< travis-ci> [travis-ci] Build details : http://travis-ci.org/gfgtdf/wesnoth-old/builds/28371201 20140625 02:52:50-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 02:53:53-!- Ivanovic_ [~ivanovic@frnk-4d017be1.pool.mediaWays.net] has joined #wesnoth-dev 20140625 02:57:49-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 272 seconds] 20140625 02:59:47-!- Ivanovic_ is now known as Ivanovic 20140625 03:04:23-!- Ivanovic [~ivanovic@frnk-4d017be1.pool.mediaWays.net] has quit [Changing host] 20140625 03:04:23-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140625 03:09:28-!- sachith500|2 [~kvirc@112.134.150.8] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140625 03:11:47-!- gfgtdf [~chatzilla@e177126179.adsl.alicedsl.de] has quit [Read error: Connection reset by peer] 20140625 03:14:29-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 03:14:29< travis-ci> [travis-ci] wesnoth/wesnoth#3406 (master - bd0688d : Chris Beck): The build was broken. 20140625 03:14:29< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28369413 20140625 03:14:29-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 03:25:09-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 240 seconds] 20140625 03:25:12-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 03:29:39-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has quit [Ping timeout: 240 seconds] 20140625 03:34:11-!- sachith500 [~kvirc@112.134.150.8] has joined #wesnoth-dev 20140625 03:45:43-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has joined #wesnoth-dev 20140625 03:48:07< irker701> wesnoth: Chris Beck wesnoth:master 1a6b28b9901b / .travis.yml: reorder travis builds in order of increasing exp. length http://git.io/3IKenA 20140625 03:48:33-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140625 04:02:40-!- vultraz [~chatzilla@124.109.10.167] has joined #wesnoth-dev 20140625 04:02:40-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20140625 04:02:40-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140625 04:03:28-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection] 20140625 04:09:40-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer] 20140625 04:10:43-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140625 04:21:56< aquileia> oh, btw zookeeper, you forgot to update the undeforrmed map layer. As it's only relevant for previewing the label positions, I can work around that 20140625 04:26:11-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has joined #wesnoth-dev 20140625 04:34:15< irker701> wesnoth: Chris Beck wesnoth:master 77c2e5e0bac0 / src/ai/actions.cpp: remove unnecessary headers http://git.io/8eTdmw 20140625 04:34:17< irker701> wesnoth: Chris Beck wesnoth:master 4db2f069a7bf / src/ai/composite/ (goal.cpp goal.hpp): fixup some includes http://git.io/aTCHxQ 20140625 04:34:19< irker701> wesnoth: Chris Beck wesnoth:master 22cc8f7ffe67 / src/ai/formula/ (ai.cpp ai.hpp function_table.cpp): fixup some ai headers http://git.io/dVVqRA 20140625 04:50:00-!- faabumc [~vcr@wesnoth/developer/faabumc] has joined #wesnoth-dev 20140625 04:50:51-!- faabumc [~vcr@wesnoth/developer/faabumc] has quit [Client Quit] 20140625 04:51:36-!- faabumc [~vcr@wesnoth/developer/faabumc] has joined #wesnoth-dev 20140625 04:52:14-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 04:52:16< travis-ci> [travis-ci] wesnoth/wesnoth#3410 (master - 1a6b28b : Chris Beck): The build was fixed. 20140625 04:52:16< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28374895 20140625 04:52:16-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 04:53:01< irker701> wesnoth: Chris Beck wesnoth:master 9f30dc7792ad / src/game.cpp: fixup includes of game.cpp http://git.io/PP2nlQ 20140625 04:53:05< irker701> wesnoth: Chris Beck wesnoth:master 39e2b2097a77 / src/about.cpp: fixup includes for about.cpp http://git.io/mG4uNw 20140625 04:53:41-!- Gallaecio [~quassel@84.120.115.132.dyn.user.ono.com] has joined #wesnoth-dev 20140625 04:54:22-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 245 seconds] 20140625 05:05:02< irker701> wesnoth: Chris Beck wesnoth:master 39b48db92789 / src/ai/interface.hpp: remove unnecessary includes from ai interface header http://git.io/vLNd4w 20140625 05:13:21-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has quit [Ping timeout: 272 seconds] 20140625 05:14:01-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 05:18:07< aquileia> AI0867: The EI overlay is fixed now ( double-checked ingame) and 213 is ready (again) 20140625 05:18:52< aquileia> Btw, do you get a notification if I don't add a new comment but only edit an existing one? 20140625 05:19:01-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has quit [Ping timeout: 264 seconds] 20140625 05:19:48< aquileia> And should I double the PR for master, or will it just be cherry-picked? 20140625 05:25:35-!- cib1 [~cib@p5DD2353F.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140625 05:28:27< irker701> wesnoth: Chris Beck wesnoth:master c6988fddc26a / src/ai/lua/ (lua_object.hpp unit_advancements_aspect.cpp unit_advancements_aspect.hpp): fixup includes of lua ai headers http://git.io/4MXpoA 20140625 05:31:42-!- aquileia [2edf50c1@gateway/web/freenode/ip.46.223.80.193] has quit [Quit: Page closed] 20140625 05:35:17-!- faabumc [~vcr@wesnoth/developer/faabumc] has quit [Quit: Ex-Chat] 20140625 05:36:50-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 05:40:19< irker701> wesnoth: Chris Beck wesnoth:master 8cee306a2724 / src/ai/ (manager.cpp manager.hpp): fixup includes in ai/manager.?pp http://git.io/eKqgkw 20140625 05:40:21< irker701> wesnoth: Chris Beck wesnoth:master da7280366c1e / src/ai/registry.cpp: remove unnecessary includes from registry.cpp http://git.io/g70Esg 20140625 05:41:02-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has quit [Ping timeout: 244 seconds] 20140625 05:42:40< AI0867> aquileia: I do not get a notification in that case 20140625 05:57:51< irker701> wesnoth: Chris Beck wesnoth:master 3e07048530c8 / src/actions/undo.cpp: fixup includes in actions/undo.cpp http://git.io/HdXeRQ 20140625 06:05:10-!- happygrue [~Wintermut@wesnoth/developer/wintermute] has quit [Ping timeout: 240 seconds] 20140625 06:12:13< AI0867> aquileia: and what about the equivalent stuff regarding master? 20140625 06:17:00< irker701> wesnoth: Chris Beck wesnoth:master 198b89b61f6e / src/ (commandline_options.cpp commandline_options.hpp): fixup includes in commandline_options http://git.io/pQ2b9w 20140625 06:35:40-!- cib1 [~cib@p5DD2353F.dip0.t-ipconnect.de] has quit [Ping timeout: 240 seconds] 20140625 06:41:28-!- Gallaecio [~quassel@84.120.115.132.dyn.user.ono.com] has quit [Remote host closed the connection] 20140625 06:51:42-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140625 06:57:44-!- sachith500|2 [~kvirc@112.134.48.81] has joined #wesnoth-dev 20140625 07:00:07-!- sachith500|2 [~kvirc@112.134.48.81] has quit [Client Quit] 20140625 07:00:36-!- sachith500 [~kvirc@112.134.150.8] has quit [Ping timeout: 244 seconds] 20140625 07:02:54-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140625 07:12:31-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140625 07:15:26-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev 20140625 07:20:40< irker701> wesnoth: Nathan Walker wesnoth:master b5fbda3530fb / / (9 files in 3 dirs): Implement define= for mp scenarios and eras http://git.io/ungSeg 20140625 07:20:42< irker701> wesnoth: Nathan Walker wesnoth:master 99b3bd26997d / / (8 files in 2 dirs): Add define functionality to modifications. http://git.io/_ndZYA 20140625 07:20:44< irker701> wesnoth: Nathan Walker wesnoth:master b53461e075f3 / src/multiplayer.cpp: Fixed reloading for commandline mp http://git.io/s7LQLA 20140625 07:20:46< irker701> wesnoth: Nathan Walker wesnoth:master be366af5237d / data/multiplayer/scenarios/ (4 files): Implemented defines for largest mainline scenarios http://git.io/VnUzpQ 20140625 07:20:48< irker701> wesnoth: Nathan Walker wesnoth:master 6270674847ea / src/multiplayer.cpp: Fixed scoping in multiplayer commandline load http://git.io/C5xDcQ 20140625 07:20:50< irker701> wesnoth: Alexander van Gessel wesnoth:master 5ca7121822d0 / / (14 files in 4 dirs): Merge pull request #216 from Rift-Walker/scenario_era_mod_defines_mergable http://git.io/ATFlag 20140625 07:23:00-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20140625 07:41:30-!- cib [~cib@132.231.178.27] has joined #wesnoth-dev 20140625 07:42:05-!- cib is now known as Guest57447 20140625 07:49:01-!- Guest57447 [~cib@132.231.178.27] has quit [Ping timeout: 264 seconds] 20140625 07:58:14-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140625 08:00:52-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 08:02:02-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 08:02:02< travis-ci> [travis-ci] wesnoth/wesnoth#3419 (master - 5ca7121 : Alexander van Gessel): The build passed. 20140625 08:02:02< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28383054 20140625 08:02:02-!- travis-ci [~travis-ci@ec2-184-72-178-109.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 08:02:20< zookeeper> aquileia, well, of course i did... i think i'll just leave it because AFAICT the only difference is the placement of that one tiny forest patch 20140625 08:03:12-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has quit [Remote host closed the connection] 20140625 08:08:19-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Remote host closed the connection] 20140625 08:12:22-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has joined #wesnoth-dev 20140625 08:13:19-!- _8680_ [~8680@2002:4404:712c:0:1d54:c21f:e0c4:e166] has quit [Quit: leaving] 20140625 08:13:45-!- _8680_ [~8680@2002:4404:712c:0:a9ed:ad57:c7db:46a0] has joined #wesnoth-dev 20140625 08:33:38-!- Kexoth [~kex@212.92.210.53] has joined #wesnoth-dev 20140625 08:41:28-!- sachith500 [~kvirc@112.134.48.81] has joined #wesnoth-dev 20140625 08:52:52-!- sachith500 [~kvirc@112.134.48.81] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140625 09:01:32-!- Haudegen_ [~quassel@80-110-40-98.static.surfer.at] has joined #wesnoth-dev 20140625 09:07:38< irker701> wesnoth: Paweł Jackowski wesnoth:master 81f76e5a4d13 / po/wesnoth-dw/pl.po: Dead Water Polish translation update http://git.io/w4wpfQ 20140625 09:07:40< irker701> wesnoth: Paweł Jackowski wesnoth:master 0f3bedebedd1 / po/wesnoth-httt/pl.po: Heir To The Throne: Polish translation update http://git.io/upjCuQ 20140625 09:07:42< irker701> wesnoth: Paweł Jackowski wesnoth:master 75046836283f / po/wesnoth-ei/pl.po: Eastern Invasion: Polish translation update http://git.io/Z7rc0w 20140625 09:07:44< irker701> wesnoth: Paweł Jackowski wesnoth:master 402598a36593 / po/wesnoth-low/pl.po: Legend of Wesmere Polish translation update http://git.io/A6NiRw 20140625 09:07:46< irker701> wesnoth: Paweł Jackowski wesnoth:master 84648f1ee1da / po/wesnoth-trow/pl.po: The Rise of Wesnoth: Polish translation update http://git.io/-31g5w 20140625 09:07:48< irker701> wesnoth: Paweł Jackowski wesnoth:master ad12defedbdb / po/wesnoth-low/pl.po: Removed comments http://git.io/xLKqCw 20140625 09:07:50< irker701> wesnoth: Paweł Jackowski wesnoth:master ed06d2526f73 / po/wesnoth-tb/pl.po: Two Brothers: Polish translation update http://git.io/Ij8vfQ 20140625 09:07:52< irker701> wesnoth: Alexander van Gessel wesnoth:master 3f27d381d53a / po/ (6 files in 6 dirs): Merge pull request #192 from pjackowski/master http://git.io/XwARXA 20140625 09:08:09-!- Haudegen_ is now known as Haudegen 20140625 09:12:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 240 seconds] 20140625 09:12:12-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140625 09:25:37-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has quit [Ping timeout: 264 seconds] 20140625 09:27:25-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has joined #wesnoth-dev 20140625 09:38:56-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140625 09:53:45-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140625 09:54:38-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140625 09:58:48-!- travis-ci [~travis-ci@ec2-54-83-67-100.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 09:58:48< travis-ci> [travis-ci] wesnoth/wesnoth#3420 (master - 3f27d38 : Alexander van Gessel): The build has errored. 20140625 09:58:48< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28390038 20140625 09:58:48-!- travis-ci [~travis-ci@ec2-54-83-67-100.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 10:08:29-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!] 20140625 10:12:10-!- mjs-de [~mjs-de@f048226194.adsl.alicedsl.de] has joined #wesnoth-dev 20140625 10:17:46-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140625 10:25:34-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has joined #wesnoth-dev 20140625 10:29:38-!- aquileia [863c8ace@gateway/web/freenode/ip.134.60.138.206] has joined #wesnoth-dev 20140625 10:30:57< aquileia> zookeeper: The difference isn't only that forest, Lake Vrug and the Grey Woods are shifted as well (I had to move these labels intuivevly to reach the correct spot) 20140625 10:31:13< aquileia> But sure, if you don't want to change it, no problem 20140625 10:31:20< zookeeper> eh, how's that possible? 20140625 10:32:21< aquileia> I placed the "Vrugsee" label in the lake (or at least where it is in the undeformed map layer) and it was above it in the resulting overlay 20140625 10:36:34< zookeeper> yeah seems it's slightly off... somehow 20140625 10:36:38< zookeeper> i'll have to look at it later 20140625 10:38:26< aquileia> AI0867: I don't know whether that was a question or a request... PR 213 currently onlyy applies to 1.12 and I wnated to know whether you want me to file an additional one to apply to the master branch or whether it'll just be cherry-picked 20140625 10:38:44< aquileia> sorry if I was unclear, or if I misunderstood you 20140625 10:52:24-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: End Transmission.] 20140625 11:08:19-!- aquileia [863c8ace@gateway/web/freenode/ip.134.60.138.206] has quit [Ping timeout: 246 seconds] 20140625 11:12:25-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140625 11:12:45-!- Kexoth [~kex@212.92.210.53] has quit [Remote host closed the connection] 20140625 11:13:13-!- Kexoth [~kex@212.92.210.53] has joined #wesnoth-dev 20140625 11:14:48-!- aquileia [863c54b0@gateway/web/freenode/ip.134.60.84.176] has joined #wesnoth-dev 20140625 11:17:12< aquileia> AI0867: I just saw that you merged #213 (I thought irker would report for 1.12 as well) - thanks 20140625 11:17:40-!- Kexoth [~kex@212.92.210.53] has quit [Ping timeout: 240 seconds] 20140625 11:26:32-!- Turuk_ [40399531@gateway/web/cgi-irc/kiwiirc.com/ip.64.57.149.49] has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client] 20140625 11:29:44-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has quit [Remote host closed the connection] 20140625 11:42:37-!- aquileia [863c54b0@gateway/web/freenode/ip.134.60.84.176] has quit [Ping timeout: 246 seconds] 20140625 11:45:38-!- aquileia [863c54b0@gateway/web/freenode/ip.134.60.84.176] has joined #wesnoth-dev 20140625 11:47:17< aquileia> I was curious and checked - is it possible that PR 192 was intended for 1.12 as well? At least several lines in there are in 1.12 as well (I don't have time to go through all of it) 20140625 11:47:51< aquileia> Perhaps we should ask Pawel for which branch he intended his work? 20140625 11:49:18< aquileia> It's unusual to translate 1.13 when 1.12 still has deficiencies, and he might in fact have accidentally left the default 'master' as the branch to merge 20140625 11:58:33-!- aquileia [863c54b0@gateway/web/freenode/ip.134.60.84.176] has quit [Quit: Page closed] 20140625 12:04:38< irker701> wesnoth: Nils Kneuper wesnoth:1.12 40dd32d8e013 / / (18 files in 17 dirs): updated German translation http://git.io/1XlNJg 20140625 12:04:38< irker701> wesnoth: Nils Kneuper wesnoth:master 17553ffc1589 / / (18 files in 17 dirs): updated German translation http://git.io/gkw7ag 20140625 12:15:36< Ivanovic> obviously that was not german but vietnamese... 20140625 12:33:09< zookeeper> aquileia, urgh, i don't really understand what causes the problem 20140625 12:33:53< irker701> wesnoth: mattsc wesnoth:master d2699280b465 / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Update Xcode project http://git.io/WFI2yw 20140625 12:41:26< zookeeper> aquileia, oh i think i got it... i think. apparently i didn't deform the original map according to the deform guide. 20140625 12:43:11< zookeeper> luckily that's fixable, i'll try to do that tonight 20140625 12:50:27< irker701> wesnoth: mattsc wesnoth:master 7e84df7f6cc3 / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Update Xcode project http://git.io/YilF6w 20140625 13:00:19-!- Turuk_ [40399531@gateway/web/cgi-irc/kiwiirc.com/ip.64.57.149.49] has joined #wesnoth-dev 20140625 13:01:44-!- Kexoth [~kex@212.92.210.53] has joined #wesnoth-dev 20140625 13:03:14-!- prkc [~prkc@54028627.dsl.pool.telekom.hu] has joined #wesnoth-dev 20140625 13:06:20-!- Elvish_Hunter [6d35e0de@gateway/web/freenode/ip.109.53.224.222] has joined #wesnoth-dev 20140625 13:06:29< Elvish_Hunter> Hi all 20140625 13:07:05-!- Kexoth [~kex@212.92.210.53] has quit [Ping timeout: 272 seconds] 20140625 13:08:29< irker701> wesnoth: Elvish_Hunter wesnoth:master ebb4a80f46d4 / data/tools/GUI.pyw: wmllint GUI: fixed a bug on Python 2.7.7 that froze the application on Windows http://git.io/S5zhyw 20140625 13:08:30< irker701> wesnoth: Elvish_Hunter wesnoth:master 0ac30c7d0e84 / data/tools/README: Replaced the old description for wmllint_gui with the new one for GUI.pyw http://git.io/VAxifQ 20140625 13:08:32< irker701> wesnoth: Elvish_Hunter wesnoth:master 9fd8ba5ef9e7 / data/tools/GUI.pyw: wmllint GUI: now the focus follows the mouse pointer, allowing use of the mouse http://git.io/lYa9kw 20140625 13:13:30-!- Kexoth [~kex@212.92.210.53] has joined #wesnoth-dev 20140625 13:17:04< AI0867> 13:17 < aquileia> AI0867: I just saw that you merged #213 (I thought irker would report for 1.12 as well) - thanks ← I was confused about that too 20140625 13:20:36-!- TooLmaN [~TooLmaN@mail.thomsonplastics.com] has joined #wesnoth-dev 20140625 13:25:45-!- cib [~cib@p5DD2353F.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140625 13:26:09-!- cib is now known as Guest48170 20140625 13:34:34< vultraz> hello Elvish_Hunter 20140625 13:34:56< Elvish_Hunter> Hi vultraz! 20140625 13:36:47< vultraz> I see you've made progress on the gui 20140625 13:37:07< Turuk_> dun dun dun 20140625 13:37:54< irker701> wesnoth: Elvish_Hunter wesnoth:1.12 bc595d803872 / data/tools/GUI.pyw: wmltools GUI: backported bugfixes from trunk http://git.io/jQ7_nA 20140625 13:38:25-!- Elvish_Hunter_ [6d35e0de@gateway/web/freenode/ip.109.53.224.222] has joined #wesnoth-dev 20140625 13:38:53< Elvish_Hunter_> As you can see, I backported the changes to the stable series as well. 20140625 13:39:10-!- Elvish_Hunter [6d35e0de@gateway/web/freenode/ip.109.53.224.222] has quit [Ping timeout: 246 seconds] 20140625 13:41:05< Necrosporus> Hello 20140625 13:42:15-!- Elvish_Hunter_ is now known as Elvish_Hunter 20140625 13:42:34< vultraz> ah, nice 20140625 13:43:37< irker701> wesnoth: aquileia wesnoth:master f97ee90a8290 / data/campaigns/ (12 files in 5 dirs): Map localization: Remove duplicate old generation overlays http://git.io/qvrZSg 20140625 13:43:39< irker701> wesnoth: aquileia wesnoth:master 54218c87294b / data/campaigns/ (91 files in 73 dirs): Remove all old style bigmap overlays but the titlescreen http://git.io/-ZhlIw 20140625 13:43:41< irker701> wesnoth: aquileia wesnoth:master d5761df10b23 / po/ (wesnoth-ei/de.po wesnoth-httt/de.po wesnoth-trow/de.po): German translation: Minor progress on EI http://git.io/O9a1BA 20140625 13:43:43< irker701> wesnoth: aquileia wesnoth:master 74cb12eea098 / data/ (12 files in 12 dirs): German translation: Map overlays http://git.io/NrhT4Q 20140625 13:43:45< irker701> wesnoth: aquileia wesnoth:master d895f7d09527 / l10n-track: Update l10n-track http://git.io/CESCGA 20140625 13:45:05< Elvish_Hunter> Hmm... I suppose that I should mention the existence of the GUI at http://wiki.wesnoth.org/Maintenance_tools , right? 20140625 13:47:43< vultraz> yeah, probably 20140625 13:49:00< vultraz> Elvish_Hunter: is any of the stuff on that page outdated? 20140625 13:49:17-!- travis-ci [~travis-ci@ec2-54-204-106-131.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 13:49:17< travis-ci> [travis-ci] wesnoth/wesnoth#3423 (master - 7e84df7 : mattsc): The build passed. 20140625 13:49:17< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28404286 20140625 13:49:17-!- travis-ci [~travis-ci@ec2-54-204-106-131.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 13:49:57< Elvish_Hunter> Who knows? Probably yes. 20140625 13:50:22< Elvish_Hunter> For sure, there is an inconsistency where it says "-v -v -v -v: shows verbose parse details (developers only)." 20140625 13:50:46< Elvish_Hunter> My GUI and wmllint's help stop at -v -v -v. 20140625 13:53:12< vultraz> Ugh 20140625 13:53:19< vultraz> Updating the wiki is a hell of a task 20140625 13:55:37< irker701> wesnoth: gfgtdf wesnoth:master 4bb214d70398 / src/unit.cpp: don't ignore [advancement] on unit construction. http://git.io/CHfDyA 20140625 13:55:39< irker701> wesnoth: gfgtdf wesnoth:master b49eed56b3db / src/unit.cpp: fixup 'don't ignore [advancement] on unit construction' http://git.io/CNTjxQ 20140625 13:55:41< irker701> wesnoth: gfgtdf wesnoth:master e47e66e67272 / src/unit.cpp: Merge pull request #223 from gfgtdf/unit_advancements http://git.io/gUwRtQ 20140625 13:56:30< Elvish_Hunter> This is what I wrote, sounds good? http://pastebin.com/HhXqyhfS 20140625 14:08:05< Elvish_Hunter> Well, now I have to go. Bye! 20140625 14:08:11-!- Elvish_Hunter [6d35e0de@gateway/web/freenode/ip.109.53.224.222] has quit [Quit: Ciao!] 20140625 14:09:59-!- gfgtdf [~chatzilla@e177126179.adsl.alicedsl.de] has joined #wesnoth-dev 20140625 14:12:52-!- sachith500 [~kvirc@61.245.160.190] has joined #wesnoth-dev 20140625 14:19:13< gfgtdf> iceiceice: i removed share_view, sahre_maps manbers of mp_settings, i think i can clost https://github.com/wesnoth/wesnoth/pull/88 then ? 20140625 14:19:43< iceiceice> yes 20140625 14:20:53-!- molgrum [~molgrum@212.85.89.43] has quit [Quit: Lämnar] 20140625 14:44:11-!- dacovale [~niklas@dynamic.1.12.c0255ce81c80.4ce6762eb925.cust.bredband2.com] has quit [Quit: Leaving.] 20140625 14:45:16< irker701> wesnoth: Chris Beck wesnoth:master 58d5b36724d1 / src/log.cpp: fixup includes http://git.io/gVl8Jw 20140625 14:45:18< irker701> wesnoth: Chris Beck wesnoth:master 6f08d885261f / src/unit.cpp: fixup includes http://git.io/G3XXNQ 20140625 14:45:20< irker701> wesnoth: Chris Beck wesnoth:master 39f02ae96eca / src/scripting/ (lua.cpp lua.hpp): remove some unneeded AI headers from scripting/lua.?pp http://git.io/ahohDg 20140625 14:45:22< irker701> wesnoth: Chris Beck wesnoth:master 67f1fc28a303 / / (160 files in 113 dirs): Merge branch 'master' of git://github.com/wesnoth/wesnoth http://git.io/sffrrg 20140625 14:47:42-!- Kexoth [~kex@212.92.210.53] has quit [Remote host closed the connection] 20140625 14:54:45-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140625 14:59:16< irker701> wesnoth: Chris Beck wesnoth:master 1bc0fea10a77 / src/ (game_controller.cpp game_controller.hpp): fixup includes in game_controller.?pp http://git.io/zgGnJg 20140625 15:00:41< gfgtdf> iceiceice: #include "global.hpp" // for false_, bool_ ? 20140625 15:01:00< iceiceice> its sort of a glitch of the analyzer 20140625 15:01:18< iceiceice> there are some things it is not supposed to include, 20140625 15:01:39< iceiceice> but there is actually no way to tell it that, instead it wants me always to point it to some other place where it can get the thing 20140625 15:02:14< iceiceice> in some cases there is no correct place to get the thing (and the program doens't really need it) so i point it to global.hpp 20140625 15:02:46< iceiceice> i think the example is , theres a boost file like "boost/smart_ptr/safe_bool" or something 20140625 15:02:58< iceiceice> the program wants to add that whenever a boost smart pointer is present 20140625 15:06:16-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 244 seconds] 20140625 15:09:41-!- aquileia [2edf50c1@gateway/web/freenode/ip.46.223.80.193] has joined #wesnoth-dev 20140625 15:10:05< Necrosporus> Do I need to recompile the engine or it's enough to use master branch with old binary? 20140625 15:11:42-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140625 15:13:06< iceiceice> Necrosporus: its better to recompile 20140625 15:14:21< Necrosporus> won't it work as it is? 20140625 15:16:59< aquileia> Ivanovic, AI0867: It seems #192 originates from http://r.wesnoth.org/p569412 which doesn't say it's 1.13 only 20140625 15:17:28< gfgtdf> iceiceice: depends on what you want to test and from when your 'old binary' is. 20140625 15:17:35< gfgtdf> Necrosporus: s ^ 20140625 15:17:50< iceiceice> it pretty much depends how good your build tool is 20140625 15:17:57< iceiceice> *how long it takes you to recompile 20140625 15:18:08< Necrosporus> binary is from 1.11.15 20140625 15:18:33< gfgtdf> and what do you want to test ? 20140625 15:21:20< irker701> wesnoth: Chris Beck wesnoth:master 0b768a6f5e0e / src/game_controller.cpp: fixup 1bc0fea10a7731f045510d61f646565e2ec8b4ce https://github.com/wesnoth/wesnoth/commit/0b768a6f5e0ed999971d3f06756670ad1c63fc51 20140625 15:28:35< aquileia> I just checked, the EI diff wouldn't apply cleanly but the others do - I will post in the polish translation thread and tell fatality about that 20140625 15:28:52< AI0867> aquileia, Ivanovic: I'm leaving now, so I can't do that today 20140625 15:29:00-!- sachith500 [~kvirc@61.245.160.190] has quit [Ping timeout: 244 seconds] 20140625 15:29:26< aquileia> AI0867: I'll contact him about EI anyhow 20140625 15:30:06< aquileia> ntil he provides an 1.12 version for that, we can't merge 20140625 15:30:12< aquileia> so no need to hurry 20140625 15:32:26-!- molgrum [~molgrum@212.85.89.43] has joined #wesnoth-dev 20140625 15:35:13< irker701> wesnoth: Chris Beck wesnoth:master bd33724a3605 / src/ (mouse_events.cpp mouse_events.hpp): fixup mouse_events.?pp includes http://git.io/CtUXfg 20140625 15:46:11< irker701> wesnoth: Chris Beck wesnoth:master cdd4a3d73dbb / src/ (playturn.cpp playturn.hpp): fixup playturn.?pp includes http://git.io/Flwj_A 20140625 15:48:08-!- Kexoth [~kex@93-137-10-176.adsl.net.t-com.hr] has joined #wesnoth-dev 20140625 15:52:57< gfgtdf> iceiceice: you knwo why playturn.cpp wants std::set and std::map ? 20140625 15:54:48< iceiceice> maybe a temporary variable? 20140625 15:54:54< iceiceice> im not sure 20140625 15:54:54-!- ancestral [~ancestral@17.244.183.146] has joined #wesnoth-dev 20140625 15:57:22< iceiceice> hmm it compiles fine without those :/ 20140625 15:58:38< irker701> wesnoth: Chris Beck wesnoth:master d361b6827755 / src/playturn.cpp: remove some unneeded includes http://git.io/w1O9Kw 20140625 16:00:17-!- Haudegen [~quassel@80-110-40-98.static.surfer.at] has quit [Remote host closed the connection] 20140625 16:00:21< irker701> wesnoth: Chris Beck wesnoth:master 7be3abcc0a59 / src/playturn.cpp: fixup d361b6827755ab0008d51106ffbf697a2397af94 http://git.io/PkALyQ 20140625 16:01:33-!- ancestral [~ancestral@17.244.183.146] has quit [Ping timeout: 240 seconds] 20140625 16:02:19-!- ancestral [~ancestral@17.114.45.98] has joined #wesnoth-dev 20140625 16:03:54< irker701> wesnoth: gfgtdf wesnoth:master 467ea3385554 / src/ (8 files): remove unused functions + fix comments http://git.io/3yv49w 20140625 16:03:56< irker701> wesnoth: gfgtdf wesnoth:master 179c9a9786bf / src/ (18 files): add some copyright notices. http://git.io/vICkBQ 20140625 16:03:58-!- travis-ci [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 16:03:58< travis-ci> [travis-ci] wesnoth/wesnoth#3429 (master - 0b768a6 : Chris Beck): The build passed. 20140625 16:03:58< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28418040 20140625 16:03:58-!- travis-ci [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 16:20:03-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has joined #wesnoth-dev 20140625 16:22:00< irker701> wesnoth: gfgtdf wesnoth:master 6bdf2edfee00 / src/ (playturn.cpp playturn.hpp): update playturn.cpp http://git.io/fEorSA 20140625 16:38:48-!- Gallaecio [~quassel@84.120.115.132.dyn.user.ono.com] has joined #wesnoth-dev 20140625 16:51:31-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140625 16:54:12-!- Guest57253 [~quassel@178.115.129.106.wireless.dyn.drei.com] has joined #wesnoth-dev 20140625 16:56:08-!- Guest57253 is now known as haudegen 20140625 16:59:34-!- Guest6651 [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 16:59:34< Guest6651> [travis-ci] wesnoth/wesnoth#3431 (master - cdd4a3d : Chris Beck): The build passed. 20140625 16:59:34< Guest6651> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28420211 20140625 16:59:34-!- Guest6651 [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 17:00:45< gfgtdf> :o who could be Guest6651 ? 20140625 17:06:31-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev 20140625 17:11:09-!- aquileia_ [~androirc@HSI-KBW-46-223-80-193.hsi.kabel-badenwuerttemberg.de] has joined #wesnoth-dev 20140625 17:14:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140625 17:18:40-!- aquileia_ [~androirc@HSI-KBW-46-223-80-193.hsi.kabel-badenwuerttemberg.de] has quit [Quit: AndroIRC - Android IRC Client ( http://www.androirc.com )] 20140625 17:22:53< iceiceice> its travis's evil twin 20140625 17:30:19< Turuk_> cloning is a great technology 20140625 17:35:05< gfgtdf> iceiceice: do you know wether its possible to store the current map ? 20140625 17:35:20< iceiceice> what do you mean 20140625 17:35:28< iceiceice> like in wml? 20140625 17:36:07< gfgtdf> or in lua 20140625 17:37:02< gfgtdf> iceiceice: meaning can i "save" the current map to bring it back later with [replace_map] 20140625 17:37:20< iceiceice> i dont think it is 20140625 17:37:29< iceiceice> can you even get terrain values? 20140625 17:40:09< gfgtdf> iceiceice: i think with wesnoth.get_terrain 20140625 17:40:29< iceiceice> i think it would be nice if we had better support for messing around with the map 20140625 17:40:52< iceiceice> there are some creative scenarios out there that do that kind of thing extensively 20140625 17:58:30< zookeeper> well, you can of course use [store_locations] on everything, but then you better not have a very large map... 20140625 18:00:41< gfgtdf> iceiceice: i accidently implemented my store_map wrongly and it now switches x/y axis :) took me a whiel to notice 20140625 18:01:03-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has quit [Ping timeout: 240 seconds] 20140625 18:01:10< iceiceice> i have some kind of terrible boost template bug :O 20140625 18:01:30< gfgtdf> which ? 20140625 18:01:38< gfgtdf> doe to changes includes ? 20140625 18:01:40< gfgtdf> due* 20140625 18:03:07-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has joined #wesnoth-dev 20140625 18:05:55< iceiceice> i try to move some includes out of the header 20140625 18:06:15< iceiceice> basically i move the stuff in shared_object.hpp to the impl of tstring 20140625 18:06:21< iceiceice> now i get wierd errors in config.hpp 20140625 18:06:47< iceiceice> when gui/dialogs/save_game.cpp tries to compile 20140625 18:07:08< iceiceice> i tried putting allt he headers i tried to exclude, back into config.hpp and it still wont compile :O 20140625 18:08:10< iceiceice> all the errors seem to be internal to boost :/ 20140625 18:11:25-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has joined #wesnoth-dev 20140625 18:12:37< gfgtdf> iceiceice: you do you want to move shared_object.hpp aout of tstring .hpp ? 20140625 18:12:45< iceiceice> yeah 20140625 18:12:52< iceiceice> i get this stuff though http://hastebin.com/ipohewoyis.vala 20140625 18:13:00< gfgtdf> iceiceice: i think you cannot forward declare a mameber varaible 20140625 18:13:24< iceiceice> i changed it, 20140625 18:13:28< iceiceice> it uses a scoped pointer instead 20140625 18:14:31< gfgtdf> iceiceice: you sure it is a good idea to use scoped ptr in tstring ? 20140625 18:14:44< gfgtdf> iceiceice: this is an additional new for every tstrign we use 20140625 18:14:53< gfgtdf> iceiceice: idk how much tstrign we use 20140625 18:14:55< iceiceice> i think its a better idea than including all that boost stuff in every single compilation unit 20140625 18:15:12< iceiceice> std::string is on the heap also anyways? 20140625 18:15:43< gfgtdf> yes it is 20140625 18:16:28< iceiceice> idk its just an experiment 20140625 18:16:37< iceiceice> the other idea is to get rid of shared_object use in t_string 20140625 18:16:52< iceiceice> and untemplate it, so can put the nasty parts of impl in the compilation unit 20140625 18:17:16< iceiceice> but that's harder than the scoped_ptr thing, i just did this other way first as an experiment 20140625 18:17:22< gfgtdf> iceiceice: i dont even knwo what shared_object oes 20140625 18:17:36< iceiceice> it uses a lot of fancy boost stuff... 20140625 18:17:39< iceiceice> it like, 20140625 18:17:51< iceiceice> registers the object in the database by its hash 20140625 18:17:56< iceiceice> *in a private database 20140625 18:18:05< gfgtdf> ah ok 20140625 18:18:29-!- aquileia [2edf50c1@gateway/web/freenode/ip.46.223.80.193] has quit [Quit: Page closed] 20140625 18:19:39< iceiceice> gfgtdf: heres what i tried 20140625 18:19:39< iceiceice> https://github.com/cbeck88/wesnoth/commit/118f1c8748c23365dc8e126316d2a1c076fa1d3f 20140625 18:20:18-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140625 18:22:16< iceiceice> idk wtf these boost errors mean 20140625 18:27:22< iceiceice> oh i ddint see that master is brokenr ight now? 20140625 18:27:41< iceiceice> why did travis not tell us 20140625 18:27:54< iceiceice> https://travis-ci.org/wesnoth/wesnoth/builds/28422106 20140625 18:29:44< gfgtdf> iceiceice: ok i can fix 20140625 18:31:03< gfgtdf> iceiceice: do you comile with c++11 =? 20140625 18:31:17< iceiceice> no 20140625 18:56:02-!- sachith500 [~kvirc@112.134.96.253] has joined #wesnoth-dev 20140625 19:00:57< irker701> wesnoth: gfgtdf wesnoth:master 78e1916e6802 / src/saved_game.hpp: fixup build after 'remove unused functions + fix comments' http://git.io/o9y3VQ 20140625 19:11:11-!- sachith500 [~kvirc@112.134.96.253] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140625 19:17:43-!- noy [~Noy@wesnoth/developer/noy] has quit [Remote host closed the connection] 20140625 19:18:06-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140625 19:26:40< irker701> wesnoth: gfgtdf wesnoth:master 4637f444f041 / src/playcampaign.cpp: fix quit game durign linger mode http://git.io/C7rYSA 20140625 19:28:45-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140625 19:38:30-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20140625 19:41:05-!- sachith500 [~kvirc@112.134.96.253] has joined #wesnoth-dev 20140625 19:47:49-!- Guest48170 [~cib@p5DD2353F.dip0.t-ipconnect.de] has quit [Ping timeout: 264 seconds] 20140625 19:58:43-!- ancestral [~ancestral@17.114.45.98] has quit [Quit: ancestral] 20140625 20:00:54-!- Turuk_ [40399531@gateway/web/cgi-irc/kiwiirc.com/ip.64.57.149.49] has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client] 20140625 20:02:49-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has quit [Ping timeout: 264 seconds] 20140625 20:10:17-!- ancestral [~ancestral@17.114.45.98] has joined #wesnoth-dev 20140625 20:10:18-!- sachith500 [~kvirc@112.134.96.253] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140625 20:14:41-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140625 20:23:41-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 240 seconds] 20140625 20:24:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140625 20:33:22-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140625 20:38:11-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev 20140625 20:42:46-!- haudegen [~quassel@178.115.129.106.wireless.dyn.drei.com] has quit [Read error: Connection reset by peer] 20140625 20:56:36-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Read error: Connection reset by peer] 20140625 20:59:23-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has joined #wesnoth-dev 20140625 20:59:51-!- _8680_ [~8680@2002:4404:712c:0:a9ed:ad57:c7db:46a0] has quit [Remote host closed the connection] 20140625 21:00:09-!- _8680_ [~8680@2002:4404:712c:0:cd82:9cc5:6412:48ff] has joined #wesnoth-dev 20140625 21:03:21-!- Haudegen [~quassel@178.115.129.106.wireless.dyn.drei.com] has joined #wesnoth-dev 20140625 21:09:23-!- TooLmaN [~TooLmaN@mail.thomsonplastics.com] has quit [Quit: Off to save the world!] 20140625 21:26:35-!- gfgtdf_ [~chatzilla@e176191251.adsl.alicedsl.de] has joined #wesnoth-dev 20140625 21:29:19< irker701> wesnoth: Lari Nieminen resources:master 81e2b0df6aa4 / image-localization/maps/Eastern_Invasion/localization.xcf: Fixed inaccurate deform path http://git.io/L1ZFPQ 20140625 21:29:19-!- gfgtdf [~chatzilla@e177126179.adsl.alicedsl.de] has quit [Ping timeout: 272 seconds] 20140625 21:29:26< zookeeper> aquileia, ^ i really hope there's no remaining issues with that file now :P 20140625 21:29:30-!- gfgtdf_ is now known as gfgtdf 20140625 21:31:02-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140625 21:32:13-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 244 seconds] 20140625 21:34:50-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140625 21:41:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 245 seconds] 20140625 21:45:16-!- _8680_ [~8680@2002:4404:712c:0:cd82:9cc5:6412:48ff] has quit [Ping timeout: 260 seconds] 20140625 21:46:10-!- _8680_ [~8680@2002:4404:712c:0:d40e:16c:1267:254b] has joined #wesnoth-dev 20140625 22:00:37-!- gfgtdf [~chatzilla@e176191251.adsl.alicedsl.de] has quit [Ping timeout: 245 seconds] 20140625 22:00:53-!- _8680_ [~8680@2002:4404:712c:0:d40e:16c:1267:254b] has quit [Ping timeout: 264 seconds] 20140625 22:03:01-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has quit [Quit: leaving] 20140625 22:03:11-!- Haudegen [~quassel@178.115.129.106.wireless.dyn.drei.com] has quit [Ping timeout: 240 seconds] 20140625 22:09:08-!- _8680_ [~8680@2002:4404:712c:0:8038:ea65:2d75:d90] has joined #wesnoth-dev 20140625 22:09:30< irker701> wesnoth: Chris Beck wesnoth:master 09e2ce0dd0a0 / src/ (shared_object.hpp tstring.cpp): move impl of tstring database to tstring.cpp http://git.io/5PSuUA 20140625 22:09:32< irker701> wesnoth: Chris Beck wesnoth:master e453a91c332e / src/ (shared_object.hpp tstring.hpp): move headers one file forwards http://git.io/U6CLCw 20140625 22:09:34< irker701> wesnoth: Chris Beck wesnoth:master bb768e848622 / src/ (5 files in 3 dirs): advance boost headers one step forwards http://git.io/Htvg1Q 20140625 22:09:36< irker701> wesnoth: Chris Beck wesnoth:master b8427b362b2d / src/gui/dialogs/mp_create_game.cpp: remove some unnecessary includes http://git.io/X_8JWg 20140625 22:09:38< irker701> wesnoth: Chris Beck wesnoth:master 2a703f3d70d5 / src/gui/dialogs/ (game_save.cpp game_save.hpp): move include from a header to its compilation unit http://git.io/1USENw 20140625 22:10:49-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140625 22:11:34-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140625 22:15:03-!- _8680_ [~8680@2002:4404:712c:0:8038:ea65:2d75:d90] has quit [Ping timeout: 240 seconds] 20140625 22:15:56-!- _8680_ [~8680@2002:4404:712c:0:edbc:8798:3e76:7916] has joined #wesnoth-dev 20140625 22:28:15-!- Laundry [~austin@pool-71-166-34-122.bltmmd.fios.verizon.net] has joined #wesnoth-dev 20140625 22:35:52-!- ancestral [~ancestral@17.114.45.98] has quit [Quit: ancestral] 20140625 22:37:13-!- ancestral [~ancestral@17.114.45.98] has joined #wesnoth-dev 20140625 22:53:30< Laundry> Hey 20140625 22:55:18< Laundry> For the statistics bug I'm working on. Are the values supposed to correspond to this website? 20140625 22:58:56 * zookeeper wonders what values and what website 20140625 22:59:27-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140625 23:00:23-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140625 23:02:01-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit] 20140625 23:06:04-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140625 23:06:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140625 23:08:50-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 244 seconds] 20140625 23:08:54-!- ancestral [~ancestral@17.114.45.98] has quit [Quit: ancestral] 20140625 23:09:08< Laundry> zookeeper: Sorry. I thought I posted it 20140625 23:09:10< Laundry> http://units.wesnoth.org/trunk/animations.html 20140625 23:10:51-!- DHost [~Pcy@vps.ponchy.fr] has quit [Remote host closed the connection] 20140625 23:12:03< shadowm> Do you have a link to thebug report? 20140625 23:12:38< Laundry> No... I forget who it was but someone that the statistics values were broken and that I should work on that. 20140625 23:13:03< zookeeper> what statistics values? the ones on that page? 20140625 23:13:08< shadowm> Isn't it about gameplay stats? 20140625 23:13:09-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140625 23:13:11< Laundry> OH 20140625 23:13:14< Laundry> Ya 20140625 23:13:21< Laundry> That's what it was 20140625 23:21:15< Laundry> Would I work on these things then? http://forums.wesnoth.org/viewtopic.php?f=36&t=29733 20140625 23:22:16-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 244 seconds] 20140625 23:23:04< iceiceice> yeah so i never saw that page, i guess eyerouge implemented alot of the new statistics stuff? 20140625 23:23:20< iceiceice> the bug report was from jozrael earlier on this channel, 20140625 23:23:33< iceiceice> he reports that, when he recalls a white mage in a campaign, 20140625 23:23:44< iceiceice> even though it costs him 20 gold, his statistics value for "gold spent on recalls" goes up by 40 20140625 23:23:52< iceiceice> which is the "cost" of a white mage in liek age of heroes 20140625 23:24:03< Laundry> Can I see the bug post? 20140625 23:24:34< iceiceice> wesbot: bug #221213 20140625 23:24:34< wesbot> iceiceice: Are you sure with that number? Please check again... 20140625 23:24:41< iceiceice> wesbot: bug #22213 20140625 23:24:41< wesbot> Bug #22213 Assigned to: None Status: None Priority: 5 - Normal 20140625 23:24:41< wesbot> Summary: The Statistics menu is using the wrong data to seed the Recall gold value 20140625 23:24:44< wesbot> Original submission: The Statistics menu ingame is using unit cost rather than 20140625 23:24:47< wesbot> recall cost to seed the recall value. The Recall value in mainline should simpl 20140625 23:24:50< wesbot> URL: http://gna.org/bugs/?22213 20140625 23:25:43< Laundry> Ok cool. 20140625 23:25:46< Laundry> Leggo 20140625 23:40:18-!- markus_ [~mjs-de@f048181013.adsl.alicedsl.de] has joined #wesnoth-dev 20140625 23:41:33-!- mjs-de [~mjs-de@f048226194.adsl.alicedsl.de] has quit [Ping timeout: 240 seconds] 20140625 23:44:01< irker701> wesnoth: Chris Beck wesnoth:master 399ec11ddf8a / src/ (11 files in 4 dirs): fixup includes in headers, started as just config, but led to more http://git.io/WMY1eg 20140625 23:50:07-!- travis-ci [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 23:50:07< travis-ci> [travis-ci] wesnoth/wesnoth#3439 (master - 399ec11 : Chris Beck): The build was broken. 20140625 23:50:07< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28458239 20140625 23:50:07-!- travis-ci [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140625 23:54:11< irker701> wesnoth: Chris Beck wesnoth:master 6e3e8990e8a1 / src/game.cpp: attempt to fix travis compilation http://git.io/lkcxTg 20140625 23:57:29-!- ancestral [~ancestral@17.114.45.98] has joined #wesnoth-dev 20140625 23:58:47-!- travis-ci [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has joined #wesnoth-dev 20140625 23:58:47< travis-ci> [travis-ci] wesnoth/wesnoth#3440 (master - 6e3e899 : Chris Beck): The build is still failing. 20140625 23:58:47< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28458887 20140625 23:58:47-!- travis-ci [~travis-ci@ec2-54-205-111-171.compute-1.amazonaws.com] has left #wesnoth-dev [] --- Log closed Thu Jun 26 00:00:12 2014