--- Log opened Fri Jul 18 00:00:03 2014 --- Day changed Fri Jul 18 2014 20140718 00:00:03< iceiceice> hmm it looks like Cmake has an xcode project file generator option: http://stackoverflow.com/questions/1114140/is-it-possible-to-automatically-generate-xcode-projects 20140718 00:01:11< shadowm> Actually, why are we assuming scons can do this? All I can find in the man page is the possibility of generating MSVC 7 projects. 20140718 00:01:45-!- ancestral [~ancestral@17.114.45.200] has quit [Quit: ancestral] 20140718 00:02:30< iceiceice> it sounds like Cmake has this better figured out than scons right now, they claim to also be able to do VC project files 20140718 00:02:30< iceiceice> http://stackoverflow.com/questions/395169/using-cmake-to-generate-visual-studio-c-project-files 20140718 00:06:14< shadowm> So, should I commit the fix myself? 20140718 00:06:18-!- ancestral [~ancestral@17.114.45.200] has joined #wesnoth-dev 20140718 00:09:18< iceiceice> oh, right 20140718 00:09:21< iceiceice> i can do it if you prefer 20140718 00:09:25< iceiceice> up to you 20140718 00:10:18< iceiceice> are there still problems after that is fixed or does it build successfully? 20140718 00:11:06< shadowm> IIRC I'll actually need to commit some additional fixes I had from my last attempt, since RW moved a bunch of files around. 20140718 00:13:16< shadowm> Aaaand then some more, it seems. 20140718 00:16:58< shadowm> A lot more. 20140718 00:17:53-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140718 00:18:52< shadowm> Wheeeee, I have a Windows build again! 20140718 00:19:44< irker204> wesnoth: Ignacio R. Morelle wesnoth:master 99197733c55f / projectfiles/CodeBlocks/wesnoth.cbp: Fix typo in the CodeBlocks project file http://git.io/Ft9WCQ 20140718 00:19:47< irker204> wesnoth: Ignacio R. Morelle wesnoth:master 32d6e8d7f7e7 / projectfiles/CodeBlocks/wesnoth.cbp: CodeBlocks project file update http://git.io/PaQ-Pg 20140718 00:19:50< irker204> wesnoth: Ignacio R. Morelle wesnoth:master 9070fb7226a7 / src/help.cpp: Merge branch 'master' of github.com:wesnoth/wesnoth-old http://git.io/oNsSbg 20140718 00:20:11-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20140718 00:25:02-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 00:35:09< iceiceice> hehe 20140718 00:35:16< iceiceice> shadowm, did you know that we have a "terrain help" dialog? 20140718 00:35:34< iceiceice> like, you can mouse over a terrain and get an explanation of what it is by pressing a hotkey? 20140718 00:36:03< shadowm> Ctrl+t? It's in the changelog for 1.11.16. 20140718 00:37:58< iceiceice> i never realized we had this, i thought we should have this since forever actually 20140718 00:38:01< iceiceice> i guess fendrin added in 1.11.8 20140718 00:38:02< iceiceice> https://github.com/wesnoth/wesnoth/commit/a561e1b3e 20140718 00:38:43< iceiceice> I think i'm going to try to improve it so that it displays whether the defense / movement is "best defense, worst movement" etc. 20140718 00:39:01< iceiceice> also i wonder if it shouldn't be set up so that, if you press "d" and there is no unit on the hex, you get the terrain help? 20140718 00:39:51< shadowm> That sounds more in line with the canned input scheme changes, so probably a bad idea. 20140718 00:42:43< iceiceice> what does "canned input scheme" mean? 20140718 00:43:22< shadowm> The new input scheme introduced in 1.11.8 or 1.11.9 that was reverted in 1.11.9 or 1.11.10. 20140718 00:43:36< iceiceice> oh hmm i guess you can just right click to get the terrain description anyways 20140718 00:43:40< shadowm> I'm surprised you didn't hear of it, it was quite controversial. 20140718 00:43:52< iceiceice> ohh 20140718 00:44:10< iceiceice> i think i just misassociated the word 'canned' there 20140718 00:44:49< iceiceice> idk i think it would be a little easier to use, my thought would be, if you want help you probably want a "what is that thing?" button 20140718 00:44:51< shadowm> One part of it involved shifting the focus from units to tiles in general, so you were able to select empty tiles by default (you still can, but not by default) and perform operations on them. 20140718 00:45:34< iceiceice> i think the only part of it i remember was about actions going on right click 20140718 00:59:13-!- Samual_ [diotecktec@xonotic/core-team/Samual] has joined #wesnoth-dev 20140718 01:00:37-!- Samual [diotecktec@xonotic/core-team/Samual] has quit [Ping timeout: 245 seconds] 20140718 01:03:08-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 01:22:00-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140718 01:24:31-!- ancestral [~ancestral@17.114.45.200] has quit [Quit: ancestral] 20140718 01:41:37-!- wesbot changed the topic of #wesnoth-dev to: string+feature freeze active on 1.12 | 247 bugs, 344 feature requests, 29 patches | Logs: http://irclogs.wesnoth.org | Alternate logs: http://wesnoth.debian.net | Don't paste on IRC! Use a pastebin: http://pastebin.com | http://imagebin.org 20140718 01:45:27-!- sachith500 [~kvirc@112.134.187.235] has joined #wesnoth-dev 20140718 01:54:45< iceiceice> anyone: I wrote some much better help text for the "terrains" section which explains about mixed terrains and has some images, any crits welcome 20140718 01:54:46< iceiceice> http://imgur.com/a/fvJtn#0 20140718 01:55:17-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 01:59:33-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 240 seconds] 20140718 02:00:00-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has joined #wesnoth-dev 20140718 02:01:29< AI0867> iceiceice: I like it for the most part, but the stuff about defense caps is a bit convoluted 20140718 02:03:05< iceiceice> so i guess i might also not totally understand the rules myself 20140718 02:03:11< iceiceice> is it possible for a terrain to have 3 underlying types? 20140718 02:03:16< iceiceice> or is two actually the max 20140718 02:05:49< shadowm> U+2014 EM DASH (`—`) must be used insetead of "--". 20140718 02:07:51< iceiceice> is there a WML macro for that or do i have to figure out how to type it in my text editor 20140718 02:07:55-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140718 02:08:07< iceiceice> also, new attempt at the convoluted part: 20140718 02:08:07< iceiceice> http://hastebin.com/yuligovewa.vhdl 20140718 02:08:11< shadowm> The latter, because macros don't belong in the middle of translatable strings anyway. 20140718 02:09:51< AI0867> iceiceice: no, IFAIK you can only overlay one terrain onto the base 20140718 02:10:15< AI0867> snowy forested hills do not, in fact, function as such 20140718 02:10:48< AI0867> aaaaaaaand, I may be wrong 20140718 02:11:16< AI0867> they may actually function as such, it's just that you can only have one Base^Overlay 20140718 02:11:26< AI0867> but the Overlay can be an alias of multiple terrains 20140718 02:11:52< AI0867> snowy pine forest: aliasof=_bas,At,Ft 20140718 02:12:19< AI0867> but its code is ^Fpa 20140718 02:15:12< iceiceice> i see 20140718 02:15:27< iceiceice> i think i wondered at some point because i dont think i ever saw a forested hill village 20140718 02:24:59-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140718 02:27:24-!- Ivanovic_ [~ivanovic@frnk-5f74f831.pool.mediaWays.net] has joined #wesnoth-dev 20140718 02:29:27-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140718 02:30:38-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 240 seconds] 20140718 02:31:18-!- Ivanovic_ is now known as Ivanovic 20140718 03:02:30< iceiceice> ok here's v2: http://imgur.com/a/dldsy#0 20140718 03:04:07< AI0867> I think you could be more clear that those 6 aren't all the base types there are 20140718 03:05:32< AI0867> and there's various overlay-only terrains 20140718 03:05:42< AI0867> so a mixed type does not combine just multiple base types 20140718 03:07:01< AI0867> you may want to to differentiate between 'basic' types, which includes forests, and the 'base', upon which overlays are placed 20140718 03:07:08< AI0867> or maybe I'm just misreading your explanation 20140718 03:08:56< ancestral> iceiceice: “Terrain” is both singular and plural. Leave the ’s’ off :) 20140718 03:09:33< iceiceice> AI0867: i guess i was hoping not to explain about overlay vs base, that seems more like an implementation detail to me 20140718 03:09:46< iceiceice> maybe thats the wrong way to think about it 20140718 03:10:28-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 03:10:33< iceiceice> ancestral: thanks 20140718 03:12:13< iceiceice> hmm although the dictionary disagrees with you: http://www.learnersdictionary.com/definition/terrain 20140718 03:13:35< AI0867> iceiceice: it also says that it can be a mass verb 20140718 03:14:14< AI0867> iceiceice: true, that's mostly relevant for people who use the editor 20140718 03:14:55< iceiceice> the first sentence of my page is what was here before i started editing, 20140718 03:15:02< iceiceice> i'm not sure who wrote it 20140718 03:15:42< ancestral> Hmm 20140718 03:16:29< ancestral> iceiceice: Actually, terrains may be okay 20140718 03:17:12< ancestral> Typically when people talk it’s “the terrain” 20140718 03:19:55-!- irker204 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140718 03:21:26< ancestral> iceiceice: I stand corrected 20140718 03:22:41< ancestral> Say, speaking of terrain and editors, ever see my unfinished online Wesnoth map viewer? 20140718 03:28:26-!- irker302 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140718 03:28:26< irker302> wesnoth: Chris Beck wesnoth:master 9494754509c7 / src/help.cpp: in the debug mode terrain descriptions, also give the editor image http://git.io/FQsHaw 20140718 03:28:26< irker302> wesnoth: Chris Beck wesnoth:master 292780506ab4 / data/core/help.cfg: add an explanation of mixed terrain types to the help for terrains http://git.io/QouUPw 20140718 03:28:26< irker302> wesnoth: Chris Beck wesnoth:master 58d3553a67bd / projectfiles/CodeBlocks/wesnoth.cbp: Merge branch 'master' of git://github.com/wesnoth/wesnoth http://git.io/xNKRaQ 20140718 03:28:27< irker302> wesnoth: Chris Beck wesnoth:master b62e741175b5 / changelog: update changelog http://git.io/MZmknw 20140718 03:29:03< iceiceice> thanks for crits everyone, i have committed the result, perhaps more revisions another time, or feel free to have a crack at it yourself of course 20140718 03:29:45< iceiceice> ancestral: i think i remember seeing your map viewer program once 20140718 03:30:23< ancestral> There are probably many new overlays and such now 20140718 03:44:09-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 03:48:32-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 245 seconds] 20140718 03:53:59-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has quit [Ping timeout: 264 seconds] 20140718 03:56:18-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has joined #wesnoth-dev 20140718 04:11:26-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140718 04:12:37-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 250 seconds] 20140718 04:14:36-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140718 04:25:44-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20140718 04:30:39-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140718 04:31:57-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20140718 05:32:38-!- sachith500 [~kvirc@112.134.187.235] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140718 05:32:57-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 05:34:01-!- sachith500 [~kvirc@112.134.187.235] has joined #wesnoth-dev 20140718 05:37:33-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 250 seconds] 20140718 05:43:07-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140718 05:43:11-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 250 seconds] 20140718 05:44:39-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140718 05:50:49-!- Ivanovic [~ivanovic@frnk-5f74f831.pool.mediaWays.net] has quit [Changing host] 20140718 05:50:49-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140718 05:53:34-!- sachith500 [~kvirc@112.134.187.235] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140718 06:28:18-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140718 06:34:05-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140718 07:08:50-!- faabumc [~vcr@wesnoth/developer/faabumc] has joined #wesnoth-dev 20140718 07:21:43-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 07:22:32-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: End Transmission.] 20140718 07:23:53-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140718 07:25:24-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev 20140718 07:26:03-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 240 seconds] 20140718 07:37:17-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 245 seconds] 20140718 08:01:34-!- SZ_Bot [~SZ_Bot@27.83.235.80.dyn.estpak.ee] has quit [Read error: Connection reset by peer] 20140718 08:07:17-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140718 08:08:31-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140718 08:12:52-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140718 08:14:00-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 08:14:23-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140718 08:27:12-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140718 08:29:36-!- mjs-de [~mjs-de@f048003050.adsl.alicedsl.de] has joined #wesnoth-dev 20140718 08:40:54-!- aquileia [4e2b85d0@gateway/web/freenode/ip.78.43.133.208] has joined #wesnoth-dev 20140718 08:41:58< aquileia> shadowm: Just so that you know, I'm going to fix the VC project 20140718 08:43:54< ancestral> I knew there was a plan to seek Venture Capitalist funding! 20140718 08:44:01< ancestral> :-P 20140718 08:47:37-!- irker302 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140718 08:48:25< aquileia> Exactly - why else should we support Widows and OSX if not fr the money? ;) 20140718 08:57:02< aquileia> any special reason why we have an empty src/config_assign.cpp? 20140718 09:10:38-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 09:15:17-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 255 seconds] 20140718 09:16:28< aquileia> gfgtdf: ^ 20140718 09:21:38-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 09:21:59-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140718 09:48:37-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140718 09:55:16< Rhonda> noone was assigned to it 20140718 09:57:06< aquileia> Rhonda: wrong chat? 20140718 09:57:15< Rhonda> nope 20140718 09:57:19< aquileia> ah, ok 20140718 09:57:28< Rhonda> it's empty because noone got assigned to it? 20140718 09:57:34< Rhonda> … forget it. :) 20140718 10:02:47-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20140718 10:12:55-!- molgrum [~molgrum@212.85.89.43] has quit [Quit: Lämnar] 20140718 10:18:08-!- molgrum [~molgrum@212.85.89.43] has joined #wesnoth-dev 20140718 10:20:32-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 10:36:33-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!] 20140718 10:41:08-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 10:41:55-!- prophile [~alynn@oftn/member/prophile] has quit [Remote host closed the connection] 20140718 10:42:44-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 10:50:53-!- apoi [~andi@80-110-40-98.static.surfer.at] has quit [Quit: leaving] 20140718 10:53:18-!- Coffee_irc [~david@ppp121-45-15-35.lns20.adl2.internode.on.net] has joined #wesnoth-dev 20140718 10:53:57-!- apoi [~andi@80-110-40-98.static.surfer.at] has joined #wesnoth-dev 20140718 10:59:16-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 11:03:38-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 240 seconds] 20140718 11:12:16-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has joined #wesnoth-dev 20140718 11:13:44< gfgtdf> aquileia: i deleted its contents at some point and made config_assign.hpp use templates instead. The file shouldnt effect the result progamm. 20140718 11:14:05< aquileia> sure,but why keep it? 20140718 11:15:11< gfgtdf> feel free to delete if you want. 20140718 11:15:47< aquileia> ok 20140718 11:18:01< ancestral> Does it always take forever to install/decompress the Windows version? 20140718 11:18:44< ancestral> It’s taking me close to 5 minutes to decompress the file. 20140718 11:19:02< ancestral> It might be my unarchiving software, which is why I’m asking. 20140718 11:19:46< gfgtdf> ancestral: i think the winows version comes in an installer (exe) ? 20140718 11:19:55< ancestral> Right 20140718 11:20:40< ancestral> gfgtdf: I’m on a Mac, I’m decompressing it with some software. I was curious, for those who have done so or installed on Windows if it’s normal to take several minutes 20140718 11:20:52< gfgtdf> ancestral: idk exactly how installer work but i thought they contain the uncompress software. 20140718 11:20:58< gfgtdf> ancestral: ah ok 20140718 11:21:27< gfgtdf> ancestral: you try to install the windows version on a mac ? 20140718 11:21:52< ancestral> I could installing in Wine 20140718 11:22:12< gfgtdf> ancestral: it uet some time ago that i downloaded it, maye i'll download 1.11.16 today, if so i can tell you 20140718 11:22:16< gfgtdf> quiet 20140718 11:22:16< ancestral> But I’d rather have someone native on Windows tell me 20140718 11:22:51< ancestral> gfgtdf: It’s taken about 5 minutes to finish decompression, which, honestly is ridiculous 20140718 11:23:56< ancestral> It takes less than 10 seconds to mount a .dmg 20140718 11:26:05-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 11:28:43-!- trademark [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has joined #wesnoth-dev 20140718 11:32:09-!- sachith500 [~kvirc@112.135.197.55] has joined #wesnoth-dev 20140718 11:34:12< ancestral> I counted a minute in Wine 20140718 11:34:29< ancestral> Which is significantly better, but still… kinda long 20140718 11:42:29< gfgtdf> ancestral: i think if you mount a file you dont copy all its contents ? 20140718 11:42:57< ancestral> Copying is a fast command these days 20140718 12:00:45-!- trademark [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has quit [Quit: Leaving] 20140718 12:16:42-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Remote host closed the connection] 20140718 12:16:43-!- sachith500 [~kvirc@112.135.197.55] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140718 12:21:48-!- faabumc [~vcr@wesnoth/developer/faabumc] has quit [Quit: Ex-Chat] 20140718 12:22:21-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140718 12:26:58-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has quit [Ping timeout: 264 seconds] 20140718 12:29:15-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has joined #wesnoth-dev 20140718 12:30:39-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has quit [Client Quit] 20140718 12:54:53-!- enchilado [~enchilado@130.102.75.51] has joined #wesnoth-dev 20140718 12:59:33-!- enchilado [~enchilado@130.102.75.51] has quit [Client Quit] 20140718 13:00:07-!- enchilado [~enchilado@130.102.75.43] has joined #wesnoth-dev 20140718 13:00:27-!- enchilado [~enchilado@130.102.75.43] has quit [Changing host] 20140718 13:00:27-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev 20140718 13:05:05-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 13:08:15-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 13:16:27-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 13:20:01-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 13:25:08-!- Haudegen [~quassel@85.124.51.57] has quit [Remote host closed the connection] 20140718 13:25:40-!- OnkV [~quassel@85.124.51.57] has joined #wesnoth-dev 20140718 13:28:06-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140718 13:28:06-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Changing host] 20140718 13:28:06-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140718 13:30:56-!- TooLmaN [~TooLmaN@mx1.thomsonplastics.com] has joined #wesnoth-dev 20140718 13:36:43-!- sachith500 [~kvirc@112.135.197.55] has joined #wesnoth-dev 20140718 13:41:28-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 13:58:25< aquileia> timotei_: Could you merge https://github.com/wesnoth/wesnoth/pull/252 ? 20140718 14:02:04-!- enchilado is now known as enchiladape 20140718 14:15:13-!- elias [~allefant@allefant.com] has quit [Quit: WeeChat 0.4.2] 20140718 14:17:29-!- allefant [~allefant@allefant.com] has joined #wesnoth-dev 20140718 14:18:12-!- allefant is now known as elias 20140718 14:21:36-!- DHost [~Pcy@vps.ponchy.fr] has joined #wesnoth-dev 20140718 14:24:32-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 14:40:32-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140718 14:40:42< aquileia> timotei_: btw, travis passed 20140718 14:52:47-!- enchiladape is now known as enchilado 20140718 14:54:55-!- OnkV is now known as Haudegen 20140718 14:57:21-!- aquileia [4e2b85d0@gateway/web/freenode/ip.78.43.133.208] has quit [Quit: Page closed] 20140718 15:17:20-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 15:32:08-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 15:32:49< timotei_> aquileia: to me it look OK, except the removal of config_assign.cpp, which I am not sure if it's OK or what impact it does have. 20140718 15:33:02< timotei_> Altough it's empty, I'd like to have also a second opinion on that:) 20140718 15:49:35-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has joined #wesnoth-dev 20140718 15:50:29< gfgtdf> timotei_: it's ok to remove it. 20140718 16:06:47-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140718 16:09:28-!- sachith500|2 [~kvirc@112.134.165.49] has joined #wesnoth-dev 20140718 16:12:04-!- sachith500 [~kvirc@112.135.197.55] has quit [Ping timeout: 250 seconds] 20140718 16:23:54-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 16:27:17-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 256 seconds] 20140718 16:31:14-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140718 16:37:05-!- ancestral [~ancestral@17.114.45.200] has joined #wesnoth-dev 20140718 16:47:18-!- sachith500|2 [~kvirc@112.134.165.49] has quit [Ping timeout: 240 seconds] 20140718 16:57:12-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140718 17:04:58-!- irker931 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140718 17:04:58< irker931> wesnoth: Chris Beck wesnoth:master 9ba68b59fc2a / src/help.cpp: add description of "Best/worst defense/movement" to terrain help http://git.io/7xuBHQ 20140718 17:05:05-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140718 17:05:25-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140718 17:12:47-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has joined #wesnoth-dev 20140718 17:14:46< irker931> wesnoth: Chris Beck wesnoth:master 4dde74b51eaf / data/core/help.cfg: help mentions that terrain desc. have "best/worst def/mvt" info http://git.io/5B1MTg 20140718 17:14:48< irker931> wesnoth: Chris Beck wesnoth:master fa99efbdca57 / changelog players_changelog: update changelogs http://git.io/Up9KAw 20140718 17:20:38< gfgtdf> RiftWalker: https://github.com/wesnoth/wesnoth/blob/master/src/configure_engine.cpp#L70 looks wrong 20140718 17:21:23-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 17:28:57-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 17:32:45-!- ancestral [~ancestral@17.114.45.200] has quit [Quit: ancestral] 20140718 17:45:15-!- ancestral [~ancestral@17.114.45.200] has joined #wesnoth-dev 20140718 17:45:22-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev 20140718 17:48:14-!- EliDupree [~quassel@66-189-34-122.dhcp.oxfr.ma.charter.com] has quit [Remote host closed the connection] 20140718 17:52:42-!- EliDupree [~quassel@66-189-34-122.dhcp.oxfr.ma.charter.com] has joined #wesnoth-dev 20140718 17:54:02-!- ancestral [~ancestral@17.114.45.200] has quit [Quit: ancestral] 20140718 17:57:19-!- Kexoth [~kex@89.205.75.19] has quit [Remote host closed the connection] 20140718 17:59:18-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 18:03:54-!- Kexoth [~kex@89.205.75.19] has quit [Remote host closed the connection] 20140718 18:04:24-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has quit [Quit: leaving] 20140718 18:04:30-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140718 18:05:30-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has joined #wesnoth-dev 20140718 18:08:15< RiftWalker> gfgtdf: yikes! fixing. 20140718 18:08:46< gfgtdf> RiftWalker: https://gna.org/bugs/?22361 20140718 18:10:22< irker931> wesnoth: Nathan Walker wesnoth:master 16301034ec7c / src/configure_engine.cpp: fix typo in configure_engine http://git.io/hkKKtA 20140718 18:27:01-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 18:28:08-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has quit [Ping timeout: 260 seconds] 20140718 18:34:16-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 18:37:47-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has joined #wesnoth-dev 20140718 18:43:47< irker931> wesnoth: Chris Beck wesnoth:master d1bfbee006f0 / src/help.cpp: fix a logic error in help code http://git.io/MzDhHw 20140718 18:43:49< irker931> wesnoth: Chris Beck wesnoth:master 957d0327a4d2 / src/help.cpp: fixup implementation of terrain behavior strings http://git.io/NWzRZA 20140718 18:43:51< irker931> wesnoth: Chris Beck wesnoth:master 32cad50800f8 / src/configure_engine.cpp: Merge branch 'master' of git://github.com/wesnoth/wesnoth http://git.io/aQx6dQ 20140718 18:47:10< RiftWalker> AI0867: Before my changes, get_village_gold defaulted to 2, and was only used in mp. Since that code is now used for both mp and sp, I edited get_village_gold to default to 1 for sp, in order to match the behavior of old sp. 20140718 18:48:46-!- tomreyn [~tomreyn@p4FF5AA25.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140718 18:48:52-!- tomreyn [~tomreyn@p4FF5AA25.dip0.t-ipconnect.de] has quit [Changing host] 20140718 18:48:52-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20140718 18:53:17< Ivanovic> RiftWalker: added you at gna.org 20140718 18:55:43< RiftWalker> Ivanovic: thanks. 20140718 19:23:50-!- cib0 [~cib@p5DC749BC.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140718 19:26:16-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140718 19:28:43-!- travis-ci [~travis-ci@ec2-54-82-121-37.compute-1.amazonaws.com] has joined #wesnoth-dev 20140718 19:28:43< travis-ci> [travis-ci] wesnoth/wesnoth#3858 (master - 32cad50 : Chris Beck): The build was broken. 20140718 19:28:43< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/30295211 20140718 19:28:43-!- travis-ci [~travis-ci@ec2-54-82-121-37.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140718 19:30:50-!- ancestral [~ancestral@17.114.45.200] has joined #wesnoth-dev 20140718 19:34:15< irker931> wesnoth: Chris Beck wesnoth:master 75d3c7474b88 / src/help.cpp: cleanup impl of help terrain behavior strings http://git.io/MIxpYA 20140718 19:39:59-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20140718 19:42:42-!- prkc [~prkc@54028625.dsl.pool.telekom.hu] has joined #wesnoth-dev 20140718 19:44:29-!- TooLmaN [~TooLmaN@mx1.thomsonplastics.com] has quit [Quit: Off to save the world!] 20140718 19:52:30-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 19:52:33-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 19:55:13-!- Netsplit *.net <-> *.split quits: Samual_, DHost, bumbadadabum 20140718 19:55:21-!- Netsplit over, joins: DHost 20140718 19:55:21-!- Netsplit *.net <-> *.split quits: elias, Haudegen 20140718 19:55:21-!- Samual [diotecktec@c-24-3-185-118.hsd1.pa.comcast.net] has joined #wesnoth-dev 20140718 19:55:21-!- Samual [diotecktec@c-24-3-185-118.hsd1.pa.comcast.net] has quit [Changing host] 20140718 19:55:21-!- Samual [diotecktec@xonotic/core-team/Samual] has joined #wesnoth-dev 20140718 19:55:39-!- Netsplit over, joins: bumbadadabum 20140718 19:55:49-!- Netsplit over, joins: elias 20140718 19:56:38-!- Netsplit over, joins: Haudegen 20140718 19:56:56-!- Haudegen is now known as Guest88684 20140718 19:57:17-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 250 seconds] 20140718 20:00:02-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140718 20:00:44-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 20:04:47-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 245 seconds] 20140718 20:09:11< gfgtdf> RiftWalker: you should mark https://gna.org/bugs/?22361 as 'fixed' or 'ready to test' then 20140718 20:16:31-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 20:17:54< RiftWalker> gfgtdf: done. 20140718 20:20:55-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit] 20140718 20:23:59-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140718 20:28:46-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 264 seconds] 20140718 20:37:40-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140718 21:03:09-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140718 21:18:19-!- cib0 [~cib@p5DC749BC.dip0.t-ipconnect.de] has quit [Quit: Leaving] 20140718 21:19:50-!- aquileia [4e2b85d0@gateway/web/freenode/ip.78.43.133.208] has joined #wesnoth-dev 20140718 21:20:31< aquileia> timotei_, gfgtdf, sorry for being afk 20140718 21:41:38-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 21:45:52-!- Kexoth [~kex@89.205.75.19] has quit [Ping timeout: 240 seconds] 20140718 21:47:48-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 21:56:20< irker931> wesnoth: Chris Beck wesnoth:master a1ab5b1e647e / src/ (unit_animation.cpp unit_animation.hpp): don't cache unit animation unit filter results, just recompute http://git.io/Qoctiw 20140718 22:00:42-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 245 seconds] 20140718 22:03:31-!- ancestral [~ancestral@17.114.45.200] has quit [Quit: ancestral] 20140718 22:03:55-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140718 22:07:01-!- ancestral [~ancestral@17.114.45.200] has joined #wesnoth-dev 20140718 22:16:55-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has quit [Ping timeout: 256 seconds] 20140718 22:24:04-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140718 22:24:04-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Changing host] 20140718 22:24:04-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140718 22:25:05-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140718 22:27:41-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 256 seconds] 20140718 22:28:17-!- aquileia [4e2b85d0@gateway/web/freenode/ip.78.43.133.208] has quit [Quit: Page closed] 20140718 22:29:22-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140718 22:32:40-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Ping timeout: 260 seconds] 20140718 22:42:35-!- Guest88684 is now known as Haudegen 20140718 22:52:27-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev 20140718 22:53:20-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140718 22:55:29< irker931> wesnoth: gfgtdf wesnoth:master 21892a9f381f / src/create_engine.cpp: Update create_engine.cpp http://git.io/Itu2Aw 20140718 23:02:49-!- ancestral [~ancestral@17.114.45.200] has quit [Quit: ancestral] 20140718 23:03:22-!- ancestral [~ancestral@17.114.45.200] has joined #wesnoth-dev 20140718 23:03:45-!- ancestral [~ancestral@17.114.45.200] has quit [Client Quit] 20140718 23:19:39-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 250 seconds] 20140718 23:19:43-!- ancestral [~ancestral@17.115.177.242] has joined #wesnoth-dev 20140718 23:28:39-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has quit [Read error: Connection reset by peer] 20140718 23:33:09-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140718 23:38:36-!- travis-ci [~travis-ci@ec2-54-80-106-195.compute-1.amazonaws.com] has joined #wesnoth-dev 20140718 23:38:36< travis-ci> [travis-ci] wesnoth/wesnoth#3861 (master - 21892a9 : gfgtdf): The build was broken. 20140718 23:38:37< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/30313965 20140718 23:38:37-!- travis-ci [~travis-ci@ec2-54-80-106-195.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140718 23:38:59-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140718 23:53:20-!- Kexoth [~kex@89.205.75.19] has quit [Remote host closed the connection] 20140718 23:57:03-!- gfgtdf [~chatzilla@f054153228.adsl.alicedsl.de] has joined #wesnoth-dev 20140718 23:57:10< gfgtdf> wesbot: seen jamit 20140718 23:57:10< wesbot> gfgtdf: The person with the nick jamit 29d 18h ago they left with the message: Client Quit --- Log closed Sat Jul 19 00:00:46 2014