--- Log opened Thu Oct 23 00:00:41 2014 20141023 00:08:42-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20141023 00:12:04-!- travis-ci [~travis-ci@ec2-54-92-249-129.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 00:12:04< travis-ci> gfgtdf/wesnoth-old#297 (a02 - cd1ab92 : gfgtdf): The build was canceled. 20141023 00:12:04< travis-ci> Build details : http://travis-ci.org/gfgtdf/wesnoth-old/builds/38769431 20141023 00:12:04-!- travis-ci [~travis-ci@ec2-54-92-249-129.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 00:14:13< irker484> wesnoth: Ignacio R. Morelle website:master 216cae121450 / start/1.12/template.html: Revert "Remove mention of LoW from the announcement" http://git.io/b6pvxg 20141023 00:18:19-!- travis-ci [~travis-ci@ec2-54-83-83-132.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 00:18:19< travis-ci> gfgtdf/wesnoth-old#296 (a01 - bff63ed : gfgtdf): The build was canceled. 20141023 00:18:19< travis-ci> Build details : http://travis-ci.org/gfgtdf/wesnoth-old/builds/38769395 20141023 00:18:19-!- travis-ci [~travis-ci@ec2-54-83-83-132.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 00:28:47< irker484> wesnoth: Ignacio R. Morelle website:master e3fee990ebbc / start/1.12/ (54 files in 2 dirs): Regenerate catalogues and HTML files for string-freeze (for real this time) http://git.io/dh8ToQ 20141023 00:33:41-!- gfgtdf [~chatzilla@f054134131.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.91 [Firefox 32.0.3/20140923175406]] 20141023 00:36:44-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 00:42:40-!- fendrin [~quassel@p20030051AA26CB02955031F00349C6EC.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20141023 00:45:33< shadowm> iceiceice: "2. Portraits should ideally never be scaled" Yeah, that's a pipe dream. 20141023 00:45:39-!- happygrue [~Laptop@wesnoth/developer/wintermute] has joined #wesnoth-dev 20141023 00:45:53< iceiceice> when are portraits ever scaled? 20141023 00:45:57< iceiceice> i never noticed it 20141023 00:46:04< shadowm> Take any of our 500x500 portraits, keep the sidebar in mind, and then try to make message text fit between both at 1024x768. 20141023 00:46:09< shadowm> Or even 800x480. 20141023 00:46:29< iceiceice> the sidebar isnot more than 100 pixels 20141023 00:46:30< iceiceice> ? 20141023 00:46:31< iceiceice> maybe 200? 20141023 00:46:36< iceiceice> wide that is 20141023 00:46:53-!- travis-ci [~travis-ci@ec2-54-237-202-150.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 00:46:53< travis-ci> gfgtdf/wesnoth-old#298 (istream_fix - 8b11bae : gfgtdf): The build was fixed. 20141023 00:46:53< travis-ci> Build details : http://travis-ci.org/gfgtdf/wesnoth-old/builds/38770442 20141023 00:46:53-!- travis-ci [~travis-ci@ec2-54-237-202-150.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 00:46:54< shadowm> "And then try to make message text (sic) fit between both at 1024x768. Or even 800x480." 20141023 00:47:07< iceiceice> ok so also you are discussing also scaling down the portrait 20141023 00:47:17< iceiceice> so in this case xBRZ is totally inapplicable anyways 20141023 00:47:23< shadowm> No, I'm pointing out why scaling down portraits happens. 20141023 00:47:39< shadowm> Also, pointing out that it obviously happens. 20141023 00:47:44< iceiceice> yeah ok, you are right 20141023 00:47:58< shadowm> I mean, otherwise why did we have to decide on a new resolution for the announcement. 20141023 00:48:03< iceiceice> still i think for downscaling the only thing you would want to use is bilinear anyways i guess 20141023 00:48:34< iceiceice> maybe for a sprite you still want NN, i'm not totally sure 20141023 00:49:01< shadowm> IME (both my own and dealing with artists), you occasionally need to apply additional filters to scaled-down portraits. 20141023 00:49:17< shadowm> Unsharp Mask on the GIMP. 20141023 00:53:09-!- happygrue [~Laptop@wesnoth/developer/wintermute] has quit [Remote host closed the connection] 20141023 00:57:29-!- gfgtdf [~chatzilla@f054134131.adsl.alicedsl.de] has joined #wesnoth-dev 20141023 00:59:45< ancestral> You’re making two versions now? 20141023 01:02:47< shadowm> What? 20141023 01:02:57< ancestral> I read wrong nm 20141023 01:04:29-!- fabi [~quassel@p20030051AA26CB02312E001A8A1C96C6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20141023 01:07:53-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20141023 01:08:00-!- fabi [~quassel@p20030051AA26CB02312E001A8A1C96C6.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20141023 01:09:06-!- fabi [~quassel@p20030051AA26CB02110F3FAF97E630C9.dip0.t-ipconnect.de] has joined #wesnoth-dev 20141023 01:09:07-!- fendrin [~quassel@p20030051AA26CB02110F3FAF97E630C9.dip0.t-ipconnect.de] has joined #wesnoth-dev 20141023 01:23:33< gfgtdf> loonycyborg: i updaed my pr again and i plan to merge it tomorrow 20141023 01:23:46< loonycyborg> cool 20141023 01:24:20< iceiceice> gfgtdf: i will try to build it with mingw and test with wine 20141023 01:24:26< iceiceice> a little later 20141023 01:24:41< gfgtdf> iceiceice: ok ty 20141023 01:25:12< gfgtdf> loonycyborg: you have any idea about teh translation issue ? 20141023 01:25:15< gfgtdf> the* 20141023 01:25:44< loonycyborg> I had no msgfmt on that vm I think :P 20141023 01:25:45< shadowm> Ivanovic: Email sent. 20141023 01:25:56< shadowm> Ivanovic: Email not sent. 20141023 01:27:53< shadowm> Ivanovic: Email sent now. 20141023 01:30:24< mattsc> shadowm: Email received. 20141023 01:30:45< shadowm> Email delivery confirmed. 20141023 01:41:15< vultraz> Email recieved 20141023 01:51:41-!- gfgtdf [~chatzilla@f054134131.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.91 [Firefox 32.0.3/20140923175406]] 20141023 01:52:42< mattsc> Ugh - baby cats are on my ban list now … 20141023 01:53:06< mattsc> *babycats is 20141023 01:53:13< shadowm> Whaaaa but baby cats are adorable. 20141023 01:53:29< mattsc> not on the forums ... 20141023 01:53:36< mattsc> I prefer goblins 20141023 01:55:14< ancestral> gobbos 20141023 02:06:57-!- fendrin [~quassel@p20030051AA26CB02110F3FAF97E630C9.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20141023 02:06:59< mattsc> Indeed. (I wish I had a custom portrait for Grnk … ) 20141023 02:11:34-!- Ivanovic_ [~ivanovic@frnk-4d016aaf.pool.mediaWays.net] has joined #wesnoth-dev 20141023 02:11:34-!- Ivanovic_ [~ivanovic@frnk-4d016aaf.pool.mediaWays.net] has quit [Changing host] 20141023 02:11:34-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20141023 02:15:45-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 265 seconds] 20141023 02:16:46-!- rjaguar3 [~rjaguar3@dynamic-oit-pu-dormnet-bb-f-157.Princeton.EDU] has joined #wesnoth-dev 20141023 02:17:23< rjaguar3> The build is broken in b8355433 20141023 02:17:33-!- Ivanovic_ is now known as Ivanovic 20141023 02:17:41< rjaguar3> /home/USER/wesnoth-git/wesnoth-old/src/scripting/lua.cpp: In static member function ‘static const char* lua_filestream::lua_read_data(lua_State*, void*, size_t*)’: 20141023 02:17:57< rjaguar3> /home/USER/wesnoth-git/wesnoth-old/src/scripting/lua.cpp:1096:43: error: use of old-style cast [-Werror=old-style-cast] 20141023 02:18:08< rjaguar3> lua_filestream* lfs = (lua_filestream*) data; 20141023 02:18:16< rjaguar3> ^ 20141023 02:24:04-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20141023 02:25:05< mattsc> rjaguar3: what OS? It compiles for me (on OS X) and I have strict compiling set also. 20141023 02:25:11< rjaguar3> Ubuntu 14.04 20141023 02:25:21< mattsc> iceiceice: ^ 20141023 02:27:36< mattsc> actually, gfgtdf (probably): ^ 20141023 02:30:08< rjaguar3> blame shows gfgtdf last modified line 1096 in commit https://github.com/wesnoth/wesnoth/commit/7bb7c8aa84512e6a1c96c242af8ead02c0a9952c 20141023 02:30:59< ancestral> Come on Google 20141023 02:42:26< iceiceice> lipk: regarding your post here: http://forums.wesnoth.org/viewtopic.php?f=12&t=41109#p576979 20141023 02:42:46< iceiceice> do you consider it a bug if the game is using bilinear interpolation instead of nearest neighbor for unit sprites, in 1.12? 20141023 02:43:33< iceiceice> we could quite easily fix it i guess, by making it call "scale_surface_sharp" instead of "scale_surface" in image::get_scaled_to_zoom 20141023 02:43:35< iceiceice> as you pointed out 20141023 02:46:16< loonycyborg> gfgtdf: https://gist.github.com/loonycyborg/8cac084605345c69a833 20141023 02:53:24< iceiceice> loonycyborg: do i need to recompile boost to use mingw/ 20141023 02:53:47< iceiceice> i guess it would make sense... 20141023 02:55:27-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 02:57:18< loonycyborg> yes 20141023 02:57:22< loonycyborg> it's a c++ lib 20141023 02:57:49< loonycyborg> each c++ lib needs to be compiled with same compiler 20141023 02:57:58< loonycyborg> due to lack of stable ABI 20141023 03:04:18< iceiceice> loonycyborg: i tried adding the third line from your user-config.jam, 20141023 03:04:37< iceiceice> but ./b2 is still unhappy 20141023 03:04:38< iceiceice> chris@chris-KLR650 ~/old_boost/boost_1_48_0 $ ./b2 toolset=gcc-w64mingw32 20141023 03:04:38< iceiceice> /home/chris/old_boost/boost_1_48_0/tools/build/v2/tools/gcc.jam:106: in gcc.init from module gcc 20141023 03:04:38< iceiceice> error: toolset gcc initialization: 20141023 03:04:38< iceiceice> error: version 'w64mingw32' requested but 'g++-w64mingw32' not found and version '4.9' of default 'g++' does not match 20141023 03:05:22< iceiceice> i do in fact have mingw 64: 20141023 03:05:23< iceiceice> x86_64-w64-mingw32-g++ -v 20141023 03:05:23< iceiceice> Using built-in specs. 20141023 03:05:23< iceiceice> COLLECT_GCC=x86_64-w64-mingw32-g++ 20141023 03:05:23< iceiceice> COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-w64-mingw32/4.8/lto-wrapper 20141023 03:05:23< iceiceice> Target: x86_64-w64-mingw32 20141023 03:06:22< loonycyborg> hmm 20141023 03:06:41< loonycyborg> you compile natively? 20141023 03:06:49< loonycyborg> or cross-compile? 20141023 03:07:28< loonycyborg> anyway 20141023 03:07:42< loonycyborg> you sure you wrote proper command name there? 20141023 03:07:54< loonycyborg> not just copied mine 20141023 03:08:14< iceiceice> sudo apt-get install mingw-w64 20141023 03:08:50< iceiceice> scons verifies that i have a compiler, it only fails at the boost part 20141023 03:09:44< loonycyborg> I generated my toolchain with gentoo crossdev 20141023 03:10:28< loonycyborg> using gcc : w64mingw64 : x86_64-w64-mingw32-g++ ; 20141023 03:10:44< iceiceice> $ cat user-config.jam 20141023 03:10:44< iceiceice> using gcc ; 20141023 03:10:44< iceiceice> using gcc : 4.6 : g++-4.6 ; 20141023 03:10:44< iceiceice> using gcc : w64mingw64 : x86_64-w64-mingw32-g++ ; 20141023 03:10:45< loonycyborg> x86_64-w64-mingw32-g++ here must exactly match the compiler command 20141023 03:11:34< loonycyborg> is it in your path? 20141023 03:11:42< loonycyborg> does it work if you call it with -v? 20141023 03:12:07< iceiceice> yes 20141023 03:12:30< iceiceice> i dont understand why ./b2 asks for 'g++-w64mingw32' 20141023 03:12:42< iceiceice> i think boost jam is just garbage 20141023 03:13:03< iceiceice> maybe i should just try a later version of boost? 20141023 03:13:09< iceiceice> i was trying 1.48 20141023 03:13:18< loonycyborg> yes maybe 20141023 03:13:22< loonycyborg> I'm using 1.55 20141023 03:13:50< loonycyborg> but 20141023 03:13:56< loonycyborg> second line works for you? 20141023 03:14:02< loonycyborg> with gcc 4.6 20141023 03:14:20< iceiceice> yes 20141023 03:15:53< loonycyborg> I get it 20141023 03:16:17< loonycyborg> toolset=gcc-w64mingw64 20141023 03:16:21< loonycyborg> you had 32 20141023 03:16:43< iceiceice> ahh thank you 20141023 03:17:00< loonycyborg> yw :P 20141023 03:18:02< iceiceice> rjaguar3: if you disable strict building you can probably continue despite the warning 20141023 03:20:42-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 245 seconds] 20141023 03:22:00< loonycyborg> anyway good night 20141023 03:22:29-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20141023 03:38:24-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 03:39:15-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 03:40:03< shadowm> iceiceice: Can I delete your "TEST TEST TEST" add-on or is it still important for anything? 20141023 03:40:16< iceiceice> it can probably be delted 20141023 03:40:21< iceiceice> i dont even remember what it is 20141023 03:40:23< shadowm> It's got 165 downloads, though I can't say for sure how many come from the server LAN. 20141023 03:40:36< shadowm> Probably only two or three. 20141023 03:40:45< iceiceice> wow i cant believe its almots as popular as my real add-on ;'( 20141023 03:45:21-!- Sulfur [~Miranda@p5B009F49.dip0.t-ipconnect.de] has joined #wesnoth-dev 20141023 03:47:16< ancestral> iceiceice: Reminds me of “Dependency Test”: http://addons.wesnoth.org/1.9/ 20141023 03:47:33< ancestral> 4251 downloads! :-D 20141023 03:56:40< iceiceice> loonycyborg: you still there? 20141023 04:03:36-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Bye for now] 20141023 04:10:49-!- oldlaptop [~quassel@50-108-67-218.adr01.mskg.mi.frontiernet.net] has quit [Ping timeout: 258 seconds] 20141023 04:18:35-!- oldlaptop [~quassel@50-108-67-218.adr01.mskg.mi.frontiernet.net] has joined #wesnoth-dev 20141023 05:08:20-!- Sulfur [~Miranda@p5B009F49.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20141023 05:14:34-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20141023 05:31:14-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 05:31:50-!- rjaguar3 [~rjaguar3@dynamic-oit-pu-dormnet-bb-f-157.Princeton.EDU] has quit [Ping timeout: 250 seconds] 20141023 05:34:12-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 05:43:44-!- kex [~kex@78.157.29.160] has quit [Remote host closed the connection] 20141023 05:50:50-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20141023 05:59:31-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 272 seconds] 20141023 06:02:49-!- zookeeper [zookeeper@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20141023 06:08:25-!- lobby [~wesnoth@wesnoth/bot/lobby] has quit [Ping timeout: 260 seconds] 20141023 06:08:37-!- lobby_ [~wesnoth@wesnoth/bot/lobby] has joined #wesnoth-dev 20141023 06:08:37-!- Topic for #wesnoth-dev: next 1.12 RC planned for Friday, 24 Oct | hard string+feature freeze active on 1.12 | 256 bugs, 338 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 20141023 06:08:37-!- Topic set by Ivanovic [~ivanovic@wesnoth/developer/ivanovic] [Wed Oct 22 19:03:41 2014] 20141023 06:08:37[Users #wesnoth-dev] 20141023 06:08:37[ [Relic] ] [ crimson_penguin] [ Gallaecio] [ knotwork ] [ Rhonda ] [ timotei ] 20141023 06:08:37[ AI0867 ] [ DDR ] [ Haudegen ] [ lobby_ ] [ ryao ] [ ToBeFree ] 20141023 06:08:37[ ancestral ] [ DHost ] [ heirecka ] [ loonycyborg ] [ Samual ] [ vifon ] 20141023 06:08:37[ apoi ] [ elias ] [ higgins ] [ MaraJade ] [ shadowm ] [ vultraz ] 20141023 06:08:37[ Appleman1234] [ enchilado ] [ iceiceice] [ matthiaskrgr] [ shadowm_desktop] [ yann ] 20141023 06:08:37[ Ardonik ] [ esr ] [ irker484 ] [ nurupo ] [ shikadibot ] [ yarker ] 20141023 06:08:37[ BatmanGambit] [ fabi ] [ Ivanovic ] [ oldlaptop ] [ Smar ] [ zookeeper] 20141023 06:08:37[ c74d ] [ Forteskeleton ] [ janebot ] [ Pepe_ ] [ Soliton ] [ {V} ] 20141023 06:08:37[ Crendgrim ] [ Frainz ] [ Jetrel ] [ Ravana_ ] [ TC01 ] 20141023 06:08:37-!- Irssi: #wesnoth-dev: Total of 53 nicks [0 ops, 0 halfops, 0 voices, 53 normal] 20141023 06:08:44-!- Channel #wesnoth-dev created Tue Jan 27 05:28:41 2009 20141023 06:09:42-!- Irssi: Join to #wesnoth-dev was synced in 75 secs 20141023 06:10:11-!- Soliton [~Soliton@wesnoth/developer/soliton] has quit [Disconnected by services] 20141023 06:10:19-!- Soliton [~Soliton@wesnoth/developer/soliton] has joined #wesnoth-dev 20141023 06:10:44-!- matthiaskrgr [matthiaskr@unaffiliated/matthiaskrgr] has quit [Ping timeout: 260 seconds] 20141023 06:13:53-!- Gallaecio_ [~quassel@84.120.180.152.dyn.user.ono.com] has joined #wesnoth-dev 20141023 06:14:00-!- Gallaecio [~quassel@84.120.180.152.dyn.user.ono.com] has quit [Ping timeout: 260 seconds] 20141023 06:15:04-!- matthiaskrgr [matthiaskr@I.Eat.Babies.PanicBNC.net] has joined #wesnoth-dev 20141023 06:15:26-!- matthiaskrgr is now known as Guest40026 20141023 06:23:57< iceiceice> gfgtdf: i'm giving up trying to cross compile for now 20141023 06:24:34-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20141023 06:25:24-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20141023 06:39:16-!- Crendgrim [~crend@wesnoth/forum-moderator/crendgrim] has quit [Ping timeout: 272 seconds] 20141023 06:40:28-!- Crendgrim [~crend@wesnoth/forum-moderator/crendgrim] has joined #wesnoth-dev 20141023 06:53:46-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20141023 06:58:22-!- nurupo_ [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev 20141023 07:00:11-!- esr1 [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has joined #wesnoth-dev 20141023 07:01:00-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20141023 07:04:34-!- MaraJade [goossenm@osuosl/staff/MaraJade] has quit [Ping timeout: 250 seconds] 20141023 07:05:57-!- Netsplit *.net <-> *.split quits: nurupo, esr 20141023 07:05:57-!- nurupo_ is now known as nurupo 20141023 07:08:39-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 07:11:49-!- MaraJade [goossenm@osuosl/staff/MaraJade] has joined #wesnoth-dev 20141023 07:12:07-!- MaraJade [goossenm@osuosl/staff/MaraJade] has quit [Client Quit] 20141023 07:12:43-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has joined #wesnoth-dev 20141023 07:12:43-!- MaraJade [goossenm@shell.onid.oregonstate.edu] has quit [Changing host] 20141023 07:12:43-!- MaraJade [goossenm@osuosl/staff/MaraJade] has joined #wesnoth-dev 20141023 07:16:09-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 272 seconds] 20141023 07:16:51-!- MaraJade_ [goossenm@osuosl/staff/MaraJade] has joined #wesnoth-dev 20141023 07:17:05-!- MaraJade_ [goossenm@osuosl/staff/MaraJade] has quit [Client Quit] 20141023 07:17:27-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 07:22:23-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20141023 07:22:28< iceiceice> gfgtdf: 20141023 07:22:43< iceiceice> i think maybe you should merge the istream_fix branch to master, even if you aren't sure if it solves all, 20141023 07:22:55< iceiceice> because then we can use the jenkins builds to test mingw results 20141023 07:23:42-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Client Quit] 20141023 07:32:49-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20141023 07:44:51-!- kex [~kex@78.157.29.160] has quit [Remote host closed the connection] 20141023 07:54:27-!- molgrum [~molgrum@212.85.89.43] has joined #wesnoth-dev 20141023 08:03:39 * zookeeper wonders if [filter_vision] is somehow broken in master 20141023 08:03:53< zookeeper> it doesn't seem to be working in my dehydration filter, and i don't see what else would cause it... 20141023 08:07:38< zookeeper> yeah, a simple [have_unit] side=2 [filter_vision] viewing_side=1 [/filter_vision] [/have_unit] always matches, even when my side 1 has fog and no side 2 units are visible 20141023 08:07:39< shadowm> zookeeper: Should I keep the magic effect thing from the Ancient Lich's magic attack animation, or do we have resources to replicate it with WML? 20141023 08:09:13< zookeeper> shadowm, eh, i guess the purple lightning can be replaced with whatever the other units use 20141023 08:09:45 * shadowm just realized that animation has the lich in a completely static position with the lightning overlaid on top. 20141023 08:09:47< zookeeper> the defense halo seems rather irrelevant so i don't care 20141023 08:11:12< shadowm> Yeah, the defense halo is crap so I wasn't even going to look at it. 20141023 08:11:45< zookeeper> oh, duh, viewing_side has been deprecated, no wonder it didn't work 20141023 08:12:10< zookeeper> it should produce a deprecation warning 20141023 08:16:23< shadowm> Incidentally, if we literally scaled images without interpolation, they'd remain at their original size on a larger canvas. 20141023 08:17:24< shadowm> So "no interpolation" in image editing applications is a misnomer. 20141023 08:17:34< zookeeper> eh, what? 20141023 08:17:56< shadowm> http://forums.wesnoth.org/viewtopic.php?p=577024#p577024 "no interpolation of any kind (that is, nearest neighbour)" 20141023 08:18:22< zookeeper> ok, so a technical nitpick, fine :p 20141023 08:19:32< shadowm> Though if you did apply the pixel grid transform first you could alternatively have an implementation that leaves large empty areas around the original pixels. 20141023 08:20:47< zookeeper> so what would you like to be slapped with? you need to be slapped with something, i think 20141023 08:21:35 * shadowm becomes intangible and thus immune to slaps. 20141023 08:21:44< zookeeper> cookie? halberd? wet dog? 20141023 08:23:50< zookeeper> time's up 20141023 08:23:51 * zookeeper slaps shadowm with a wet dog -flavoured halberd-shaped cookie 20141023 08:28:32-!- Guest40026 [matthiaskr@I.Eat.Babies.PanicBNC.net] has quit [Changing host] 20141023 08:28:32-!- Guest40026 [matthiaskr@unaffiliated/matthiaskrgr] has joined #wesnoth-dev 20141023 08:28:40-!- Guest40026 is now known as matthiaskrgr 20141023 08:31:23-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20141023 08:40:04-!- DCW [~Thunderbi@cpc66866-finc15-2-0-cust47.4-2.cable.virginm.net] has joined #wesnoth-dev 20141023 08:50:42-!- mjs-de [~mjs-de@f048067109.adsl.alicedsl.de] has joined #wesnoth-dev 20141023 09:04:51< zookeeper> great, UtBS S02 also creates the bandits all with the same id 20141023 09:05:07< bumbadadabum> really? 20141023 09:05:13< bumbadadabum> I never ran into that in Eftboren 20141023 09:05:33< zookeeper> really 20141023 09:06:38< bumbadadabum> ah right 20141023 09:06:43< bumbadadabum> that's easy to change though 20141023 09:06:54< zookeeper> yep 20141023 09:07:19< bumbadadabum> I'll fix that in Eftboren, and port that to mainline as well 20141023 09:08:09< zookeeper> i'm fixing it already 20141023 09:08:14< bumbadadabum> id={ID_STRING}_$i 20141023 09:08:18< bumbadadabum> this is all you need to do 20141023 09:08:20< bumbadadabum> I think 20141023 09:08:37< zookeeper> that'd solve it, yes 20141023 09:08:55< bumbadadabum> they're only referred to by their role 20141023 09:09:05< zookeeper> i'll just rather get rid of the whole ID_STRING because it'd be useless 20141023 09:09:23< bumbadadabum> hmm 20141023 09:09:24< bumbadadabum> yeah 20141023 09:12:16< bumbadadabum> TODO for me: finish the lich lord animation and backport everything EI related 20141023 09:12:46< bumbadadabum> but first I need to relax because I aced my exam and that deserves a reward 20141023 09:12:46< vultraz> bumbadadabum: did you see shadowm's new lich baseframe 20141023 09:12:51< bumbadadabum> no 20141023 09:13:05< vultraz> click the lich screenshot in the announcement 20141023 09:13:43< vultraz> He's working on the animations 20141023 09:13:59< vultraz> er, ancient lich* 20141023 09:14:05< vultraz> not lich 20141023 09:14:26< bumbadadabum> it wouldn't really matter for the animation 20141023 09:14:41< bumbadadabum> because it's all halos 20141023 09:16:23< vultraz> so his baseframe + your haloes? 20141023 09:16:24< vultraz> halos 20141023 09:17:34-!- irker484 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20141023 09:18:23< bumbadadabum> is the baseframe in? 20141023 09:21:42< bumbadadabum> vultraz: also, what layer were unit sprites drawn on again? 20141023 09:21:53< bumbadadabum> because the fucking halos are drawn behind the unit 20141023 09:24:04< zookeeper> urgh, wtf now git? my local changes to a file don't show up as local changes anywhere. 20141023 09:24:14< bumbadadabum> ? 20141023 09:29:57< bumbadadabum> it keeps fucking appearing behind the unit 20141023 09:30:00< bumbadadabum> and it annoys me 20141023 09:33:50-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20141023 09:34:24< bumbadadabum> zookeeper: ok the animation works now 20141023 09:34:41< bumbadadabum> Coffee said it looks good, so am I allowed to commit? 20141023 09:34:57< bumbadadabum> also, I think I might tweak the stats of the shadow wave attack 20141023 09:35:00< bumbadadabum> make it stronger 20141023 09:35:12< bumbadadabum> since all your units have at least 20% defense to arcane 20141023 09:35:45< zookeeper> don't make it stronger without a good reason 20141023 09:36:05< bumbadadabum> the good reason is so there's more interesting gameplay during the duel 20141023 09:36:23< bumbadadabum> since the shadow wave is almost never used 20141023 09:36:33< bumbadadabum> you don't have any non-human units in the entire campaign 20141023 09:36:47< bumbadadabum> and humans have no weakness to arcane 20141023 09:37:02< bumbadadabum> making it have a niche makes it nices against regular soldiers 20141023 09:37:04< bumbadadabum> *nicer 20141023 09:37:14< bumbadadabum> but white mages are obviously still very much resistent to it 20141023 09:38:34-!- kex [~kex@78.157.29.160] has quit [Ping timeout: 258 seconds] 20141023 09:40:52< zookeeper> and the duel is boring now when he only uses the cold attack? 20141023 09:41:16< bumbadadabum> well it's pretty much pointless for him to even have a shadow wave 20141023 09:42:52< zookeeper> yes, and after your change, will it be equally pointless for him to even have the cold attack? 20141023 09:45:21-!- irker866 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20141023 09:45:21< irker866> wesnoth: ln-zookeeper wesnoth:master fff78add9032 / data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg: Fixed dehydration not working on embellished desert http://git.io/K2TZ8Q 20141023 09:45:21< irker866> wesnoth: ln-zookeeper wesnoth:master b523f9b27b7a / data/campaigns/Under_the_Burning_Suns/ (scenarios/02_Across_the_Harsh_Sands.cfg utils/macros.cfg): Fixed duplicate unit id's by PLACE_UNITS_RANDOMLY http://git.io/b4wFqQ 20141023 09:45:22< irker866> wesnoth: ln-zookeeper wesnoth:master 0ba4b8cdb205 / data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg: Fixed issues in MOBILIZE_SIDE http://git.io/j7IS3A 20141023 09:45:24< irker866> wesnoth: ln-zookeeper wesnoth:master 00aa29f34bb7 / data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg: Allow visible guardian units to be dehydrated http://git.io/ycrAaw 20141023 09:45:24< irker866> wesnoth: ln-zookeeper wesnoth:master 23bc15fe929d / data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg: Remove immediate dehydration of spawned ogres http://git.io/XxgEVA 20141023 09:45:26< irker866> wesnoth: ln-zookeeper wesnoth:master e85b5afcf9e0 / changelog: Updated changelog http://git.io/Sjgm5g 20141023 09:45:42< bumbadadabum> zookeeper: no, since you probably have a fuckload of white mages 20141023 09:45:47< zookeeper> it's annoying to do things sequentially like that but there you go 20141023 09:45:54< bumbadadabum> name=ravanal_shadow_wave 20141023 09:45:54< bumbadadabum> damage=13 20141023 09:45:54< bumbadadabum> number=4 20141023 09:45:59< bumbadadabum> I was thinking something like this 20141023 09:46:05< bumbadadabum> still less DPS on humans 20141023 09:46:11< bumbadadabum> but more damage in 1 hit 20141023 09:46:17< bumbadadabum> well, damage per turn rather 20141023 09:46:24< bumbadadabum> since DPS isn't a wesnoth thing 20141023 09:50:24-!- Anakonda [Anakonda@87-92-208-51.bb.dnainternet.fi] has joined #wesnoth-dev 20141023 09:52:58< zookeeper> ok so i'm going to try to port the above commits to 1.12 myself, let's see what happens 20141023 09:56:43< zookeeper> 349 conflicting files? sure, git, sure 20141023 09:57:17< bumbadadabum> I hate backporting 20141023 09:57:26< bumbadadabum> I wish there was a vultraz that would do that for me ;_; 20141023 09:58:40< zookeeper> now reverting the mess it made fails 20141023 09:58:48< zookeeper> how is it that i saw all of this coming? 20141023 09:59:25< zookeeper> "abort merge"? i guess i'll try pressing that 20141023 10:00:13< bumbadadabum> I personally would just clone 1.12 20141023 10:00:17< bumbadadabum> and then apply the diffs 20141023 10:00:59< zookeeper> yeah git really sucks for merging things. 20141023 10:01:51< zookeeper> now i told it to abort the merge by doing a hard reset, and as a result i suddenly have a pile of unversioned files everywhere 20141023 10:02:16< bumbadadabum> I love git 20141023 10:02:20< bumbadadabum> but this is really annoying 20141023 10:02:29< zookeeper> i mean who comes up with crap like this? it's ludicrous, my mom would write better software 20141023 10:02:30< bumbadadabum> and tedious 20141023 10:02:37< bumbadadabum> well I doubt it 20141023 10:02:43< bumbadadabum> don't think your mom has the skills 20141023 10:02:46< bumbadadabum> no offense to your mom 20141023 10:04:10< bumbadadabum> I think this shit probably had advantages somewhere 20141023 10:06:22< zookeeper> shadowm, vultraz, mattsc, whoever feels like it: ^ the first 5 of the above 6 commits need to be ported to 1.12 20141023 10:06:38< bumbadadabum> also my improvements to EI 20141023 10:07:47< zookeeper> with svn i could use trial-and-error to figure out which buttons i need to press for it to merge things the way i want, but here i don't really want to touch it since i expect it to just break my clone. it might already be broken and i just don't see it, i don't know. 20141023 10:07:48< vultraz> not me 20141023 10:08:05< vultraz> zookeeper: you should use a gui 20141023 10:08:10< vultraz> it makes it slightly easier 20141023 10:08:12< zookeeper> dude, what do you think i'm using? 20141023 10:08:22< vultraz> command line? 20141023 10:08:26< zookeeper> uh, no 20141023 10:08:35< bumbadadabum> >using a gui 20141023 10:08:38< bumbadadabum> >on linux 20141023 10:09:15-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20141023 10:09:16< vultraz> >complaining about using a gui on linux 20141023 10:09:29< bumbadadabum> there is no gui on linux 20141023 10:09:35< bumbadadabum> for git, at least 20141023 10:09:36< zookeeper> i use github for windows for basic stuff, but it doesn't support porting commits between branches so i tried tortoisegit for that, which just lead to the aforementioned mess 20141023 10:09:51< vultraz> ah 20141023 10:09:58< zookeeper> haven't re-installed sourcetree yet, i don't know whether i should expect it to do any better though 20141023 10:09:59< vultraz> yeah tgit can be a bit confusing 20141023 10:11:34< vultraz> i assume you're working in the Log window? 20141023 10:12:27< zookeeper> no, tried through the merge dialog 20141023 10:12:47< zookeeper> looks like the log dialog has convenient-_looking_ rightclick-options 20141023 10:13:06< vultraz> always use the Log window 20141023 10:14:53< irker866> wesnoth: ln-zookeeper wesnoth:1.12 1af0865f209d / data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg: Fixed dehydration not working on embellished desert http://git.io/S6IxEA 20141023 10:14:55< irker866> wesnoth: ln-zookeeper wesnoth:1.12 e1ecf5e12dbc / data/campaigns/Under_the_Burning_Suns/ (scenarios/02_Across_the_Harsh_Sands.cfg utils/macros.cfg): Fixed duplicate unit id's by PLACE_UNITS_RANDOMLY http://git.io/2RG9Cw 20141023 10:14:57< irker866> wesnoth: ln-zookeeper wesnoth:1.12 e206efda2f17 / data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg: Fixed issues in MOBILIZE_SIDE http://git.io/izJJlA 20141023 10:14:59< irker866> wesnoth: ln-zookeeper wesnoth:1.12 6dcdc0a5860a / data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg: Allow visible guardian units to be dehydrated http://git.io/fBfMaQ 20141023 10:15:01< irker866> wesnoth: ln-zookeeper wesnoth:1.12 1adb4fd215b7 / data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg: Remove immediate dehydration of spawned ogres http://git.io/h8Hj_w 20141023 10:15:03< zookeeper> oh sweet 20141023 10:15:19< bumbadadabum> u-um 20141023 10:15:28< bumbadadabum> zookeeper: can you backport my EI commits as well? 20141023 10:15:30< vultraz> see? always use the Log window :D 20141023 10:15:32< bumbadadabum> I really can't figure out how 20141023 10:17:14< irker866> wesnoth: ln-zookeeper wesnoth:1.12 e0acbed93341 / changelog: Updated changelog http://git.io/b0eHAg 20141023 10:17:19< zookeeper> phew... 20141023 10:20:42< zookeeper> bumbadadabum, don't you think expanding the 17b starting villages radius changes the balance quite a bit? 20141023 10:21:00< zookeeper> you didn't update the radius comment either 20141023 10:21:07< bumbadadabum> zookeeper: the main difference is that the villages are a bit further away 20141023 10:21:17< bumbadadabum> there aren't more villages IIRC 20141023 10:21:37< bumbadadabum> and I did add more favorable terrain to defend the villages 20141023 10:22:44< bumbadadabum> I didn't get the chance to playtest it, sadly 20141023 10:22:49< bumbadadabum> I don't have my EI saves anymore 20141023 10:22:58< bumbadadabum> and I didn't have the time to play through ALL OF IT 20141023 10:23:21< zookeeper> is that a yes or a no? 20141023 10:23:34< bumbadadabum> I don't think it's that big 20141023 10:24:31< zookeeper> okay 20141023 10:24:41< bumbadadabum> idk do you think it's really big? 20141023 10:24:48< bumbadadabum> you're the more experienced person here 20141023 10:25:33-!- prkc [~prkc@51B679DF.dsl.pool.telekom.hu] has joined #wesnoth-dev 20141023 10:27:00< bumbadadabum> zookeeper: do you think I should add more defensive terrain? 20141023 10:27:04< bumbadadabum> maybe a few encampments? 20141023 10:27:11< zookeeper> well it means that the player immediately gets a lot more income for the first two turns or so, and doesn't have to spend those turns capturing the villages. plus i think it makes sense that they have to recapture the villages beyond the moat considering the setup of the previous scenario. 20141023 10:27:43< zookeeper> it wouldn't hurt to have some parts of the encampments of s14 still standing 20141023 10:28:09< bumbadadabum> ah I understand 20141023 10:28:46< zookeeper> anyway, i guess i could perform any final touches i think the maps might warrant 20141023 10:28:58< bumbadadabum> well I could as well 20141023 10:33:13-!- DCW [~Thunderbi@cpc66866-finc15-2-0-cust47.4-2.cable.virginm.net] has quit [Quit: DCW] 20141023 11:07:30< vultraz> gui.pyw is the best thing ever 20141023 11:15:35-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20141023 12:13:11-!- kex [~kex@78.157.29.160] has quit [Remote host closed the connection] 20141023 12:55:22-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has joined #wesnoth-dev 20141023 13:21:01-!- kex [~kex@78.157.29.160] has joined #wesnoth-dev 20141023 13:26:04-!- kex [~kex@78.157.29.160] has quit [Ping timeout: 265 seconds] 20141023 13:34:53-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 13:47:24-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20141023 14:01:39-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20141023 14:14:07-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 14:14:45-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit] 20141023 14:20:17-!- apoi [~andi@80-110-40-98.static.surfer.at] has quit [Quit: leaving] 20141023 14:21:18-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 14:43:24-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 15:01:02-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20141023 15:12:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20141023 15:14:42-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 15:29:16< irker866> wesnoth: mattsc wesnoth:1.12 7199486105ab / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Xcode project: update boost and SDL libraries http://git.io/bKHoLg 20141023 15:34:40< mattsc> ls -lrth 20141023 15:34:52-!- kex [~kex@77.28.11.56] has joined #wesnoth-dev 20141023 15:54:01-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Computer's napping] 20141023 16:08:56-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev 20141023 16:26:41-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20141023 16:45:30-!- Sulfur [~Miranda@p5B009F49.dip0.t-ipconnect.de] has joined #wesnoth-dev 20141023 16:57:22< zookeeper> mattsc, so i've finished my UtBS fixes for now... unless i missed something. in case you want to test the scenario some more. 20141023 16:57:55< mattsc> zookeeper: thanks - sounds great. I might do some more tests tonight. 20141023 16:58:28< zookeeper> i've only tested on master though, so i suppose i should do a proper 1.12 test run myself, too... 20141023 16:59:34< mattsc> Yeah. IIRC, I did my previous tests on 1.12 though. 20141023 17:00:04-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Computer's napping] 20141023 17:15:37< irker866> wesnoth: Nils Kneuper wesnoth:1.12 885072a39b9c / / (29 files in 28 dirs): updated Spanish translation http://git.io/G61w9g 20141023 17:15:41< irker866> wesnoth: Nils Kneuper wesnoth:master 37c91664e29c / / (29 files in 28 dirs): updated Spanish translation http://git.io/Xja0hg 20141023 17:26:58-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20141023 17:34:01-!- fabi [~quassel@p20030051AA26CB02110F3FAF97E630C9.dip0.t-ipconnect.de] has quit [Ping timeout: 265 seconds] 20141023 17:34:17-!- fabi [~quassel@p20030051AA26CB95110F3FAF97E630C9.dip0.t-ipconnect.de] has joined #wesnoth-dev 20141023 17:36:47-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 17:45:06< shadowm> bumbadadabum: Have your EI commits been backported yet? 20141023 17:49:02-!- Sulfur [~Miranda@p5B009F49.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20141023 17:52:19< zookeeper> nope 20141023 17:52:33< shadowm> So when were you planning on telling me this? 20141023 17:52:58< zookeeper> i have two of them backported, but the village radius thing should not be (and should be reverted in master), and the changelog commit didn't port 20141023 17:53:00< shadowm> I need a list of commits that need to be backported. 20141023 17:53:07< zookeeper> backported locally, i mean 20141023 17:53:34< zookeeper> i can give you the list, just a second... 20141023 17:53:40< shadowm> The changelog always causes cross-branch conflicts, yes. This is nothing new. 20141023 17:54:32< shadowm> You'd get equally messy results with SVN or Git -- just resolve the conflicts or even better yet, recreate the changelog entries by hand (the former is how I screwed up the 1.11.16 changelog). 20141023 17:55:00< zookeeper> d7ae5c, 0b16e7, 779274 20141023 17:56:17< shadowm> error: short SHA1 0b16e7 is ambiguous. 20141023 17:56:20-!- DCW [~Thunderbi@cpc66866-finc15-2-0-cust47.4-2.cable.virginm.net] has joined #wesnoth-dev 20141023 17:56:39< shadowm> Seems to be 0b16e789e37d1306171feabcd7d962660ed210af. 20141023 17:57:31< zookeeper> yes 20141023 17:58:57< zookeeper> now i just have to figure out how to clean my clone of those two commits 20141023 17:59:05< shadowm> Done. 20141023 17:59:07< irker866> wesnoth: Bär Halberkamp wesnoth:1.12 a9721b4b1bc7 / data/campaigns/Eastern_Invasion/maps/ (14_Approaching_Weldyn.map 16_Weldyn_under_Attack.map 17b_Weldyn_Besieged.map): Improved the final few EI maps http://git.io/AhtZSw 20141023 17:59:10< irker866> wesnoth: Bär Halberkamp wesnoth:1.12 d98ebbcc67db / data/campaigns/Eastern_Invasion/ (maps/14_Approaching_Weldyn.map scenarios/14_Approaching_Weldyn.cfg): EI: changed scenario 14 to fit the new map, and added some more encampment for s http://git.io/RoWUjw 20141023 17:59:13< irker866> wesnoth: Bär Halberkamp wesnoth:1.12 1c1d18834d3b / changelog players_changelog: Updated changelogs http://git.io/2ffSJA 20141023 18:00:23< zookeeper> does it sound about right to reset to the commit preceding the backported commits? 20141023 18:02:15< bumbadadabum> shadowm: they weren't 20141023 18:02:19< bumbadadabum> but thanks to whoever did it 20141023 18:03:13< shadowm> zookeeper: Yes, all commits after that commit will be removed from history. 20141023 18:03:58< shadowm> bumbadadabum: You can open a commit in GitHub (or use `git log/show --format=fuller`) to see the committer. 20141023 18:04:49< irker866> wesnoth: Ignacio R. Morelle wesnoth:1.12 ee5bb27e6e0f / changelog players_changelog: Updated changelogs with my UtBS fixes so far http://git.io/1cA15A 20141023 18:04:52< irker866> wesnoth: Ignacio R. Morelle wesnoth:master c08af445444a / changelog players_changelog: Updated changelogs with my UtBS fixes so far http://git.io/i6F2wA 20141023 18:05:22< bumbadadabum> zookeeper: I reverted the radius thing locally 20141023 18:05:50< bumbadadabum> but I was waiting to push until I have the lich lord anim finished 20141023 18:06:08< bumbadadabum> that one's pretty much done, but the only thing left are the stats 20141023 18:06:55< shadowm> iceiceice: "Fix bug wherein {MOVE_UNIT} would sometimes overwrite another unit." There was no such bug affecting MOVE_UNIT in version 1.11.11, this doesn't belong in the 1.13.0-dev block. (Don't fix it yourself, it'll conflict with my next commits.) 20141023 18:07:20< zookeeper> oh wait wtf, that reset destroyed my local changes? argh 20141023 18:07:35< zookeeper> i had been working on the weldyn besieged map and was basically done 20141023 18:07:49< shadowm> Were they committed? 20141023 18:07:53< zookeeper> of course not 20141023 18:07:59< shadowm> Locally I mean. 20141023 18:08:06< zookeeper> i know 20141023 18:08:36-!- DCW [~Thunderbi@cpc66866-finc15-2-0-cust47.4-2.cable.virginm.net] has quit [Ping timeout: 244 seconds] 20141023 18:09:51< bumbadadabum> anyway zookeeper would 13-4 for the shadow wave be ok? 20141023 18:10:09< irker866> wesnoth: Ignacio R. Morelle wesnoth:1.12 b3893c583d35 / changelog: Explain move_unit fix in the changelog better http://git.io/qGoqnA 20141023 18:10:14< zookeeper> i have no means of knowing 20141023 18:10:33< bumbadadabum> I sadly don't have a save either 20141023 18:10:42< irker866> wesnoth: Ignacio R. Morelle wesnoth:master 621e43fb367a / changelog: There is nothing to fix about move_unit between 1.11.11 and 1.13.0 http://git.io/H_a87A 20141023 18:10:42< bumbadadabum> for now I'll just leave it at the normal values and commit 20141023 18:10:56< bumbadadabum> if that's all right with you 20141023 18:11:23< irker866> wesnoth: Ignacio R. Morelle wesnoth:1.12 a787c818b15d / players_changelog: Add other UtBS fixes to players_changelog http://git.io/KuYARQ 20141023 18:11:26< irker866> wesnoth: Ignacio R. Morelle wesnoth:master 459126e65843 / players_changelog: Add other UtBS fixes to players_changelog http://git.io/GpH9pg 20141023 18:12:22< zookeeper> yes, of course it is 20141023 18:12:41< zookeeper> as long as by normal values you mean you won't change them 20141023 18:12:49-!- DCW1 [~Thunderbi@cpc66866-finc15-2-0-cust47.4-2.cable.virginm.net] has joined #wesnoth-dev 20141023 18:12:53< bumbadadabum> yeah that's what I meant 20141023 18:13:07-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20141023 18:13:28-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20141023 18:13:47< bumbadadabum> shall I also revert the village radius changes? 20141023 18:14:32< zookeeper> umm, which ones are those? 20141023 18:14:40< bumbadadabum> in 17b 20141023 18:14:47< bumbadadabum> the ones you were talking about 20141023 18:14:55< zookeeper> the one, you mean? 20141023 18:15:02< bumbadadabum> yeah, the one 20141023 18:15:20< zookeeper> yes, please 20141023 18:17:05-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20141023 18:17:30< iceiceice> shadowm: i think that actually I had cherry-picked the LovCAPONE commit to master: 20141023 18:17:30< iceiceice> https://github.com/wesnoth/wesnoth/commit/72f138c54414bc0349def0271ec1ccbad984a28b 20141023 18:17:44< iceiceice> so the changelog entry should just be moved to 1.13.0-dev, not deleted 20141023 18:17:49< shadowm> That's not the point, the point is that 2 + -2 = 0. 20141023 18:18:16< shadowm> The 1.13.0-dev block is a delta from 1.11.11, not 1.12.0 which hasn't even happened yet. 20141023 18:19:19< bumbadadabum> done 20141023 18:19:27< irker866> wesnoth: Bär Halberkamp wesnoth:master 471e7c557e77 / data/campaigns/Eastern_Invasion/units/Lich_Lord.cfg: New animation for the Lich Lord http://git.io/PLR5tA 20141023 18:19:29< bumbadadabum> and zookeeper, sorry for not thinking the village radius through 20141023 18:19:30< irker866> wesnoth: Bär Halberkamp wesnoth:master f65228b28a1c / data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg: reverted the village radius changes in 17b http://git.io/h2rR1Q 20141023 18:19:33< irker866> wesnoth: Bär Halberkamp wesnoth:master fe7b3ee7eec1 / changelog players_changelog: Updated changelog and players_changelog http://git.io/boAfSQ 20141023 18:19:44< shadowm> What do I need to backport now? 20141023 18:19:48< bumbadadabum> nothing 20141023 18:20:01< bumbadadabum> wait fuck fuck fuck fuck I fucked up 20141023 18:20:41< iceiceice> shadowm: if stuff gets cherry-picked to 1.13, then it needs to go in changelog entry there also,, 20141023 18:20:48< shadowm> No. 20141023 18:20:52< iceiceice> regardless of if it happens to be in 1.12 also, right? 20141023 18:21:15< iceiceice> otherwise, in the future you won't be able to figure out when the change was introduced by looking at the current changelog 20141023 18:21:30< iceiceice> you would have to go to every stable release and grep all those changelogs 20141023 18:21:51< irker866> wesnoth: Bär Halberkamp wesnoth:master 5739831d82f4 / data/campaigns/Eastern_Invasion/units/Lich_Lord.cfg: Re-added some incorrectly removed code http://git.io/lpqYlQ 20141023 18:21:57< shadowm> The 1.13.0-dev block is a delta from 1.11.11, not 1.12.0 which hasn't even happened yet. 20141023 18:22:11< iceiceice> thats right, 20141023 18:22:25< shadowm> 1.13.0 can't fix bugs in 1.11.11 that didn't even exist at that point. 20141023 18:22:28< iceiceice> the changelog entry in 1.13.0 is to indicate the change which was applied to master branch 20141023 18:22:37< iceiceice> the change was introduced to 1.13.0 also, 20141023 18:22:43< iceiceice> because the buggy commit was cherry-picked 20141023 18:22:59< shadowm> The change was not introduced to 1.13.0. 20141023 18:23:01< iceiceice> it was 20141023 18:23:08< shadowm> When was 1.3.0 tagged then? 20141023 18:23:13< iceiceice> https://github.com/wesnoth/wesnoth/commit/72f138c54414bc0349def0271ec1ccbad984a28b#diff-6b306396aa9fdbc560492611d41dd56fR193 20141023 18:23:16< shadowm> *1.13.0 20141023 18:24:03< mattsc> iceiceice: if you introduce a bug in a =/-dev version, but fix it before the next release, it does not need to go into the changelog 20141023 18:24:07< iceiceice> oh i see, so you dont want to put changelog entries for bug fixes to unreleased 20141023 18:24:12< mattsc> I think that is what shadowm is trying to say 20141023 18:24:36< shadowm> Yes. 20141023 18:24:40< mattsc> otherwise you’d have to put every mistake you make in a commit into the changelog 20141023 18:24:45-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has quit [Quit: riksteri] 20141023 18:25:06< mattsc> * +/-dev 20141023 18:29:50< shadowm> zookeeper: Did you ever have an opinion on this? http://forums.wesnoth.org/viewtopic.php?p=541707#p541707 20141023 18:32:02< zookeeper> shadowm, yeah, i'm fine with those as long as they're animated. i don't really want unanimated custom sprites. 20141023 18:32:35< shadowm> Well, good luck getting someone to animate something that's been completely forgotten. 20141023 18:33:02< bumbadadabum> didn't we always say "a good unanimated sprite is better than a shitty animated one" 20141023 18:33:26< shadowm> That's the mainline era view. 20141023 18:33:45< bumbadadabum> imo this looks better than the current ancient lich 20141023 18:33:47< shadowm> Though it's mostly for sprites with existing art -- in this case there is no existing unit. 20141023 18:34:34-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Remote host closed the connection] 20141023 18:35:49< zookeeper> i never said that, so i don't say that when my opinion is asked 20141023 18:36:02-!- DCW1 [~Thunderbi@cpc66866-finc15-2-0-cust47.4-2.cable.virginm.net] has quit [Remote host closed the connection] 20141023 18:37:50-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has joined #wesnoth-dev 20141023 18:38:59< iceiceice> ancient lich only has like 3 frames anyways, right? 20141023 18:39:05< bumbadadabum> y 20141023 18:39:44< shadowm> ... Six. 20141023 18:40:10< shadowm> Or at least, I'm in the process of upgrading it animation-wise. 20141023 18:40:23< bumbadadabum> oh ok 20141023 18:41:44< iceiceice> shadowm: it depends if you count the attack frame that dont change the figure but just add lightning 20141023 18:42:04< iceiceice> right, because if you dont have to edit the base frame its obv. alot easier to make those 20141023 18:42:19< shadowm> I noticed the static ranged attack frames earlier. 20141023 18:42:38< shadowm> I'm adapting the L3 Lich's attack animation instead of that crap. 20141023 18:43:49< shadowm> I also added an extra melee attack animation frame (again, adapting the L3 Lich's animation) to make it less stiff and outdated. 20141023 18:44:31< shadowm> Because if I'm going to be working on animations for a new baseframe I might as well try to not do a subpar job. 20141023 18:48:55-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20141023 18:50:23-!- travis-ci [~travis-ci@ec2-54-92-249-129.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 18:50:23< travis-ci> gfgtdf/wesnoth-old#302 (istream_fix - 0eb6c06 : gfgtdf): The build was broken. 20141023 18:50:23< travis-ci> Build details : http://travis-ci.org/gfgtdf/wesnoth-old/builds/38848092 20141023 18:50:23-!- travis-ci [~travis-ci@ec2-54-92-249-129.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 19:12:20-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 19:15:50-!- kex [~kex@77.28.11.56] has quit [Remote host closed the connection] 20141023 19:29:41-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20141023 19:46:17< irker866> wesnoth: Chris Beck wesnoth:master 751ab8f02552 / data/multiplayer/factions/ (loyalists-aoh.cfg loyalists-default.cfg): use grand knight portrait for 'loyalists' help description http://git.io/KAf5iw 20141023 19:46:19< irker866> wesnoth: Chris Beck wesnoth:master 24d9aa08a825 / data/multiplayer/factions/ (northerners-aoh.cfg northerners-default.cfg): use warlord portrait for 'northerners' in help description http://git.io/2GEvww 20141023 19:46:21< irker866> wesnoth: Chris Beck wesnoth:master 8ae5a3556dff / data/multiplayer/factions/ (khalifate-aoh.cfg khalifate-default.cfg): add khalifate description based on 1.12 release announcement text http://git.io/SnhZRA 20141023 19:46:23< irker866> wesnoth: Chris Beck wesnoth:master 635949f31368 / / (34 files in 32 dirs): Merge branch 'master' of https://github.com/wesnoth/wesnoth http://git.io/3NzNYQ 20141023 19:47:55-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20141023 19:51:30-!- travis-ci [~travis-ci@ec2-54-83-83-132.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 19:51:30< travis-ci> gfgtdf/wesnoth-old#303 (istream_fix - 27a9541 : gfgtdf): The build was fixed. 20141023 19:51:30< travis-ci> Build details : http://travis-ci.org/gfgtdf/wesnoth-old/builds/38853938 20141023 19:51:30-!- travis-ci [~travis-ci@ec2-54-83-83-132.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 19:53:30< iceiceice> hmm i have a wierd question, 20141023 19:53:43< iceiceice> so it appears that we have both male and female variations of elvish archer, 20141023 19:53:48< iceiceice> but the sprites are exactly the same, just copied? 20141023 19:54:34< shadowm> No. 20141023 19:55:24< shadowm> Open data/core/images/units/elves-wood/archer+female.png and data/core/images/units/elves-wood/archer.png side-by-side and I'm sure you'll notice the differences. 20141023 19:55:45< bumbadadabum> iceiceice: only the idle animation is the same 20141023 19:56:17< iceiceice> ok 20141023 19:56:21 * shadowm thought he had disabled that animation ages ago. 20141023 19:56:36< bumbadadabum> shadowm: it was in there last year 20141023 20:33:03< iceiceice> bumbadadabum: i'm going to cancel the travis builds from your commit, so that travis gets to gfgtdf's branch faster, ok? 20141023 20:33:17< bumbadadabum> iceiceice: my commits are WML commits 20141023 20:33:18< bumbadadabum> so sure 20141023 20:33:34-!- gfgtdf [~chatzilla@f054134131.adsl.alicedsl.de] has joined #wesnoth-dev 20141023 20:38:42-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 20:46:52-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 21:04:43-!- kex [~kex@77.28.11.56] has joined #wesnoth-dev 20141023 21:08:52-!- kex [~kex@77.28.11.56] has quit [Ping timeout: 240 seconds] 20141023 21:12:17-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20141023 21:17:05< shadowm> mattsc, Ivanovic: Odds are I won't be around tomorrow, btw, so good luck with releasing. I do expect to have time on CLST night to work on the 1.11.18 announcement, though. 20141023 21:18:00< shadowm> Unless I'm tired and unable to stare at a screen for long -- then it'll have to be this Saturday on the afternoon. 20141023 21:18:37-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20141023 21:19:10< zookeeper> at which time of day would the release happen? 20141023 21:19:16< zookeeper> (approximately, obviously) 20141023 21:19:55 * shadowm always assumes CET morning so as to have everything done in advance. 20141023 21:22:18< zookeeper> CET morning on friday would be... in 8 hours? O.o 20141023 21:23:18< shadowm> Morning as in 8 am - 12 pm, not early morning. 20141023 21:25:48-!- kex [~kex@77.28.11.56] has joined #wesnoth-dev 20141023 21:25:57< zookeeper> well, sure, but still 20141023 21:26:17< zookeeper> i guess i don't have anything to commit really aside from that one EI map tweaking session to redo... 20141023 21:26:39< zookeeper> and it doesn't need to be in the next release anyway 20141023 21:35:27-!- gfgtdf_ [~chatzilla@f054062057.adsl.alicedsl.de] has joined #wesnoth-dev 20141023 21:39:15-!- gfgtdf [~chatzilla@f054134131.adsl.alicedsl.de] has quit [Ping timeout: 256 seconds] 20141023 21:39:22-!- gfgtdf_ is now known as gfgtdf 20141023 21:42:36-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 21:44:38-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 21:59:44< irker866> wesnoth: gfgtdf wesnoth:master c27fb4d00e18 / src/filesystem_boost.cpp: fix filesystem_boost.cpp on mingw http://git.io/G51jMg 20141023 21:59:46< irker866> wesnoth: gfgtdf wesnoth:master 66712590d0f5 / src/filesystem_boost.cpp: add boost 1.44 comability http://git.io/v-jt3w 20141023 21:59:48< irker866> wesnoth: gfgtdf wesnoth:master 6ad7a525cfe0 / src/util.hpp: fix msvc warning http://git.io/ne33Kg 20141023 21:59:50< irker866> wesnoth: gfgtdf wesnoth:master 360bef9b95a3 / src/ (6 files in 2 dirs): make unicode_cast more generic http://git.io/agZOqA 20141023 21:59:52< irker866> wesnoth: gfgtdf wesnoth:master 7e2f0e6c3710 / src/ (14 files in 5 dirs): fix some includes http://git.io/nnFIFQ 20141023 21:59:54< irker866> wesnoth: gfgtdf wesnoth:master 1faa268de5f2 / src/serialization/ (ucs4_iterator_base.hpp unicode.cpp unicode.hpp): simplyfy utf8::iterator implementation http://git.io/LdyEmw 20141023 21:59:56< irker866> wesnoth: gfgtdf wesnoth:master cd1ab92d7402 / src/serialization/ (ucs4_iterator_base.hpp unicode.hpp): remove double declarations in unicode.hpp http://git.io/qnGrjg 20141023 21:59:58< irker866> wesnoth: gfgtdf wesnoth:master 0586becbfa08 / src/filesystem_boost.cpp: add custom codecvt for better error mesages. http://git.io/6Awzww 20141023 22:00:00< irker866> wesnoth: gfgtdf wesnoth:master fa67d1457146 / src/ (5 files in 2 dirs): use unicode programm args on windows http://git.io/STMJGg 20141023 22:00:02< irker866> wesnoth: gfgtdf wesnoth:master 2ecf630ad363 / src/ (hotkey/hotkey_item.cpp serialization/unicode_cast.hpp): fix unicode cast http://git.io/nXcDyg 20141023 22:00:04< irker866> wesnoth: gfgtdf wesnoth:master 8a81fb526dcf / src/ (28 files in 8 dirs): Merge pull request #305 from gfgtdf/istream_fix http://git.io/mMR1aw 20141023 22:00:09< gfgtdf> loonycyborg: i merged my pr into master. 20141023 22:00:24< loonycyborg> hmm but 20141023 22:00:25-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20141023 22:00:37< loonycyborg> did you see that my message? 20141023 22:00:43< loonycyborg> about compile errors? 20141023 22:01:31< gfgtdf> loonycyborg: y i tried to fix them but i couldnt test. 20141023 22:02:14< loonycyborg> ok 20141023 22:03:18-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Ping timeout: 250 seconds] 20141023 22:03:54< gfgtdf> loonycyborg: i put teh line that gave teh erro outside the #ifdef win32 so it should be tested by travis now too 20141023 22:05:27< irker866> wesnoth: gfgtdf wesnoth:master 702341668887 / src/scripting/lua.cpp: cstyle_cast -> static_cast http://git.io/Ps9v0A 20141023 22:08:52-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Computer's napping] 20141023 22:09:37-!- Kexoth [~kex@77.29.141.213] has joined #wesnoth-dev 20141023 22:12:07-!- kex [~kex@77.28.11.56] has quit [Ping timeout: 255 seconds] 20141023 22:16:49-!- cjhopman [cjhopman@nat/google/x-iqwhtawstobpnqfp] has joined #wesnoth-dev 20141023 22:32:51-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20141023 22:33:25-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20141023 22:54:21-!- travis-ci [~travis-ci@ec2-54-237-202-150.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 22:54:21< travis-ci> wesnoth/wesnoth#4383 (master - 8a81fb5 : gfgtdf): The build has errored. 20141023 22:54:21< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/38870592 20141023 22:54:21-!- travis-ci [~travis-ci@ec2-54-237-202-150.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 23:06:09-!- zookeeper [zookeeper@wesnoth/developer/zookeeper] has quit [Ping timeout: 260 seconds] 20141023 23:06:57-!- Anakonda [Anakonda@87-92-208-51.bb.dnainternet.fi] has quit [Read error: Connection reset by peer] 20141023 23:07:49-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20141023 23:13:28-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20141023 23:15:32-!- trewe [~trewe@188.251.214.126] has joined #wesnoth-dev 20141023 23:20:41-!- Bob_The_Mighty [~chatzilla@cpc4-brig16-2-0-cust378.3-3.cable.virginm.net] has joined #wesnoth-dev 20141023 23:21:39-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20141023 23:34:30-!- Kexoth [~kex@77.29.141.213] has quit [Remote host closed the connection] 20141023 23:49:14-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20141023 23:50:10-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai] 20141023 23:51:02-!- travis-ci [~travis-ci@ec2-54-242-82-0.compute-1.amazonaws.com] has joined #wesnoth-dev 20141023 23:51:02< travis-ci> wesnoth/wesnoth#4383 (master - 8a81fb5 : gfgtdf): The build passed. 20141023 23:51:02< travis-ci> Build details : http://travis-ci.org/wesnoth/wesnoth/builds/38870592 20141023 23:51:02-!- travis-ci [~travis-ci@ec2-54-242-82-0.compute-1.amazonaws.com] has left #wesnoth-dev [] 20141023 23:52:54-!- ancestral [~ancestral@174-20-180-46.mpls.qwest.net] has joined #wesnoth-dev 20141023 23:58:27< iceiceice> gfgtdf: i think i caused this new thing pent posted about 20141023 23:58:30< iceiceice> i will try to fix it asap --- Log closed Fri Oct 24 00:00:07 2014