--- Log opened Sat Jun 28 00:00:13 2014 20140628 00:19:33-!- mjs-de [~mjs-de@f048195255.adsl.alicedsl.de] has joined #wesnoth-dev 20140628 00:32:26-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140628 00:46:36-!- ancestral [~ancestral@17.114.45.173] has quit [Quit: ancestral] 20140628 00:52:49< Coffee_irc> morning 20140628 00:53:05< Coffee_irc> Aishiko_laptop: looks like you've got a few commits in for the spritesheets 20140628 00:54:11< Coffee_irc> might download the spritesheet branch and have a play 20140628 00:55:36-!- kex_ [~kex@93-137-21-186.adsl.net.t-com.hr] has joined #wesnoth-dev 20140628 00:56:40< Aishiko_laptop> Coffee_irc, its still got a compile issue, I'm hoping to have that figured out and soon 20140628 00:57:14< Coffee_irc> oh, ok 20140628 00:57:17< Aishiko_laptop> I pushed out a commit that didn't compile to get comments on it, but we've not yet gotten to it 20140628 00:57:29< Coffee_irc> happy to help test if you want when you have it working 20140628 00:57:44< Coffee_irc> I know it is of course a work in progress 20140628 00:58:16-!- Kexoth [~kex@93-142-174-150.adsl.net.t-com.hr] has quit [Ping timeout: 240 seconds] 20140628 00:58:41< Aishiko_laptop> I'll be sure to let you know, and I'll make sure there is at least one unit converted to a spritesheet, and one half converted, just to see if it works for partial conversions 20140628 00:59:38< Coffee_irc> I'm looking forward to seeing how it will work, and also with SDL 2 20140628 01:02:23< Coffee_irc> Ivanovic: what is happening with 1.11.6? 20140628 01:02:31< Coffee_irc> *1.11.16 20140628 01:02:47< shadowm> Fix or remove the whiteboard first, that's what the ML says. 20140628 01:02:54< Aishiko_laptop> I'm hoping that most people won't notice a difference when playing other then smoother animations 20140628 01:03:14< Coffee_irc> shadowm: oh, ok 20140628 01:03:53< Coffee_irc> Aishiko_laptop: I'm hoping for smoother animations as a result also 20140628 01:04:31< Coffee_irc> we've had a few bugs that can be "fixed" with workarounds with animation smoothness, but so far have always led to other bugs 20140628 01:05:23< shadowm> Aishiko_laptop: A thing I said the other day before the accident: 20140628 01:05:35< shadowm> Or after? Not that I can tell the difference from my side. 20140628 01:05:38< shadowm> 22:45:45 The sprite_data type consumes what appears to be a [spritesheet] WML node. It includes a few attributes, the problematic ones being "x_coor" and "y_coor". 20140628 01:05:42< shadowm> 22:46:18 Everywhere else we use "x" and "y" since it's pretty obvious to most people that they describe coordinates when paired. 20140628 01:05:58< shadowm> (WML is generally meant to be consistent in nomenclature conventions.) 20140628 01:06:38< Aishiko_laptop> ahh OK that is an easy fix 20140628 01:07:28< Aishiko_laptop> I try to avoid single character variable names, but I can follow group naming conventions 20140628 01:07:30< shadowm> Do you use cmake or scons to build your branch? 20140628 01:07:34< Aishiko_laptop> cmake 20140628 01:08:24< shadowm> It should be noted that if you are adding new source files you should update both src/CMakeLists.txt and src/SConscript, even if you can't or don't want to test one of them . 20140628 01:08:32< Aishiko_laptop> just because x and y are commonly used in coding examples and text books 20140628 01:08:44< shadowm> Updating either is generally straightforward unless you are doing something really unusual. 20140628 01:09:35< Aishiko_laptop> yeah, just adding the new file in the right grouping 20140628 01:10:58< Aishiko_laptop> I just didn't realize that scons uses a similar file, not that I thought to go looking for it 20140628 01:14:22< Coffee_irc> with the whiteboard bug, is mordante looking into it? 20140628 01:14:41< shadowm> Aishiko_laptop: In src/unit_animation.cpp:617 you have a while without a condition, so of course it doesn't compile. 20140628 01:15:08< Coffee_irc> I've got a free weekend for the first time in ages and I can give a go at fixing https://gna.org/bugs/?22231 20140628 01:15:57< shadowm> I don't get what line 621 is supposed to be, right now it seems to be the sprite_data type constructor's signature pasted there for no obvious reason (obviously won't compile). 20140628 01:17:03< Aishiko_laptop> shadowm, I know I wasn't sure what to put in there to get it to go through all of them, and place the structs into a vector as that seemed to me to be a good way to organize them all 20140628 01:19:49< shadowm> It seems like you have a couple of commented-out blocks that be the solution to that, though. 20140628 01:21:52-!- sachith500 [~kvirc@112.134.200.136] has joined #wesnoth-dev 20140628 01:22:44< shadowm> Except there are a few type mismatches (can't call push_back(const unit_animation&) on std::vector because sprite_data doesn't have a constructor or other means to initialize from a const unit_animation&). 20140628 01:24:59-!- mjs-de [~mjs-de@f048195255.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140628 01:25:28< shadowm> Er, I a few words above. 20140628 01:25:39< shadowm> *a couple of commented-out blocks that were meant to be the solution to that 20140628 01:27:32< Aishiko_laptop> we changed directions and added the sprite_data so it would be created much like the portraits are and so that caused changes to be needed elsewhere, that I've not finished 20140628 01:29:27< shadowm> Ensuring every commit compiles on its own regardless of the meta circumstances is kind of an important skill that we encourage people to have, though. 20140628 01:30:36< shadowm> Even in the middle of a refactoring it's important that we are always able to work in parallel in other areas without everything being broken beyond recognition (yes, I know this is a separate branch, but still, it's a matter of habits). 20140628 01:31:18< Aishiko_laptop> I should have commented that code block out and put a not that it needs peer review 20140628 01:31:22< shadowm> For the committer, wrapping up all syntactic loose ends before committing is also highly useful because that means they don't need to worry about dealing with that at a later point. 20140628 01:38:33-!- sachith500 [~kvirc@112.134.200.136] has quit [Read error: Connection reset by peer] 20140628 01:39:18-!- sachith500 [~kvirc@112.134.200.136] has joined #wesnoth-dev 20140628 01:39:24< shadowm> gfgtdf: See my query. 20140628 01:41:34< shadowm> iceiceice: Could you explain why you did 8f0fe88635c0a06969b7f49b13e4fb74b066b317 the way you did it instead of adding a new header file to deal with the issue? 20140628 01:43:04< shadowm> No matter how clever the sed command you used is, this is still an issue that: 1) probably should be reported upstream unless it's explicitly stated somewhere that it's intentional; and 2) can be dealt with without introducing extra noise in every translation unit that requires the file by adding a wrapper header of our own. 20140628 01:44:43< shadowm> (2) has the bonus of keeping the include guard consistent, which your approach definitely doesn't ensure will remain the case for whoever else needs Boost.Function. 20140628 01:44:50< Aishiko_laptop> shadowm, does the header file I added cause that issue? 20140628 01:45:20< shadowm> Aishiko_laptop: You mean my message for iceiceice? No, it's a commit on master. 20140628 01:46:11< Aishiko_laptop> yes and I meant as general practice that adding files is generally not a good idea 20140628 01:46:46< shadowm> Adding files isn't a bad thing to do if it's done right. 20140628 01:47:32< Aishiko_laptop> ahh, and so I guess I wonder now if I did it right, as far as I can see there isn't anything that would be translated 20140628 01:48:09< shadowm> Translation unit above refers to the file passed to the compiler in the command line, almost always a .cpp file. 20140628 01:48:15< shadowm> Your src/spritesheet.hpp has working include guards (the #ifndef/#define/#endif triad), so it's good. 20140628 01:49:20< shadowm> (Re terminology, see also: http://en.wikipedia.org/wiki/Translation_unit_%28programming%29 ) 20140628 01:50:09< Aishiko_laptop> compiler inter workings are a mystery to me I just followed what portrait.hpp had in it, thinking if thats what mordante told me he wanted things to work right I should follow the example given 20140628 01:50:24< shadowm> Here I'm being a bit more flexible with the term and considering the preprocessor's input instead of its output. 20140628 01:51:10< Aishiko_laptop> but garbage in garbage out right? 20140628 01:51:49< shadowm> Well, there's no garbage involved in this as far as I can see, just a bit of a protocol issue. 20140628 01:56:43< irker169> wesnoth: Ignacio R. Morelle wesnoth:master fc834885e29f / projectfiles/CodeBlocks/wesnoth.cbp: Resort CodeBlocks project file http://git.io/EzvxmQ 20140628 01:59:38< irker169> wesnoth: Ignacio R. Morelle wesnoth:master fc1afefccb33 / src/CMakeLists.txt: Resort wesnoth-main_SRC in CMakeLists.txt http://git.io/w02LEw 20140628 02:04:18< irker169> wesnoth: Ignacio R. Morelle wesnoth:1.12 fb1a718f2d9b / changelog src/display.cpp: Apply local ToD lighting to hex overlays when applicable (bug #22215) http://git.io/fe6P1Q 20140628 02:04:21< irker169> wesnoth: Ignacio R. Morelle wesnoth:1.12 75a575c2ea01 / data/scenario-test.cfg: Add a test case for bug #22215 http://git.io/7QYcNg 20140628 02:25:00-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 264 seconds] 20140628 02:26:19< shadowm> iceiceice: Those copyright notices at the top of the source files? Don't forget to copy them when splitting files. 20140628 02:30:50< irker169> wesnoth: Ignacio R. Morelle wesnoth:master 0050fdda6501 / src/notifications/ (notifications.cpp notifications.hpp): Readd copyright notices http://git.io/6mdkAw 20140628 02:30:53< irker169> wesnoth: Ignacio R. Morelle wesnoth:master fc13d09019cd / src/notifications/notifications.cpp: notifications.cpp uses _(), include gettext.hpp http://git.io/JpObUA 20140628 02:30:56< irker169> wesnoth: Ignacio R. Morelle wesnoth:master 559e03c0712e / src/notifications/notifications.hpp: Add missing include guards http://git.io/WPHSbg 20140628 02:34:03< Turuk> wesbot: seen fabi 20140628 02:34:04< wesbot> Turuk: The person with the nick fabi last spoke 17d 11h ago. 17d ago was here and on the channels #wesnoth, #wesnoth-de and #wesnoth-umc-dev with the message: Ping timeout: 240 seconds 20140628 02:37:17-!- ancestral [~ancestral@mobile-166-137-184-094.mycingular.net] has joined #wesnoth-dev 20140628 02:38:44-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140628 02:45:14-!- ancestral [~ancestral@mobile-166-137-184-094.mycingular.net] has quit [Quit: Smell ya later!] 20140628 02:51:28-!- Ivanovic_ [~ivanovic@frnk-4d017dd9.pool.mediaWays.net] has joined #wesnoth-dev 20140628 02:52:34-!- ancestral [~ancestral@mobile-166-137-184-094.mycingular.net] has joined #wesnoth-dev 20140628 02:54:16-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 248 seconds] 20140628 02:55:22-!- Ivanovic_ is now known as Ivanovic 20140628 02:59:30-!- ancestral [~ancestral@mobile-166-137-184-094.mycingular.net] has quit [Quit: Smell ya later!] 20140628 03:04:23-!- kex_ [~kex@93-137-21-186.adsl.net.t-com.hr] has quit [Remote host closed the connection] 20140628 03:15:39-!- sachith500|2 [~kvirc@112.135.153.177] has joined #wesnoth-dev 20140628 03:17:30-!- happygrue [~Wintermut@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140628 03:18:16-!- sachith500 [~kvirc@112.134.200.136] has quit [Ping timeout: 248 seconds] 20140628 03:37:34-!- gfgtdf [~chatzilla@e179210008.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.90.1 [Firefox 30.0/20140605174243]] 20140628 03:58:06-!- sachith500 [~kvirc@112.134.106.233] has joined #wesnoth-dev 20140628 03:59:52-!- sachith500|2 [~kvirc@112.135.153.177] has quit [Ping timeout: 248 seconds] 20140628 04:01:12-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140628 04:06:48-!- Ivanovic [~ivanovic@frnk-4d017dd9.pool.mediaWays.net] has quit [Changing host] 20140628 04:06:48-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140628 04:08:18-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140628 04:08:18-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Changing host] 20140628 04:08:18-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140628 04:08:30< iceiceice> shadowm: i just didnt think of doing it htat way, 20140628 04:08:43< iceiceice> you're right its much better if the guards are just in one file 20140628 04:17:44< irker169> wesnoth: Chris Beck wesnoth:master 089f9e923990 / src/unit_formula_manager.cpp: add copyright notice http://git.io/xjwwAQ 20140628 04:20:16< iceiceice> hmm i was just looking at other files that lack copyright notices, 20140628 04:20:26< iceiceice> carryover.hpp, 20140628 04:21:05< iceiceice> config.h, 20140628 04:21:12< iceiceice> language_win32.ii, 20140628 04:21:24< iceiceice> but also md5.?pp ? 20140628 04:21:58< iceiceice> md5.hpp states that it is not Gnu GPL 2, rather it is "all rights reserved to RSA Data Security, inc." 20140628 04:23:09< shadowm> What config.h? 20140628 04:23:40< shadowm> Oh, _that_ automatically-generated config.h that's not part of the source code distribution. 20140628 04:25:03< iceiceice> idk i guess the .h and .ii ones are small and dont really matter 20140628 04:25:17< iceiceice> is the md5 thing actually kosher though? 20140628 04:25:58< shadowm> Seems harmless to me. Now if you have a lawyer in your attic... 20140628 04:27:05< shadowm> As I said above, the config.h file is not part of the distribution and it's in fact automatically-generated by the build toolchain, so it's completely irrelevant. 20140628 04:27:56< iceiceice> i guess if its just a library function who cares :) 20140628 04:29:37< iceiceice> the play_turn_network_adapter probably needs some copyights though 20140628 04:32:30-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection] 20140628 04:33:15-!- sachith500 [~kvirc@112.134.106.233] has quit [Read error: Connection reset by peer] 20140628 04:42:40-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has joined #wesnoth-dev 20140628 04:44:12< Coffee_irc> lol 20140628 04:44:40< Coffee_irc> trying to debug this whiteboard error and most of the git commits I've loaded from segfault or don't compile :P 20140628 04:45:42< shadowm> All I know is that Wesnoth compiles and runs for me. 20140628 04:45:53< Coffee_irc> I am trying to bisect 20140628 04:46:06< shadowm> Ah. 20140628 04:46:22< Coffee_irc> and all the early 1.11.x commits relating to the whiteboard changes crash :P 20140628 04:46:31< iceiceice> ruh roh 20140628 04:46:44< iceiceice> i didnt try to bisect further back than Jan 1 2014 20140628 04:46:55< Coffee_irc> Aishiko_laptop: future debugging is the reason why all the commits should compile 20140628 04:47:27< iceiceice> Coffee_irc: did you try another compiler? 20140628 04:47:37< iceiceice> i think if you go far enouhg back the scons script doesnt realyl work right with clang 20140628 04:47:44< iceiceice> but idk if that affects anything in 1.11.x 20140628 04:47:47< Coffee_irc> I am using scons 20140628 04:47:52< iceiceice> i cant remember at what point i observed that 20140628 04:48:07< iceiceice> if it doesnt work with clang you might want to try gcc though 20140628 04:49:05< shadowm> Does anyone here use Windows 8 (or 8.1, same crap AFAIAC)? 20140628 04:49:11< Coffee_irc> I'm trying the early 1.11.0 releases (where the changes to the whiteboard actions look to have occurred) 20140628 04:49:28< Coffee_irc> but I'll try to skip a bit further ahead in the cycle 20140628 04:49:51< Coffee_irc> shadowm: I don't think anyone will own up to that :P 20140628 04:50:01< Coffee_irc> what do you get if you say "yes"? 20140628 04:50:30< shadowm> My condolences. 20140628 04:50:41< Coffee_irc> :) 20140628 04:50:49< shadowm> And the chance to help me with a trivial thing as if I were a Windows noob. 20140628 04:51:02< Coffee_irc> I have a laptop (my sister's actually) that is running windows 8 20140628 04:51:44< shadowm> I have a single keyboard layout configured and Windows keeps switching me to US. 20140628 04:52:08< shadowm> In previous versions this could be avoided by just deleting all alternative keyboard layouts, but somehow I seem unable to do this nowadays. 20140628 04:52:17< Coffee_irc> there are 2 places to change that :) 20140628 04:52:32-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 260 seconds] 20140628 04:52:39< Coffee_irc> one for formating, one for the keyboard language 20140628 04:53:10< Coffee_irc> I think you might have to change both 20140628 04:53:14-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has joined #wesnoth-dev 20140628 04:53:37< Coffee_irc> one of the settings is where you go to change the currency, date, and location 20140628 04:53:53< Coffee_irc> and the other is the keyboard layout, where you can get an icon in your system tray 20140628 04:54:04< shadowm> Well, right now it looks like this: https://dl.dropboxusercontent.com/u/21371130/screenshots/win81-kbd-settings.png 20140628 04:55:32< shadowm> So I'm not sure how to make it not switch me to the US layout at random. 20140628 04:55:34< Coffee_irc> sort of unrelated, but if you click the up arrow and customize you can eliminate that flag icon for notifications 20140628 04:55:46< Coffee_irc> and expand to show more icons at once in the system tray 20140628 04:55:59< Coffee_irc> it should show you the current language settings that way 20140628 04:56:19< shadowm> Huh? 20140628 04:56:23< Coffee_irc> oh, it does in the bottom right already 20140628 04:56:26< Coffee_irc> nevermind 20140628 04:56:41< shadowm> Yes, and I want to keep it this way until I can convince Windows that I own a single keyboard with a single layout. 20140628 04:57:15< Coffee_irc> so, what language and layout are you looking for? 20140628 04:57:31-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has quit [Ping timeout: 240 seconds] 20140628 04:57:39< shadowm> Latin American layout, English language. 20140628 04:57:46-!- happygrue [~Wintermut@wesnoth/developer/wintermute] has quit [Remote host closed the connection] 20140628 04:58:06< Coffee_irc> ok, I am starting up the win8 computer :) 20140628 04:58:18< shadowm> https://dl.dropboxusercontent.com/u/21371130/screenshots/win81-kbd-settings-2.png <- It doesn't seem here like I am supposed to be able to configure the laternative layouts. 20140628 04:59:35< shadowm> In the ridiculous fullscreen Modern UI version of these options there's just a single Latin American (QWERTY) keyboard listed. 20140628 05:00:03< shadowm> So I'm not sure why it insists on these delusional alternatives. 20140628 05:00:31< Coffee_irc> I don't see Latin American in the English language choices 20140628 05:00:53< shadowm> Probably because you need to add the input method first. 20140628 05:00:55< Coffee_irc> but I can try English (New Zealand) to test 20140628 05:01:52< shadowm> Alternatively you are using a narrow-minded version of Windows which doesn't acknowledge the existence of the non-northern 75% of the Americas. 20140628 05:02:27< Coffee_irc> it's got new zealand, jamaica, ireland, etc. but not latin america :P 20140628 05:02:55< shadowm> Though, to be fair, last I heard is that this layout is going the way of the dodo, superseded by the Spanish layout. 20140628 05:03:33< Coffee_irc> ok, I found the Latin American input 20140628 05:05:03< shadowm> But we weren't checking whether you could add it or not, we wanted to know if there was a way to convince it to stick to a single layout instead of providing me alternatives I didn't ask for (and randomly switching me to them). 20140628 05:05:51< Coffee_irc> it is not there 20140628 05:06:56< shadowm> Hm, the shortcut to switch layouts is Win+Space, but it's pretty much impossible for me to type that without noticing. 20140628 05:06:57< Coffee_irc> have you had a look at "advanced settings" in the language screen? 20140628 05:07:22< Coffee_irc> it looks like you can set different inputs and languages for the welcome screen and apps 20140628 05:07:37< shadowm> Eh. 20140628 05:07:50< shadowm> Apparently left Alt + Shift does the same thing by default. 20140628 05:08:23< shadowm> Weird, it only switches between LatAm and Spanish. 20140628 05:08:51< shadowm> Oh, because that switches the *language*. Ctrl+Shift switches the *layout*. 20140628 05:08:51< Coffee_irc> the advanced settings on the left says for me it can override the default for language and input separately 20140628 05:08:53< shadowm> So Ctrl+ 20140628 05:09:05< shadowm> So Ctrl+Shift is what I've been pressing all this time. 20140628 05:09:34< Coffee_irc> and it has a blue text you can click on to override for the welcome screen, new users, and system accounts 20140628 05:10:00< shadowm> Thanks Coffee_irc, I've just removed those pesky keyboard shortcuts. 20140628 05:10:16< Coffee_irc> :) 20140628 05:10:24< Coffee_irc> how come you're using win 8 btw? 20140628 05:10:33< shadowm> The input language for the welcome screen was already set to English (US) - Latin American. 20140628 05:10:54< shadowm> Coffee_irc: A necessary sacrifice for the sake of our Windows users. 20140628 05:11:15< Coffee_irc> better you than me ;) 20140628 05:11:16< shadowm> So I get to run Windows on a VM and occasionally produce some code from there. 20140628 05:12:14< shadowm> Right now I was researching the feasibility of having Wesnoth allocate its own console so stderr messages can go to a console instead of stderr.txt when a console is available. Sadly, I seem to be hitting some iostream issues as a side-effect. 20140628 05:12:49< shadowm> Er, *attach to its parent's console 20140628 05:13:30< shadowm> You know, because the SDL people had this amazingly stupid idea of forcing stdout/stderr redirection on Windows, at least with SDL 1.2.x. 20140628 05:13:58< Coffee_irc> maybe this will be fixed in SDL 2 20140628 05:14:00< shadowm> It could be a runtime option but noo, just let people recompile the SDLmain blob. 20140628 05:16:19< Coffee_irc> I remember codeblocks 20140628 05:16:35< Coffee_irc> that's a fun application 20140628 05:16:41< Coffee_irc> haven't used it in years though 20140628 05:17:31< Coffee_irc> much simpler than eclipse, which I stupidly moved to for C/C++ programming later 20140628 05:17:50< shadowm> It feels very clunky to me, even compared to kdevelop. But the alternative (downloading MSVC++ and the Windows SDK, researching and compiling a bunch of crap all on my own) isn't very enticing either. 20140628 05:18:44< shadowm> Of course, this choice will come back to bite me in the ass as soon as somebody decides to change our dependencies again. 20140628 05:19:30< Coffee_irc> codeblocks is nice and simple 20140628 05:19:46< Coffee_irc> I'm using geany at the moment to do programming for wesnoth 20140628 05:20:50< Coffee_irc> it runs on windows and linux 20140628 05:21:13< Coffee_irc> I tried to use it for work because it is "cross-platform" only to find it doesnt work on mac :P 20140628 05:28:24-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20140628 06:00:07-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140628 06:31:48-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140628 06:35:06-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 255 seconds] 20140628 06:41:48-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has joined #wesnoth-dev 20140628 06:42:50-!- Guest78475 [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 06:46:17-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has quit [Ping timeout: 240 seconds] 20140628 06:52:54-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140628 06:53:51-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140628 07:05:10-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has joined #wesnoth-dev 20140628 07:09:44-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has quit [Ping timeout: 260 seconds] 20140628 07:17:47-!- irker169 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140628 07:35:45-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has joined #wesnoth-dev 20140628 07:39:35-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving] 20140628 07:42:20-!- sachith500 [~kvirc@112.134.106.233] has joined #wesnoth-dev 20140628 07:47:26-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140628 07:50:31< Coffee_irc> wesbot: seen fabi? 20140628 07:50:31< wesbot> Coffee_irc: The person with the nick fabi last spoke 17d 16h ago. 17d 5h ago was here and on the channels #wesnoth, #wesnoth-de and #wesnoth-umc-dev with the message: Ping timeout: 240 seconds 20140628 08:11:44-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140628 08:22:13-!- irker662 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140628 08:22:13< irker662> wesnoth: Mark de Wever wesnoth:master 34126ca66a96 / src/CMakeLists.txt: Fix compilation with CMake. http://git.io/pHwUsQ 20140628 08:30:41< irker662> wesnoth: David Mikos wesnoth:1.12 89e2047ab5bd / changelog players_changelog src/mouse_events.cpp: Fix bug 22231: movement continuation in whiteboard.\n\nProblem was that the whit http://git.io/6pYKQw 20140628 08:31:39< irker662> wesnoth: David Mikos wesnoth:master 23a3d15b6627 / changelog players_changelog src/mouse_events.cpp: Fix bug 22231: movement continuation in whiteboard.\n\nProblem was that the whit http://git.io/l6Yq4Q 20140628 08:35:15-!- Guest78475 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 255 seconds] 20140628 08:35:42-!- Guest78475 [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 08:37:33< Coffee_irc> I believe I solved the problem of the whiteboard for the 1.12 branch holding back the release of 1.11.16 20140628 08:37:42< Coffee_irc> anyone willing to test? 20140628 08:38:55 * shadowm hits Coffee_irc with the squeaky hammer. 20140628 08:39:13< shadowm> 1) Use a text editor; 2) Check your commit messages before pushing. 20140628 08:39:27< Coffee_irc> doh :P 20140628 08:39:41< Coffee_irc> but you said it would work I remember with \n :P 20140628 08:39:47< Coffee_irc> it don't 20140628 08:39:53< shadowm> You probably used straight quotes. 20140628 08:40:08< shadowm> Or you aren't even using a Unixish shell. 20140628 08:40:19< Coffee_irc> I am using gnome-terminal 20140628 08:40:28< Coffee_irc> on ubuntu 20140628 08:40:32< shadowm> That's not the shell, that's the terminal emulator. 20140628 08:40:49< Coffee_irc> shadowm: I don't care :P 20140628 08:40:58< shadowm> The shell runs as a child process of the terminal emulator. 20140628 08:40:59< Coffee_irc> what do I need to do to get it to work right? 20140628 08:41:15< shadowm> You could even run something other than a shell in the terminal emulator, that's why the difference matters. 20140628 08:41:29< shadowm> Which shell are you using and what command line did you use? 20140628 08:42:03< Coffee_irc> shadowm: http://pastebin.com/Y8jgRq2H 20140628 08:42:23< shadowm> Well, silly me, if you said "gnome-terminal" then it's very unlikely your shell is anything other than the default Ubuntu user shell, bah. 20140628 08:42:29< shadowm> I mean bash. 20140628 08:42:35< Coffee_irc> yeah 20140628 08:43:42< shadowm> OK, seems I was spouting bullshit re quote expansion. 20140628 08:43:56< shadowm> So okay, that won't work. Let git use a text editor. 20140628 08:45:03< Coffee_irc> I can try with multiple -m commands? 20140628 08:45:07< shadowm> That gives you a chance to look at both the commit message and the list of changed files before saving the commit message (though using git diff before doing that really helps in catching mistakes). 20140628 08:45:13< shadowm> Yes but use a text editor instead. 20140628 08:45:59< Coffee_irc> looks like it works 20140628 08:46:10< shadowm> -m is evil. 20140628 08:46:14< Coffee_irc> I'll now reset to HEAD so my dummy commit doesn't go through 20140628 08:46:28< shadowm> You mean reset to the parent of HEAD (`HEAD^`). 20140628 08:46:59< Coffee_irc> shadowm: you are right 20140628 08:47:01 * shadowm (seriously what's so hard about using a *text editor*) 20140628 08:47:28< Coffee_irc> shadowm: ... ... ... (I don't know how to do it) 20140628 08:47:45< Coffee_irc> don't whack me again with the squeaky hammer 20140628 08:47:50< Coffee_irc> :P 20140628 08:48:02< shadowm> What does git commit usually do without a message there? 20140628 08:48:13< Coffee_irc> I have no idea 20140628 08:48:33< shadowm> You haven't even tried? 20140628 08:48:38< Coffee_irc> er, no 20140628 08:49:02< Coffee_irc> ooh 20140628 08:49:17< Coffee_irc> it asks for it to be written with the nano text editor 20140628 08:50:16< shadowm> That can be changed if you prefer some other editor. 20140628 08:50:27< Coffee_irc> no, nano is good 20140628 08:50:37< Coffee_irc> I can do this from now on 20140628 08:51:11< shadowm> e.g. `git config --global core.editor vim` 20140628 08:51:29< Coffee_irc> shadowm: I'm fine with nano 20140628 08:51:39< Coffee_irc> I like to keep it simple 20140628 08:52:01< Coffee_irc> vim has plenty of tricks to it I can't be bothered to remember 20140628 08:52:03< shadowm> Instead of vim it could be gedit or whatever gnome uses. 20140628 08:52:40< shadowm> Meaning that yes, a GUI editor would work the same as long as its process quits only once the commit message has been entered. 20140628 08:53:09< Coffee_irc> shadowm: nano is a text editor I can use just fine 20140628 08:53:47-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140628 08:55:35< shadowm> Example of a commit message that would just be insanely cumbersome to do via -m: https://github.com/wesnoth/wesnoth/commit/913333e3ef895b4c9febdd04008c4ca458d2a44f 20140628 08:55:35< Coffee_irc> eh hrrm, anyway... 20140628 08:55:45< Coffee_irc> the bug with the whiteboard should be fixed 20140628 08:56:25 * shadowm proceeds to disappear again now that the world is once again safe from evil for a while. 20140628 08:57:09< shadowm> Don't forget to post to the ML. About the bug being fixed, not your newly acquired powers. 20140628 08:57:45< Coffee_irc> :) 20140628 08:58:34< shadowm> Assuming that was all that need fixing. 20140628 09:04:04< Coffee_irc> somehow the same fix on master makes the planned unit go invisible 20140628 09:04:43< Coffee_irc> otherwise it fills me with confidence that it all works and wesnoth 1.12.0 will be the most well tested version in wesnoth history 20140628 09:05:34< shadowm> "1.12.1" 20140628 09:05:47< Coffee_irc> we aren't skipping 1.12.0 now are we? 20140628 09:05:50< shadowm> Is there something speaking against investigating those bugs right now? 20140628 09:06:02< shadowm> Because the next version is 1.11.16 and not 1.12.0. 20140628 09:06:27< Coffee_irc> well, when we finally do get to releasing 1.12.0 20140628 09:06:38< shadowm> Unless that was alluding to the chronic undertested development release syndrome. 20140628 09:06:39< Coffee_irc> it will have to be the most thoroughly tested version we release 20140628 09:07:42< Coffee_irc> somehow I believe the standard has gone up for releases lately 20140628 09:09:01< Coffee_irc> I've been mentioning the 1.8.0 release, because I remember what a shambles that was with the new lobby and random errors popping up causing disconnects in nearly all mp games 20140628 09:10:34-!- Guest78475 is now known as cib2 20140628 09:12:47< Ivanovic> Coffee_irc: the main problem with the new lobby was that before it was only tested with a small number of users 20140628 09:13:01< Ivanovic> not with our usual 100 users joining and parting all the time, creating and completing games 20140628 09:13:13< Coffee_irc> shadowm/Ivanovic: if we fix all the bugs before 1.12.0 then what will we do for 1.12.1? :P 20140628 09:13:28< Ivanovic> Coffee_irc: translation updates 20140628 09:15:31< Coffee_irc> Ivanovic: fair enough 20140628 09:16:45< Coffee_irc> I suppose it makes sense what is happening with the release cycle 20140628 09:17:34< Ivanovic> but i bet that there will be some " but everyone knew that this was broken in every dev release since 1.11.x but no bug was reported you should have known and fixed this, that is why nobody played the dev series!!!" issue left... 20140628 09:18:00< Coffee_irc> Ivanovic: inevitably 20140628 09:18:17< Coffee_irc> I can actually think up many an issue that remains now ;) 20140628 09:18:36< Coffee_irc> but they were present on previous wesnoth versions also 20140628 09:18:36< Ivanovic> issues that are not reported in the bug tracker? 20140628 09:18:59< Ivanovic> btw in the past we had releases where the bug count was below 100 20140628 09:19:07< Coffee_irc> Ivanovic: just some odd things I've come across that are hard to put in the tracker 20140628 09:19:17< Ivanovic> (okay, these days some of the bugs reported are significantly less severe than what was reported in the past) 20140628 09:21:15< Coffee_irc> I'd be interested to see if some of the network issues regarding disconnects have been fixed 20140628 09:22:01< Coffee_irc> I think that some serious progress has been made on this front and might cause more people to stay with wesnoth MP for longer 20140628 09:26:03< Ivanovic> Coffee_irc: btw if you really managed to fix the main whiteboard issues: did you write a note for the RELEASE_NOTES? 20140628 09:26:05< Ivanovic> ;) 20140628 09:26:34< Coffee_irc> Ivanovic: I wrote a changelog and players_changelog entry 20140628 09:29:21< Coffee_irc> I can write a release note I suppose 20140628 09:31:04-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 248 seconds] 20140628 09:31:26-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 09:32:10< irker662> wesnoth: David Mikos wesnoth:1.12 e4d22b58d8a7 / RELEASE_NOTES: Add bug fix note for whiteboard unit continuation to release notes. http://git.io/cYEPOg 20140628 09:32:24< Coffee_irc> I even used nano text editor ;) 20140628 09:33:17< Coffee_irc> I marked the bug as fixed because on master before my bug fix the planning mode units go invisible on movement... 20140628 09:33:25< Coffee_irc> another bug to fix for someone else ;) 20140628 09:34:22< Coffee_irc> the 1.12 branch looks all good to me 20140628 09:38:06-!- mordante [~mordante@wesnoth/developer/mordante] has joined #wesnoth-dev 20140628 09:38:22< mordante> servus 20140628 09:38:30< Coffee_irc> hi mordante 20140628 09:38:38< mordante> hi Coffee_irc 20140628 09:41:15< Coffee_irc> I wonder if the first non-group stage match has been played in the world cup? 20140628 09:42:17< Coffee_irc> looks like it is brazil vs chile 20140628 09:51:59< mordante> lipkab the SDL_gpu branch doesn't compile, did you maybe forgot to commit a local CMakeLists.txt? 20140628 09:53:19< mordante> iceiceice yes header breakage is annoying, it can always happen with standard headers, but when a file has a lot of conditional code it would be nice if the conditions are tested 20140628 09:53:48< mordante> Coffee_irc, I'm not looking at the whiteboard bugs 20140628 09:54:11< mordante> Coffee_irc, but I'm somewhat surprised its state got worse 20140628 09:54:26< Coffee_irc> mordante: I recently fixed the main bug holding back the 1.11.16 release 20140628 09:54:41< Coffee_irc> a couple of minutes before you came online :) 20140628 09:55:05< mordante> nice :-) 20140628 09:55:13< mordante> does that mean it can stay in 1.12? 20140628 09:55:20< Coffee_irc> well... 20140628 09:55:30< Coffee_irc> it still has other bugs, but would keep it 20140628 09:55:36< Coffee_irc> *I would keep it 20140628 09:55:51< mordante> :-) 20140628 09:57:09< mordante> Aishiko_laptop, around? 20140628 10:00:38-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140628 10:04:12-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev 20140628 10:05:09< lipkab> Hi mordante. 20140628 10:05:28< lipkab> I'm checking CMake. 20140628 10:06:08-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 260 seconds] 20140628 10:06:41< mordante> hi lipkab 20140628 10:07:13< mordante> I'm somewhat afk, preparing some food 20140628 10:07:22< lipkab> Yeah, CMakeLists.txt from SDL_gpu has gone missing :/ 20140628 10:07:22< lipkab> Are we gitignoring *.txt? 20140628 10:07:38< lipkab> Ok. 20140628 10:08:05< mordante> we're ignoring CMakeLists.txt … 20140628 10:08:27< lipkab> Meh. This is stupid. 20140628 10:08:42 * mordante agrees 20140628 10:09:02-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 10:09:46< lipkab> @anyone: What sense does *.txt make in .gitignore? 20140628 10:15:58< irker662> wesnoth: Boldizsár Lipka wesnoth:SDL_gpu d60b9c6069e5 / .gitignore: Don't ignore CMakeLists.txt. http://git.io/rs49eQ 20140628 10:15:59< irker662> wesnoth: Boldizsár Lipka wesnoth:SDL_gpu 3238000cd202 / src/SDL_gpu/ (CMakeLists.txt SDL_gpu/CMakeLists.txt): Commit missing CMakeLists for SDL_gpu. http://git.io/FVRnow 20140628 10:16:14< lipkab> mordante: ^ Should be good now. 20140628 10:18:24-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 264 seconds] 20140628 10:18:49-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 10:19:30< mordante> thanks, compiles and links properly now 20140628 10:19:42-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Client Quit] 20140628 10:19:58-!- cib_ [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 10:20:31< irker662> wesnoth: Boldizsár Lipka wesnoth:master f46eaebad422 / .gitignore: Don't ignore CMakeLists. http://git.io/rpl7eg 20140628 10:30:20-!- Duthlet [~Duthlet@wesnoth/mp-mod/Duthlet] has joined #wesnoth-dev 20140628 10:35:12-!- cib_ [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 245 seconds] 20140628 10:51:34-!- travis-ci [~travis-ci@ec2-54-237-154-76.compute-1.amazonaws.com] has joined #wesnoth-dev 20140628 10:51:34< travis-ci> [travis-ci] wesnoth/wesnoth#3494 (SDL_gpu - 3238000 : Boldizsár Lipka): The build is still failing. 20140628 10:51:34< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/28654210 20140628 10:51:34-!- travis-ci [~travis-ci@ec2-54-237-154-76.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140628 10:56:05-!- prkc [~prkc@54028627.dsl.pool.telekom.hu] has joined #wesnoth-dev 20140628 11:01:40-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 260 seconds] 20140628 11:02:30-!- mjs-de [~mjs-de@f048195255.adsl.alicedsl.de] has joined #wesnoth-dev 20140628 11:11:42-!- DCW1 [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has joined #wesnoth-dev 20140628 11:14:20< vultraz> RiftWalker: are you making [multiplayer] the default toplevel? 20140628 11:22:18-!- cib_ [~cib@132.231.178.10] has joined #wesnoth-dev 20140628 11:29:35< thunderstruck> Are there any MapGeneratorWML examples on wiki? 20140628 11:36:52-!- OnkV [~quassel@178.115.128.75.wireless.dyn.drei.com] has joined #wesnoth-dev 20140628 11:39:07-!- OnkV is now known as Haudegen 20140628 11:53:26< mordante> lipkab, how do you feel about SDL_gpu? 20140628 11:55:11< lipkab> mordante: The arithmetics it uses is pretty weird, but otherwise it worked very well. 20140628 11:55:45< lipkab> The documentation could definitely benefit from some improvement, but I can get away with the demos. 20140628 11:57:35< lipkab> So far the biggest problem is that it doesn't mix well with software rendering. 20140628 11:58:39< lipkab> When SDL_gpu is enabled software-rendering simply stops working. 20140628 11:59:25< lipkab> It was the same with SDL2's accelerated renderer, so I tend to believe that this can't be helped. 20140628 12:01:31< mordante> weird in what way? 20140628 12:01:40< mordante> Agreed on the documentation 20140628 12:02:03< mordante> also agreed with the software rendering issue, I also believe SDL_gpu inherits it from SDL 20140628 12:03:11< mordante> I also would have preferred it if the author used more smaller files 20140628 12:03:58< lipkab> Well, for example, when blitting, you have to specify the center position of the image, rather than the conventional topleft corner. 20140628 12:04:30< lipkab> When drawing rectangles, two opposite corners instead of topleft and dimensions. 20140628 12:05:45< lipkab> Not a big issue, it can be hidden by a layer over SDL_gpu. 20140628 12:05:54< lipkab> ...which I think we would add anyways. 20140628 12:05:55< mordante> the first is indeed very odd, the rectangle not too uncommon 20140628 12:06:22< mordante> yes since it's C I prefer at least a small RAII wrapper 20140628 12:06:48< mordante> for SDL2 I wanted to add a larger wrapper 20140628 12:07:06< mordante> but there I expected the API to be stable, not sure how stable this API is 20140628 12:07:23< mordante> since 0.8.0 seems to be the first public release, I expect it not to be stable at all 20140628 12:07:37< mordante> so a small RAII wrapper sounds more sensible to me 20140628 12:09:01< lipkab> Yeah, it's not stable, the author mentioned at least one compat-breaking change recently on the SDL forums. 20140628 12:10:01< lipkab> But since it's basically a thin wrapper over OpenGL I doubt there would be any changes that seriously affects functionality. 20140628 12:10:28< mordante> I also don't fear that too much 20140628 12:11:13< mordante> I just prefer a small RAII-wrapper around an API-unstable C library 20140628 12:11:28< lipkab> Ok. 20140628 12:11:42< mordante> what are your preferences? 20140628 12:12:14< lipkab> The same :) 20140628 12:12:21< mordante> :-) 20140628 12:15:02< lipkab> Can I start composing the mail for the list? 20140628 12:16:53< mordante> I first like to see how it runs, my compiler is still busy :-( 20140628 12:17:12< lipkab> Ah, ok. 20140628 12:18:27< vultraz> I thought we were moving to hardware/GPU rendering? 20140628 12:18:57< mordante> yes 20140628 12:20:42-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140628 12:23:11< vultraz> So how is a lack of software rendering an issue? 20140628 12:23:11< mordante> lipkab, the fonts still look bad, is that correct? 20140628 12:23:49< lipkab> Hmm, not here. 20140628 12:24:14< lipkab> I have perfectly good-looking fonts. 20140628 12:25:33< mordante> hmm odd 20140628 12:25:50< mordante> are you using SDL_gpu with SDL1.2 or SDL2.0? 20140628 12:25:58< lipkab> vultraz: The transition is the problem. 20140628 12:26:07< lipkab> mordante: 1.2 20140628 12:27:10< lipkab> mordante: Only the 1.2 code is ported, so if you compiled with SDL2 support, then you're looking at the SDL2 mess ;) 20140628 12:27:34< lipkab> Sorry I should have mentioned that. 20140628 12:28:02< mordante> lipkab, ah ok 20140628 12:28:44< mordante> 1.2 looks good 20140628 12:28:59< mordante> at least in the loadscreen ;-) 20140628 12:29:35< mordante> and 1.2 uses OGL accelerated code 20140628 12:31:02< mordante> how do you propose to move ahead, assuming we start using SDL_gpu? 20140628 12:31:10-!- mjs-de [~mjs-de@f048195255.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140628 12:32:35< lipkab> Well, firstly port the existing SDL2 code to SDL_gpu. That should be straightforward. 20140628 12:33:42< lipkab> Then perhaps I should concentrate on the GUI before display & map_display, so that I can see something after the load screen. 20140628 12:34:39< lipkab> ...although since it's possible to boot directly into a campaign/scenario, it could work the other way as well. 20140628 12:34:49< lipkab> I'm not sure what would be a better approach. 20140628 12:37:58< spoffy> quit 20140628 12:38:00-!- spoffy [~spoffy@host-80-47-182-115.as13285.net] has quit [Quit: leaving] 20140628 12:38:14< lipkab> I'm also not quite sure whether to ditch SDL2 entirely, or go with SDL2 + SDL_gpu. 20140628 12:39:38< mordante> since SDL2 has better support for iOS and Android I think moving to SDL2 still has these advantages 20140628 12:40:06< mordante> not sure whether SDL_gpu with SDL1.2 also has these advantages 20140628 12:40:25< mordante> but maybe the transition should be SDL1.2 -> SDL_gpu -> SDL2.0 20140628 12:42:41-!- gfgtdf [~chatzilla@e179210008.adsl.alicedsl.de] has joined #wesnoth-dev 20140628 12:43:22< mordante> do you have an idea how much work it will be to do the conversion? 20140628 12:43:52< mordante> and would it be possible/easy to add SDL_gpu conditionally, just like SDL2.0? 20140628 12:45:23< lipkab> SDL_gpu has a very similar interface to SDL2, so converting existing SDL2 code is very easy. 20140628 12:46:16< lipkab> Conditional compiling is of course possible, we just need to tweak the CMake recipe a bit. 20140628 12:50:55< mordante> of course, just like to know whether we get an ifdef every other line ;-) 20140628 12:51:44< lipkab> Can't be worse than with SDL2 :) 20140628 12:51:54< mordante> ok good 20140628 12:52:32< lipkab> Whew, we'll now have three-way ifdefs for SDL, SDL_gpu and SDL2? 20140628 12:53:31< mordante> I expect the once for SDL2 that remain are regarding event handling 20140628 12:53:50< mordante> ones* 20140628 12:54:12< lipkab> Yeah, true. 20140628 12:54:17< mordante> I'm not sure whether I want to do SDL_gpu conditionally or not, just investigating 20140628 12:55:53< mordante> what would you prefer SDL_gpu conditionally or not conditionally and how would it break master during the transition? 20140628 12:56:27< mordante> my goal for the SDL2 ifdef was to keep them until the transition was done and then remove them all 20140628 12:56:49< lipkab> SDL_gpu unconditionally would turn the game into a nice black screen for a few weeks for sure. 20140628 12:56:50< mordante> that way I could develop in master, without making master completely broken 20140628 12:57:08< lipkab> I don't think that's a viable option. 20140628 12:57:27< mordante> the advantage of that is that people can nicely work on 1.12 :-P 20140628 12:57:40< mordante> which option is not viable? 20140628 12:57:42< lipkab> True! Let's do thiS! :D 20140628 12:59:00< lipkab> mordante: Unconditional SDL_gpu. 20140628 13:00:59< mordante> ok 20140628 13:01:02-!- cib_ [~cib@132.231.178.10] has quit [Ping timeout: 245 seconds] 20140628 13:01:13< mordante> so would you prefer #ifdefs or a separate branch? 20140628 13:02:37< lipkab> A separate branch would be more convenient, but running a branch for several months would result in an awful lot of conflicts, I fear. 20140628 13:04:09< mordante> yeah that's why I did SDL2 in master 20140628 13:06:06< lipkab> Well, we could made it with ifdefs with SDL2, we can do it with SDL_gpu, too. 20140628 13:06:07< mordante> maybe at least work in a branch until we decided whether or not to use SDL_gpu and then decide what you prefer 20140628 13:06:18< lipkab> Alright. 20140628 13:06:24-!- Haudegen [~quassel@178.115.128.75.wireless.dyn.drei.com] has quit [Ping timeout: 264 seconds] 20140628 13:06:34< mordante> you can also use the #ifdefs in the branch 20140628 13:06:51< mordante> I just don't want it in master until it's greenlighted on the dev-ml 20140628 13:07:07< mordante> so feel free to write an e-mail 20140628 13:07:37< lipkab> Okay, writing it. 20140628 13:07:57< mordante> please make sure you explain the motivation why SDL_gpu is needed and the shortcomings of SDL2.0 20140628 13:08:43< lipkab> Sure. 20140628 13:11:00-!- OnkV [~quassel@178.115.128.75.wireless.dyn.drei.com] has joined #wesnoth-dev 20140628 13:11:06< mordante> btw I needed this patch http://paste.debian.net/107161/ to fix compilation 20140628 13:12:07-!- OnkV is now known as Haudegen 20140628 13:17:02< lipkab> Oh, thanks. I'll apply it (if you don't). 20140628 13:17:22< mordante> feel free to commit it 20140628 13:20:35-!- irker662 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140628 13:21:19-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev 20140628 13:24:22-!- mordante [~mordante@wesnoth/developer/mordante] has quit [Ping timeout: 245 seconds] 20140628 13:28:45-!- wesbot changed the topic of #wesnoth-dev to: string+feature freeze active on 1.12 | 238 bugs, 345 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 20140628 13:38:12-!- Haudegen [~quassel@178.115.128.75.wireless.dyn.drei.com] has quit [Ping timeout: 264 seconds] 20140628 13:47:32-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has joined #wesnoth-dev 20140628 13:51:57< gfgtdf> is there a way to disable unused parameter warning for a special function ? 20140628 13:53:21-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Ping timeout: 252 seconds] 20140628 13:59:09-!- sachith500|2 [~kvirc@112.135.140.80] has joined #wesnoth-dev 20140628 14:02:09-!- sachith500 [~kvirc@112.134.106.233] has quit [Ping timeout: 252 seconds] 20140628 14:04:55-!- cib_ [~cib@132.231.178.76] has joined #wesnoth-dev 20140628 14:08:25-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev 20140628 14:10:15-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20140628 14:14:40-!- DCW1 [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has quit [Remote host closed the connection] 20140628 14:25:16-!- scimitar [~krishna@117.200.96.162] has joined #wesnoth-dev 20140628 14:29:39-!- scimitar [~krishna@117.200.96.162] has quit [Ping timeout: 252 seconds] 20140628 14:31:01-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140628 14:42:30-!- scimitar [~krishna@117.221.43.193] has joined #wesnoth-dev 20140628 14:55:18-!- scimitar [~krishna@117.221.43.193] has quit [Ping timeout: 240 seconds] 20140628 14:57:03-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140628 15:01:28-!- OnkV [~quassel@178.115.128.75.wireless.dyn.drei.com] has joined #wesnoth-dev 20140628 15:02:01-!- OnkV is now known as haudeen 20140628 15:02:07-!- Necrosporus_ is now known as Necrosporus 20140628 15:02:11-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has quit [Quit: Necrosporus] 20140628 15:02:32-!- haudeen is now known as Haudegen 20140628 15:28:48-!- cib_ [~cib@132.231.178.76] has quit [Ping timeout: 255 seconds] 20140628 15:36:13< zookeeper> durr. i can't reproduce the unknown-unit-type-if-scenario-included-before-unit-type problem with a minimal test case. 20140628 15:37:08-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140628 15:37:51< AI0867> I've just uploaded a new master snapshot to coverity. You may want to take a look at it 20140628 15:38:05< AI0867> iceiceice: one of the new things is about synced_context 20140628 15:42:11-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140628 15:42:23< iceiceice_> AI0867: what's coverity? 20140628 15:46:51< iceiceice_> Coffee_irc: whiteboard fix looks pretty good :) 20140628 15:47:01< iceiceice_> however there's still a bug in that the animations of the ghosted units are messed up 20140628 15:47:24< iceiceice_> any unit with a standing animation does some kind of terrible twitching 20140628 15:47:28< iceiceice_> if it is ghosted 20140628 15:55:14-!- scimitar [~krishna@117.221.43.61] has joined #wesnoth-dev 20140628 15:57:05-!- sachith500|2 [~kvirc@112.135.140.80] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140628 16:03:49-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140628 16:06:20-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140628 16:17:12< iceiceice_> AI0867: I requested access to the coverity thing here: https://scan.coverity.com/projects/1063, let me know if I did it wrong 20140628 16:18:13-!- mordante [~mordante@wesnoth/developer/mordante] has joined #wesnoth-dev 20140628 16:18:27< mordante> servus 20140628 16:19:27< mordante> lipkab, sorry my Internet went down 20140628 16:19:40< mordante> gfgtdf, what kind of special function 20140628 16:19:41< mordante> ? 20140628 16:26:07-!- scimitar [~krishna@117.221.43.61] has quit [Quit: Leaving] 20140628 16:29:13-!- cib [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 16:29:37-!- cib is now known as Guest75834 20140628 16:30:09-!- Kexoth [~kex@93-137-21-186.adsl.net.t-com.hr] has quit [Remote host closed the connection] 20140628 16:40:08< gfgtdf> mordante: i have a function like void do_something(int arg) {#if defined(MARCO1) \n throw ex() \n #else\n do_someting_with_arg(arg)\n #endif \n } 20140628 16:40:16-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140628 16:51:07< mordante> gfgtdf, is it a short function? 20140628 16:52:15< gfgtdf> mordante: do_someting_with_arg is three lines. 20140628 16:52:45< mordante> you can write the function twice including its signature in the #ifdef 20140628 16:53:27< mordante> else a useless statement can also work 20140628 16:56:16< mordante> see desktop_util.cpp:109 20140628 16:57:13-!- Duthlet [~Duthlet@wesnoth/mp-mod/Duthlet] has quit [Quit: leaving] 20140628 16:57:36-!- lord-knyghtmare [~tahsinjah@203.188.163.173] has joined #wesnoth-dev 20140628 16:58:50-!- lord-knyghtmare [~tahsinjah@203.188.163.173] has quit [Quit: lord-knyghtmare] 20140628 16:59:10< gfgtdf> mordante: (void)(path_or_url); is a cast string to void ? 20140628 17:00:40< gfgtdf> i didn't know it spossible to cast something to void :o 20140628 17:01:36-!- molgrum_ [~molgrum@212.85.89.43] has quit [Ping timeout: 264 seconds] 20140628 17:03:41-!- Haudegen [~quassel@178.115.128.75.wireless.dyn.drei.com] has quit [Remote host closed the connection] 20140628 17:04:53< mordante> well it's quite useless, but it is _the_ way to silence this compiler warning 20140628 17:05:42< gfgtdf> ok i did this and it works. 20140628 17:06:08< mordante> please also add the comment 20140628 17:10:50-!- molgrum [~molgrum@212.85.89.43] has joined #wesnoth-dev 20140628 17:11:21< mordante> Aishiko_laptop, around? 20140628 17:13:24-!- Haudegen_ [~quassel@85.124.51.57] has joined #wesnoth-dev 20140628 17:14:22-!- Haudegen [~quassel@178.115.128.75.wireless.dyn.drei.com] has joined #wesnoth-dev 20140628 17:17:27-!- Haudegen [~quassel@178.115.128.75.wireless.dyn.drei.com] has quit [Remote host closed the connection] 20140628 17:17:42-!- Haudegen_ is now known as haudegen 20140628 17:19:07-!- Kexoth [~kex@212.92.210.53] has joined #wesnoth-dev 20140628 17:21:56-!- leyyin [~leyyin@unaffiliated/leyyin] has joined #wesnoth-dev 20140628 17:23:39-!- Guest75834 is now known as cib2 20140628 17:30:32< Aishiko_laptop> mordante, I'm around 20140628 17:41:42-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140628 17:47:36-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has quit [Ping timeout: 248 seconds] 20140628 17:49:35-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 264 seconds] 20140628 17:59:43-!- iceiceice_ [~chris@207-237-132-91.ny.subnet.cable.rcn.com] has joined #wesnoth-dev 20140628 17:59:43-!- iceiceice_ [~chris@207-237-132-91.ny.subnet.cable.rcn.com] has quit [Changing host] 20140628 17:59:43-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev 20140628 18:00:58-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140628 18:21:47-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140628 18:23:45-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140628 18:35:57-!- prkc_ [~prkc@4E5CCA17.dsl.pool.telekom.hu] has joined #wesnoth-dev 20140628 18:39:21-!- prkc [~prkc@54028627.dsl.pool.telekom.hu] has quit [Ping timeout: 252 seconds] 20140628 18:59:26< RiftWalker> vultraz: I have no plans for such a change, but I am converting [scenario] tags to [multiplayer] in sp as in mp. 20140628 19:00:39< RiftWalker> so yes in a way? depends on what you mean by default. 20140628 19:11:59< thunderstruck> RiftWalker: Splitting MP Configure into engine and GUI would reduce duplication. Now you have get_parameters() and param_initialization() which are very similar. It also further divides MP and SP codepaths instead of unifying them. 20140628 19:13:26< mordante> I'm off bye 20140628 19:13:35< thunderstruck> RiftWalker: BTW, why is param_initializer called from configure ctor? 20140628 19:13:54-!- mordante [~mordante@wesnoth/developer/mordante] has quit [Quit: Leaving] 20140628 19:18:10< RiftWalker> thunderstruck: What I was going for in my last commit was: You have a param_initializer method which takes care of setting parameters to their default values. Then mp_configure reads in the already initialized values, and modifies them via gui widgets. 20140628 19:18:44< RiftWalker> thunderstruck: The code is very similar. In get_parameters we' 20140628 19:18:48< thunderstruck> RiftWalker: Alright. My question is then, if you'd not call param_initializer() from cofigure ctor , would eanything change? 20140628 19:18:51< thunderstruck> anything* 20140628 19:19:08< RiftWalker> re reading from gui to parameters. 20140628 19:19:13< RiftWalker> and yes. 20140628 19:19:52< RiftWalker> Because I've changed the code such that gui widget values are read from parameters rather than preferences 20140628 19:19:56< thunderstruck> RiftWalker: Ah, I see. That was in another commit and I didn't notice it now. 20140628 19:20:58< RiftWalker> and also removed the initial forced use_mp_settings_check (moving that check to param_intializer) 20140628 19:24:23-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140628 19:27:52< thunderstruck> RiftWalker: The setter/getter approach which you mentioned in your last email, would work better here, I think. The logic would be more simple and GUI could be fully separated from engine. 20140628 19:28:05-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140628 19:28:12< thunderstruck> I.e. you could allow users to modify some settings by providing some settings dialog. 20140628 19:28:32< thunderstruck> With current approach, this is not exactly possible. 20140628 19:28:45-!- wesbot changed the topic of #wesnoth-dev to: string+feature freeze active on 1.12 | 239 bugs, 345 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 20140628 19:30:37< thunderstruck> I also like the idea of consistency. Two other MP screens already use this engine/GUI approach and it works rather well. 20140628 19:31:45< thunderstruck> In a way, you're already doing it now actually. 20140628 19:31:55< thunderstruck> It's just not complete yet. 20140628 19:33:07< RiftWalker> One possibility I thought of earlier is to have the gui called from the engine via some method. 20140628 19:33:37< RiftWalker> might not be as easy with differing gui classes though 20140628 19:35:04< RiftWalker> Anyway, what am I missing? There isn't a whole lot of common code here. 20140628 19:39:03< thunderstruck> RiftWalker: As I said, you're already doing something like it. It's just that there's no way to provide parameters you want for SP. 20140628 19:39:25-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: ancestral] 20140628 19:39:45< thunderstruck> RiftWalker: calling gui from engine might not work, because you might want to have separate guis for SP and MP. 20140628 19:40:01< thunderstruck> RiftWalker: it's important that the actualy logic used to set up the game would be the same. 20140628 19:40:08< thunderstruck> the actualŪ 20140628 19:40:13< thunderstruck> actual* 20140628 19:41:23< RiftWalker> For sp, I was thinking that setting force_lock_settings true would be sufficient. 20140628 19:41:57< thunderstruck> RiftWalker: maybe.. But things might change. So why not make it modular if it's easy enough to do it? 20140628 19:44:11< thunderstruck> RiftWalker: In the end, it's up to you really. The current approach would work anyway. 20140628 19:44:43< thunderstruck> I was just saying that it would be nice to provide a design with a bit more flexibility. 20140628 19:52:41< RiftWalker> thunderstruck: I'll see what i can come up with. 20140628 19:57:27< thunderstruck> RiftWalker: You don't like engine/gui approach? 20140628 20:01:25< RiftWalker> thunderstruck: I think it works well for the other mp classes, but because of the simplicity of this class, there doesn't seem to be much for the engine to do. For the sake of clarity and uniformity, though, I think it's worth taking this approach. Basically what i'm looking at writing is a wrapper for the relevant parameters, with a method to initialize to default, as well as any other common code I can find. 20140628 20:02:29< thunderstruck> RiftWalker: Yes, but small classes are okay :) 20140628 20:03:35< RiftWalker> thunderstruck: Of course. And I think by putting my current code in a seperate method rather than constructor, the whole thing will be more modular. 20140628 20:04:01< thunderstruck> RiftWalker: And clarity and uniformity are quite important. There will be other developers changing your code in the end. 20140628 20:05:03< thunderstruck> RiftWalker: Yes, if you'd put that into a method, add setters/getters for params and move gui to other class, it should work. 20140628 20:05:40< thunderstruck> That's why I said, that you are basically already doing this approach. 20140628 20:07:26-!- vernon [~quassel@77-234-83-36.pool.digikabel.hu] has joined #wesnoth-dev 20140628 20:07:27< RiftWalker> Yeah. This makes more sense now. I'll try to get it pushed within the next couple of hours. 20140628 20:11:03-!- ancestral [~ancestral@mobile-166-137-177-100.mycingular.net] has joined #wesnoth-dev 20140628 20:15:54< RiftWalker> thunderstruck: do you think it's better to use seperate setter/getters or just accessors that return a reference? 20140628 20:18:49-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140628 20:19:00< thunderstruck> I'd go with setters/getters even if it would be a bit more laborious, because of encapsulation benefits. 20140628 20:19:06< thunderstruck> http://stackoverflow.com/questions/1568091/why-use-getters-and-setters 20140628 20:22:34< RiftWalker> thunderstruck: Got it. 20140628 20:23:56< thunderstruck> RiftWalker: Check your private messages. 20140628 20:32:24-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140628 20:32:33-!- ancestral [~ancestral@mobile-166-137-177-100.mycingular.net] has quit [Remote host closed the connection] 20140628 20:38:25-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has quit [Quit: riksteri] 20140628 20:38:27< shadowm> Coffee_irc: Firstly, it's impossible to fix *all* the bugs. I was merely talking about the important ones. 20140628 20:39:19< shadowm> lipkab: None, there's no reason for us to ignore *.txt. 20140628 20:40:30< shadowm> gfgtdf: There is a way, but we'd rather have you comment out the parameter name (that serves the same purpose). 20140628 20:41:23< shadowm> Or remove the parameter altogether if it's truly unused in all configurations. 20140628 20:41:51< gfgtdf> shadowm: about the unused parameter ? modante already helped me with that. 20140628 20:41:57< shadowm> Coffee_irc: Secondly, I don't remember what the second point was. 20140628 20:42:40< shadowm> gfgtdf: Yes, I just noticed he described the method I alluded to. 20140628 20:54:06< iceiceice_> shadowm: i didn't fix up the boost/function include guards yet but i didnt forget either, its on my todo list 20140628 20:56:40< shadowm> iceiceice_: Why do you like so much to rearrange everything I say changing its meaning? :p 20140628 20:57:03< iceiceice_> its probably unintentional :/ 20140628 20:57:08< shadowm> In http://forums.wesnoth.org/viewtopic.php?p=572527#p572527, the file you linked to clearly says "a 64-bit Wesnoth executable" and doesn't say anything about "64-bit Windows". 20140628 20:57:36< shadowm> This isn't a Windows-only nuance either. 20140628 20:58:05< iceiceice_> yeah i was actually just legitimately confused, 20140628 20:58:36< iceiceice_> i think it shows throughout that thread actually 20140628 21:04:06-!- gfgtdf_ [~chatzilla@f054168018.adsl.alicedsl.de] has joined #wesnoth-dev 20140628 21:05:55-!- gfgtdf [~chatzilla@e179210008.adsl.alicedsl.de] has quit [Ping timeout: 240 seconds] 20140628 21:06:01-!- gfgtdf_ is now known as gfgtdf 20140628 21:27:43-!- gfgtdf [~chatzilla@f054168018.adsl.alicedsl.de] has quit [Read error: Connection reset by peer] 20140628 21:34:34-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has quit [Quit: leaving] 20140628 21:34:35-!- cib2 [~cib@p5DD212F6.dip0.t-ipconnect.de] has quit [Ping timeout: 264 seconds] 20140628 21:39:06-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140628 22:17:52-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 260 seconds] 20140628 22:17:59-!- irker673 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140628 22:17:59< irker673> wesnoth: Ignacio R. Morelle wesnoth:master 786789b2d788 / src/campaign_server/campaign_server.cpp: campaignd: Log errno to stderr if deleting an add-on archive failed http://git.io/AO0Fgg 20140628 22:32:13-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140628 22:33:04< irker673> wesnoth: Ignacio R. Morelle wesnoth:master 2ac434dd2caa / src/campaign_server/campaign_server.cpp: campaignd: Catch boost::bad_function_call exception http://git.io/S7RnsA 20140628 22:42:11-!- ejls [~ejls@esimon.eu] has quit [Quit: bye] 20140628 22:56:05-!- leyyin [~leyyin@unaffiliated/leyyin] has quit [Quit: So Long, and Thanks for All the Fish] 20140628 23:02:44-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140628 23:17:09-!- happygrue [~Wintermut@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140628 23:17:19-!- vernon [~quassel@77-234-83-36.pool.digikabel.hu] has quit [Ping timeout: 240 seconds] 20140628 23:18:05-!- mjs-de [~mjs-de@f048195255.adsl.alicedsl.de] has joined #wesnoth-dev 20140628 23:18:17< irker673> wesnoth: Ignacio R. Morelle wesnoth:master 0441ad9d66a5 / src/playsingle_controller.cpp: Add missing field to constructor initializer list http://git.io/v7SWQg 20140628 23:36:56-!- mjs-de [~mjs-de@f048195255.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140628 23:37:02-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140628 23:37:29-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit] 20140628 23:38:28-!- ejls [~ejls@esimon.eu] has joined #wesnoth-dev 20140628 23:48:27-!- _8680_ [~8680@2002:4404:712c:0:21e8:1cf0:a95c:ebf7] has quit [Ping timeout: 252 seconds] 20140628 23:49:10-!- _8680_ [~8680@2002:4404:712c:0:2044:4bbb:e5c1:4fe6] has joined #wesnoth-dev 20140628 23:56:48-!- _8680_ [~8680@2002:4404:712c:0:2044:4bbb:e5c1:4fe6] has quit [Ping timeout: 260 seconds] 20140628 23:57:47-!- _8680_ [~8680@2002:4404:712c:0:f1fc:bee0:4fd0:ad42] has joined #wesnoth-dev --- Log closed Sun Jun 29 00:00:29 2014