--- Log opened Wed Feb 05 00:00:43 2014
20140205 00:01:08-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 265 seconds]
20140205 00:04:58-!- stikonas__ [~gentoo@pb-d-128-141-230-254.cern.ch] has quit [Write error: Connection reset by peer]
20140205 00:05:13-!- stikonas__ [~gentoo@pb-d-128-141-230-254.cern.ch] has joined #wesnoth-dev
20140205 00:25:38-!- stikonas__ [~gentoo@pb-d-128-141-230-254.cern.ch] has quit [Quit: Konversation terminated!]
20140205 00:25:50-!- mattsc [~mattsc@fw.hia.nrc.ca] has quit [Quit: Ciao]
20140205 00:26:55-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has joined #wesnoth-dev
20140205 00:42:30-!- Velensk [~Velensk@cpe-75-187-86-211.woh.res.rr.com] has joined #wesnoth-dev
20140205 00:56:15-!- {V} [~V@72-69-ftth.on.nl] has joined #wesnoth-dev
20140205 00:58:57< happygrue> Iis there a place to get linux binaries for the latest dev branch?  Or is it by compiling only?
20140205 00:59:05< happygrue> -i
20140205 00:59:54-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20140205 01:00:11< shadowm> We don't provide any ourselves, since distribution platform differences tend to make that non-trivial to do.
20140205 01:00:25< happygrue> I see
20140205 01:00:38< shadowm> Compiling is incredibly easy, though, moreso if you are on a Debian-based distribution and with a source repository configured that has Wesnoth 1.10 or 1.11.x.
20140205 01:01:12< shadowm> $ sudo apt-get build-dep wesnoth ; sudo apt-get install libbz2-dev
20140205 01:01:25< shadowm> And then it's just matter of following the instructions from the INSTALL file in the source tree.
20140205 01:01:36< happygrue> Velensk is on Ubuntu, but I am not so I was just poking around to see where to point him
20140205 01:01:55< happygrue> I see
20140205 01:02:02< happygrue> so that over the wiki you'd suggest?
20140205 01:03:08< happygrue> also: is there (useful) data stored somewhere on the number of games each multiplayer maps gets?
20140205 01:03:23< shadowm> I could walk him through the steps too. I haven't seen the wiki's instructions.
20140205 01:03:50< Velensk> Following the wiki instructions gets you 1.10.2
20140205 01:07:35< shadowm> The build dependencies for 1.10 should work (that's the build-dep step). For compiling current master you will need to get a Git repository clone if yu don't have one already.
20140205 01:07:54< Velensk> I have one
20140205 01:08:55< shadowm_desktop> Hang on, I'm getting some lag here.
20140205 01:10:26< shadowm_desktop> Velensk: Did you install the build dependencies with apt-get build-dep then?
20140205 01:12:04< Velensk> I don't think so. In truth, the computer I have may have come with Wesnoth (I'm not sure). I got the version I have on it now with the apt-get install command given on the wiki
20140205 01:15:54-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 01:16:52< shadowm> Velensk: Well, in that case you may choose to keep that copy or uninstall it; it doesn't matter.
20140205 01:17:19< shadowm> In order to build from master, you do need to perform the apt-get build-dep step, though. Runtime dependencies and build-time dependencies are slightly different.
20140205 01:18:06< Velensk> so sudo apt-get build-dep wesnoth
20140205 01:18:55< shadowm> If it complains about source repositories, you'll need to enable source repositories first by going into Software Center -> Edit -> Software Sources, and enabling the "Source Code" option in the first page.
20140205 01:19:15< shadowm> (That's what it's like in the version I have lying around, anyway.)
20140205 01:20:26< Velensk> It seems to be working as given
20140205 01:24:56< shadowm> When it's done downloading and installing, change directory to the Wesnoth clone. For example: `cd ~/src/wesnoth` (~/src/wesnoth is where I have my own).
20140205 01:25:40< shadowm> Er, hm, you should also install 'scons' first: `sudo apt-get install scons`
20140205 01:26:02< shadowm> (I prefer scons to cmake because it's easier to work with for a basic build...)
20140205 01:30:25-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Quit: Ik ga weg]
20140205 01:30:31< Velensk> I'll be right back
20140205 01:30:51-!- mattsc [~mattsc@154.20.32.246] has joined #wesnoth-dev
20140205 01:36:56< Velensk> Should I go to where I have my wesnoth clone or my working copy?
20140205 01:38:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 264 seconds]
20140205 01:38:48-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140205 01:39:21< happygrue> yes, build it in the directory where you have the clone - git won't touch the binary files so you can just leave them there
20140205 01:39:35< Velensk> alright, I'm there
20140205 01:40:03-!- mjs-de [~mjs-de@f048236133.adsl.alicedsl.de] has quit [Remote host closed the connection]
20140205 01:41:13< shadowm> Velensk: Hm, the clone and the working copy in Git terms aren't very easy to tell apart.
20140205 01:41:31< shadowm> The directory where you want to be is the one that contains data/, images/, src/, INSTALL, changelog, and so on.
20140205 01:42:04< Velensk> mine are
20140205 01:42:11< Velensk> I'm in the right one
20140205 01:43:21< shadowm> After installing scons, run from there: `scons -j<N> build=release` (for a general testing build, slower to make, faster for gameplay) or `scons -j<N> build=debug` (if you need debug symbols for generating backtraces and such, requires more disk space, is faster to make).
20140205 01:43:42< shadowm> Replace <N> with the number of CPU cores you have for best build performance (don't include the brackets in the command line).
20140205 01:47:12< shadowm> Oh, and you should make sure you have plenty of RAM, more so if you choose a large N for the -j option.
20140205 01:47:30< Velensk> Am I going to have to repeat this process every time I get a new clone?
20140205 01:47:34< shadowm> If you don't have a lot of RAM (less than 4 GiB) it might be more convenient to not use the -j option at all.
20140205 01:47:47< shadowm> Velensk: You don't need to get a new clone every time.
20140205 01:48:01< shadowm> For updating your existing clone with the latest changes from upstream, run `git pull` from it.
20140205 01:48:42< Velensk> And that will work on future versions as well as updates?
20140205 01:49:02< shadowm> Every time you want to update your Wesnoth build, though (which isn't always necessary, it depends on the nature of the changes), you will need to run scons after pulling, but it will remember the last `release` mode you used, so you only need to run `scons -j<N>` or `scons`.
20140205 01:49:33< shadowm> Velensk: Future versions count as updates, in a way.
20140205 01:49:40< Velensk> Basically, what I'm trying to figure out is how much of these instructions I should save somewhere.
20140205 01:50:07< shadowm> All versions are 'tagged' from a specific state of one of our branches. Development versions come from the default ('master') branch, stable versions come from the 1.10 branch.
20140205 01:51:06< shadowm> If you specifically need a released version to play, it is possible to "checkout" one of the tagged versions with git without downloading anything, and then rebuild the binaries.
20140205 01:52:20< shadowm> It is also possible to have git dump the contents of one of those versions into a separate directory.
20140205 01:52:59< shadowm> If you are working with the default master branch, the first thing you should probably know is that it is not normally allowed into the same instance of the MP server as released development versions.
20140205 01:54:02< Velensk> Fair enough, but it'd still work for local testing
20140205 01:56:05< shadowm> Anyway, you may ask any questions you have about using git here.
20140205 01:57:16-!- cib0 [~cib@p20030067CE0E5A01267703FFFEE75B84.dip0.t-ipconnect.de] has quit [Ping timeout: 245 seconds]
20140205 01:58:34< AI0867> shadowm: if you use jobs=N, it will be remembered
20140205 01:58:49< AI0867> -j<N> overrides that, but isn't remembered
20140205 02:00:05< shadowm> Right, I forgot about the jobs= option. I prefer specifying it manually every time so I can decide how much to stress my desktop depending on what I'm doing at the time.
20140205 02:01:15< shadowm> I guess that's mostly because back when I was with bluecore, using a fixed large number risked causing it to reach 92 °C in summer.
20140205 02:02:47< Velensk> thank you for your help. I suspect my cpu will be at this for awhile.
20140205 02:03:14< shadowm> No problem. :)
20140205 02:37:44-!- Grickit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev
20140205 02:39:49-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Ping timeout: 272 seconds]
20140205 02:44:54< Velensk> It's up and running now.
20140205 02:45:40-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 260 seconds]
20140205 02:46:19-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 02:59:34< mattsc> Velensk: great!  So ... as you know, we're rebalancing SotBE at the moment.  I'm trying to set things up so that they are "somewhat hard but still enjoyable" for me (on medium difficulty).  But that's obviously very subjective and I also don't think that I am all that great a player (which is why I am doing this on medium).
20140205 02:59:56< mattsc> I wouldn't mind somebody else to give it a test on the hardest difficulty.  Hint hint ...  ;)
20140205 03:01:35< mattsc> Turuk's doing that too (testing on nightmare), btw, so if you say no not all is lost.  :P
20140205 03:05:20< AI0867> fendrin: the textRect_ member in the editor's tristate_button doesn't seem to actually do anything
20140205 03:05:38< AI0867> that is, it's read from once, but never actually written to (or initialized at all)
20140205 03:07:11< Velensk> I've actually started picking up coding one of my campaigns again recently (since I'm starting to get EoFM art again) so I'm probably not going to have a lot of spare time but when I'm in the mood to play rather than create I'll work on that.
20140205 03:08:18< Velensk> so just to make sure I understand how this works: If I want to update a map, I modify the clone I have and then tell git to push the changes.
20140205 03:09:08< mattsc> Velensk: sure, no worries.  (and thanks for the comments you have already posted earlier)
20140205 03:10:19< mattsc> Velensk: yes, that's how it works  (although somebody who has Linux should tell you if there are intricacies; I'm on a Mac)
20140205 03:11:33< Velensk> And after that happens someone who admins the project takes a look at the change and any other changes and resolves any discrepancies (which there shouldn't be unless someone else is changing the same map)
20140205 03:13:42< mattsc> Velensk: ah, maybe I am missing something, do you have commit access?
20140205 03:13:53< Velensk> I don't know
20140205 03:15:27< AI0867> Velensk: you don't right now
20140205 03:15:28< mattsc> That probably means that you don't then.  So in that case you want to create a pull request:  https://help.github.com/articles/using-pull-requests
20140205 03:16:18< AI0867> the usual process is that someone submits a few patches (now pull requests) and then we give them commit access
20140205 03:16:33< AI0867> this is especially helpful when they're not entirely sure what they're doing yet
20140205 03:18:19< Velensk> Fair enough. When I have some time I'll commit the changes to Ruins of Terra Dwelve I've made to see how it works.
20140205 03:18:33< Velensk> or push rather
20140205 03:24:10-!- Velensk [~Velensk@cpe-75-187-86-211.woh.res.rr.com] has quit [Quit: Leaving]
20140205 03:28:58-!- Velvet_Sky [~SkyPc@99-111-224-165.lightspeed.rcsntx.sbcglobal.net] has joined #wesnoth-dev
20140205 03:48:06-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has quit [Quit: Textual IRC Client: www.textualapp.com]
20140205 03:49:22-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has joined #wesnoth-dev
20140205 03:54:46-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 03:57:46-!- Ivanovic_ [~ivanovic@x2f3ff31.dyn.telefonica.de] has joined #wesnoth-dev
20140205 04:00:46-!- Ivanovic_ [~ivanovic@x2f3ff31.dyn.telefonica.de] has quit [Changing host]
20140205 04:00:46-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20140205 04:01:05-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 252 seconds]
20140205 04:01:55-!- Ivanovic_ is now known as Ivanovic
20140205 04:02:12-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Ping timeout: 272 seconds]
20140205 04:07:30-!- Velvet_Sky [~SkyPc@99-111-224-165.lightspeed.rcsntx.sbcglobal.net] has quit [Quit: #skynexchat @ quakenet.org for vecxis/nexuiz fps chat]
20140205 04:07:43-!- tomreyn_ [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20140205 04:07:57-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Ping timeout: 276 seconds]
20140205 04:15:04-!- tomreyn_ is now known as tomreyn
20140205 04:47:24-!- vultraz_old [~chatzilla@124.109.10.167] has joined #wesnoth-dev
20140205 04:50:47-!- vultraz_old [~chatzilla@124.109.10.167] has quit [Changing host]
20140205 04:50:47-!- vultraz_old [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev
20140205 05:08:35-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has joined #wesnoth-dev
20140205 05:20:53-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 05:29:12-!- Fortescue [Fortescue@cpe-65-189-245-210.woh.res.rr.com] has quit []
20140205 05:29:42-!- Grickit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection]
20140205 05:30:37-!- justinzane [~justinzan@tiny.justinzane.com] has joined #wesnoth-dev
20140205 05:31:17-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140205 05:37:07-!- Kexoth [~kex@78.157.29.205] has joined #wesnoth-dev
20140205 05:39:04-!- kex [~kex@78.157.29.205] has quit [Ping timeout: 272 seconds]
20140205 06:13:08-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20140205 06:16:43-!- Kexoth [~kex@78.157.29.205] has quit [Remote host closed the connection]
20140205 06:17:19-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140205 06:18:31-!- kex [~kex@78.157.29.205] has quit [Read error: Connection reset by peer]
20140205 06:18:44-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140205 06:23:31-!- kex [~kex@78.157.29.205] has quit [Ping timeout: 245 seconds]
20140205 06:34:36-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140205 06:49:48-!- mattsc [~mattsc@154.20.32.246] has quit [Quit: Ciao]
20140205 06:58:54-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Ping timeout: 276 seconds]
20140205 07:10:54-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20140205 07:19:54-!- Gallaecio [~quassel@84.120.114.63.dyn.user.ono.com] has joined #wesnoth-dev
20140205 07:45:06-!- Gallaecio [~quassel@84.120.114.63.dyn.user.ono.com] has quit [Read error: Connection reset by peer]
20140205 07:50:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 264 seconds]
20140205 07:55:22-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140205 08:07:26-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 264 seconds]
20140205 08:09:48-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 08:10:39-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140205 08:34:03-!- kex [~kex@78.157.29.205] has quit [Remote host closed the connection]
20140205 08:34:38-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140205 08:36:11-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20140205 08:38:56-!- kex [~kex@78.157.29.205] has quit [Ping timeout: 245 seconds]
20140205 08:39:00-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 08:44:54-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Quit: Leaving.]
20140205 08:51:10-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20140205 08:56:15-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev
20140205 09:08:33-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20140205 09:21:07-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 09:22:55-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140205 09:30:08-!- esr [~esr@wesnoth/developer/esr] has quit [Ping timeout: 252 seconds]
20140205 09:32:44-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!]
20140205 09:36:48-!- mjs-de [~mjs-de@f048003249.adsl.alicedsl.de] has joined #wesnoth-dev
20140205 09:48:25-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev
20140205 09:52:51-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 250 seconds]
20140205 09:54:17-!- mjs-de [~mjs-de@f048003249.adsl.alicedsl.de] has quit [Remote host closed the connection]
20140205 10:03:24-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 245 seconds]
20140205 10:08:05-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has joined #wesnoth-dev
20140205 10:12:04-!- cib0 [~cib@p20030067CE0E5A01267703FFFEE75B84.dip0.t-ipconnect.de] has joined #wesnoth-dev
20140205 10:17:02-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 264 seconds]
20140205 10:17:43-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 10:23:07-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 11:00:21-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Quit: Leaving.]
20140205 11:00:35-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 11:39:41-!- stikonas [~gentoo@pb-d-128-141-230-254.cern.ch] has joined #wesnoth-dev
20140205 11:39:41-!- stikonas [~gentoo@pb-d-128-141-230-254.cern.ch] has quit [Changing host]
20140205 11:39:41-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 11:40:30-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit]
20140205 11:55:06-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140205 12:00:21-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 12:05:11-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 245 seconds]
20140205 12:17:19-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 260 seconds]
20140205 12:18:44-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 12:38:21-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev
20140205 12:43:24-!- Fortescue [Fortescue@cpe-65-189-245-210.woh.res.rr.com] has joined #wesnoth-dev
20140205 13:04:53-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140205 13:08:03-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 13:32:33-!- Kostic [~Kostic@85.202.113.22] has joined #wesnoth-dev
20140205 14:03:11-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 245 seconds]
20140205 14:08:32-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Ping timeout: 246 seconds]
20140205 14:09:35-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 14:18:25-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev
20140205 14:22:16-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn]
20140205 14:43:11-!- irker453 [~irker@ai0867.net] has quit [Quit: transmission timeout]
20140205 14:45:21-!- boucman_work1 [~rosen@92.103.64.194] has joined #wesnoth-dev
20140205 14:46:56-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 245 seconds]
20140205 14:50:34-!- mattsc [~mattsc@154.20.32.246] has joined #wesnoth-dev
20140205 15:11:24-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 260 seconds]
20140205 15:12:06-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 15:14:52-!- irker472 [~irker@ai0867.net] has joined #wesnoth-dev
20140205 15:14:52< irker472> wesnoth: Alexander van Gessel wesnoth-old:master e09305afac76 / data/tools/wesnoth/libgithub.py: Exit if the build system can't be cloned http://git.io/G_BzfA
20140205 15:14:52< irker472> wesnoth: Alexander van Gessel wesnoth-old:master 242f0532f0f1 / data/tools/wesnoth/libgithub.py: Derive from the correct exception class http://git.io/YaFFRw
20140205 15:35:47-!- mjs-de [~mjs-de@f048003249.adsl.alicedsl.de] has joined #wesnoth-dev
20140205 15:41:19-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140205 15:41:34-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 15:46:09-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140205 15:51:18-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!]
20140205 15:51:40-!- boucman_work1 is now known as boucman_work
20140205 15:51:45-!- boucman_work [~rosen@92.103.64.194] has quit [Changing host]
20140205 15:51:46-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 15:53:06-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Ping timeout: 260 seconds]
20140205 16:12:14-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140205 16:16:44-!- Kostic [~Kostic@85.202.113.22] has quit [Ping timeout: 245 seconds]
20140205 16:18:18-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Ping timeout: 260 seconds]
20140205 16:20:04-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 16:20:47-!- Kostic [~Kostic@85.202.113.76] has joined #wesnoth-dev
20140205 16:26:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 16:33:39-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 16:37:58-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20140205 16:39:35-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20140205 16:39:42-!- stikonas [~gentoo@pb-d-128-141-230-58.cern.ch] has joined #wesnoth-dev
20140205 16:39:42-!- stikonas [~gentoo@pb-d-128-141-230-58.cern.ch] has quit [Changing host]
20140205 16:39:42-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 16:49:07-!- Kostic [~Kostic@85.202.113.76] has quit [Remote host closed the connection]
20140205 17:05:44-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 260 seconds]
20140205 17:06:12-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 260 seconds]
20140205 17:06:42-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 17:14:27-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 17:19:06-!- Kostic [~Kostic@85.202.113.107] has joined #wesnoth-dev
20140205 17:22:22-!- Gallaecio [~quassel@84.120.114.166.dyn.user.ono.com] has joined #wesnoth-dev
20140205 17:37:59-!- kex [~kex@89.205.75.19] has quit [Remote host closed the connection]
20140205 17:38:35-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140205 17:42:59-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 245 seconds]
20140205 17:57:00-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has joined #wesnoth-dev
20140205 18:14:51-!- irker472 [~irker@ai0867.net] has quit [Quit: transmission timeout]
20140205 18:26:27< Ivanovic> AI0867, shadowm: i'll try a pot-update, let's see if the menu strings come back nicely...
20140205 18:29:14-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 18:29:34-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20140205 18:31:43-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140205 18:33:18< Ivanovic> 20140205 19:32:59 error display: could not open image 'icons/icon-title_screen.png'
20140205 18:33:37< Ivanovic> happened just a moment ago when going into the preferences and then into the hotkey dialog
20140205 18:39:39-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Read error: Operation timed out]
20140205 18:40:13-!- irker894 [~irker@ai0867.net] has joined #wesnoth-dev
20140205 18:40:13< irker894> wesnoth: Nils Kneuper wesnoth-old:master 4f89026ed94a / po/ (27 files in 27 dirs): fixed the wesnoth-manual file for Portuguese and ran an update http://git.io/6xBrSw
20140205 18:40:13< irker894> wesnoth: Nils Kneuper wesnoth-old:master 3bf8e052f3a8 / / (687 files in 29 dirs): pot-update, regenerated doc files http://git.io/o_Ek9A
20140205 18:40:13< Ivanovic> okay, done with the pot-update, the strings are back to normal, at least in the german translation
20140205 18:40:24< Ivanovic> not sure if other files were forgotten or are in the wrong textdomain though...
20140205 18:42:10-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140205 18:45:17-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Read error: Connection reset by peer]
20140205 18:45:42-!- happygrue [~happygrue@c-66-30-155-184.hsd1.ma.comcast.net] has joined #wesnoth-dev
20140205 18:45:42-!- happygrue [~happygrue@c-66-30-155-184.hsd1.ma.comcast.net] has quit [Changing host]
20140205 18:45:43-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev
20140205 18:48:42-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Read error: Operation timed out]
20140205 18:51:14-!- mjs-de [~mjs-de@f048003249.adsl.alicedsl.de] has quit [Read error: Operation timed out]
20140205 18:52:40-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 18:56:10-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 18:57:07-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit]
20140205 19:01:11-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 19:02:57-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140205 19:03:12-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 19:03:34-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20140205 19:06:05-!- mjs-de [~mjs-de@f048003249.adsl.alicedsl.de] has joined #wesnoth-dev
20140205 19:09:34-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 19:12:42-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140205 19:17:30-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 260 seconds]
20140205 19:17:33-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140205 19:32:01-!- Kostic [~Kostic@85.202.113.107] has quit [Read error: Operation timed out]
20140205 19:33:08-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20140205 19:33:22-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 19:51:07-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev
20140205 19:53:09-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 19:59:18< Ivanovic> noy: please make sure to register your gsoc accont
20140205 19:59:23< Ivanovic> same activation as in the years before
20140205 19:59:31< Ivanovic> looks like we need to supply less information though
20140205 20:00:03-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140205 20:00:20-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 20:05:30-!- stikonas__ [~gentoo@pb-d-128-141-230-58.cern.ch] has joined #wesnoth-dev
20140205 20:05:52-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20140205 20:06:36< Ivanovic> okay, the first part of questions is moved into the wiki, the 2nd can be moved there once noy created his account for gsoc
20140205 20:06:38< Ivanovic> http://wiki.wesnoth.org/SoC_Information_for_Google
20140205 20:21:45-!- stikonas__ [~gentoo@pb-d-128-141-230-58.cern.ch] has quit [Quit: Konversation terminated!]
20140205 20:21:47-!- stikonas [~gentoo@pb-d-128-141-230-58.cern.ch] has joined #wesnoth-dev
20140205 20:21:47-!- stikonas [~gentoo@pb-d-128-141-230-58.cern.ch] has quit [Changing host]
20140205 20:21:48-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 20:26:40< lipkab> It always amuses me when people are objecting against the Khalifate because it's religious reference... there's a waaaaaaaaaaay stronger cultural/religious reference sitting right in the middle of Wesnoth since ages.
20140205 20:36:12-!- aquileia [93aba464@gateway/web/freenode/ip.147.171.164.100] has joined #wesnoth-dev
20140205 20:38:40< aquileia> "We also plan to give a special forum title to any students." Might this be a remnant of last year?
20140205 20:39:12< Ivanovic> aquileia: i am not at that part yet...
20140205 20:39:29< Ivanovic> no idea what the questions on page two will be until noy is done with his registration
20140205 20:39:32< aquileia> sorry
20140205 20:40:01< aquileia> just wanted to comment on it, didn't think it were already part 2
20140205 20:40:15< noy> I'm at work and all hell just broke loose 
20140205 20:40:20< noy> I'll need to do this later tonight
20140205 20:40:22< noy> (sorry)
20140205 20:41:21-!- trewe [~trewe@229.158.189.46.rev.vodafone.pt] has joined #wesnoth-dev
20140205 20:50:43< Ivanovic> okay
20140205 20:52:28< thunderstruck> Does anyone think that unifying SP and MP to the level that eras and mods would work for both SP and MP would make a good GSoC project?
20140205 20:54:01-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20140205 20:59:42-!- Crab_ [~Crab_@wesnoth/developer/crab] has quit [Quit: Crab_]
20140205 21:00:48-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140205 21:02:53-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has joined #wesnoth-dev
20140205 21:05:54-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 265 seconds]
20140205 21:10:15-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 21:14:31-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 21:16:13-!- Kostic [~Kostic@net6-1-245-109.mbb.telenor.rs] has joined #wesnoth-dev
20140205 21:18:39-!- aquileia [93aba464@gateway/web/freenode/ip.147.171.164.100] has left #wesnoth-dev []
20140205 21:20:37-!- Velensk [~Velensk@cpe-75-187-86-211.woh.res.rr.com] has joined #wesnoth-dev
20140205 21:20:48-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 21:21:24-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20140205 21:21:28< Velensk> Is there anything that I should do before pushing changes to git?
20140205 21:22:15< zookeeper> add changelog entries when applicable
20140205 21:23:43-!- Velvet_Sky [~SkyPc@99-111-224-165.lightspeed.rcsntx.sbcglobal.net] has joined #wesnoth-dev
20140205 21:24:17< Velensk> I don't think minor tweaks to a single multiplayer map are worth mentioning but I'll keep that in mind
20140205 21:24:28< happygrue> thunderstruck: it sounds interesting but I don't know quite what that means
20140205 21:25:05< happygrue> Velensk: any change is worth mentioning.  You can say "tweak" or "minor update" or "fixed forest hex" or something
20140205 21:28:39< happygrue> lipkab: On the one hand I can see a point to asking for a name change, but on the other hand it does seem like *anything* can be offensive viewed through a certain lense and he seems to be trolling more than actually asking for such a change IMO
20140205 21:29:05< thunderstruck> happygrue: the idea is that all WML should work for both SP and MP.
20140205 21:30:21< happygrue> I like that idea, but what does that mean in terms of playing a MP era in single player? 
20140205 21:30:31< irker894> wesnoth: Andrius Silinskas wesnoth-old:master 43b134de9b6f / src/ (flg_manager.hpp multiplayer_connect.cpp): Return by const reference, not by const value. http://git.io/WaMqrQ
20140205 21:31:23< thunderstruck> happygrue: the same as for MP campaigns. Some GUI dialogs should be made to allow era selection for SP.
20140205 21:31:51< thunderstruck> And, of course, WML author could specify whether to allow to choose eras.
20140205 21:32:21< happygrue> so you could play through a campaign with a different era?  That seems wild to me based on existing campaigns, but it could provide something interesting in the future for campaigns designed for such content
20140205 21:33:05< zookeeper> lipkab, well it's pretty undisputable that a "khalifate" has a whole lot stronger real-world and religious connotations than generic medieval europe -themed fantasy human kingdoms.
20140205 21:33:33< zookeeper> i dislike how the perfectly good objection is usually brought up in such... uh, poor manner
20140205 21:33:40< happygrue> yes
20140205 21:34:06< thunderstruck> happygrue: you could if campaign's author intended so.
20140205 21:34:20< happygrue> I find myself tuning out that thread because it drives me crazy though I want to listen to it
20140205 21:34:53< happygrue> zookeeper: did you see the suggestion to nerf the Dwarvish Lord?
20140205 21:35:02< zookeeper> happygrue, yes
20140205 21:36:16< lipkab> zookeeper: I wasn't referring to that.
20140205 21:36:40< zookeeper> oh.
20140205 21:37:05< lipkab> Google for "j and e bible" for putting the story of UtBS in a whole new light ;)
20140205 21:38:43< happygrue> one thing it would be great to have for the khalifate would be completed history stuff so that we could point to it...
20140205 21:39:14< happygrue> but I don't know why the name changed in the first place
20140205 21:40:03< happygrue> ah well
20140205 21:40:29< zookeeper> lipkab, i thought you meant you were amused by cherry-picking which religious references people complain about
20140205 21:41:09< lipkab> Yes.
20140205 21:41:38< zookeeper> there's no cherry-picking if the UtBS reference is so vague that people don't even see it
20140205 21:42:36< lipkab> The Eloh-Elohim parallel is just a funny insight.
20140205 21:43:14< lipkab> The whole "a guy leading his people towards a promised land through a desert" theme should be familiar from the old testament.
20140205 21:43:38< zookeeper> sure, i'm just saying that you can't blame people for only complaining about references that are obvious
20140205 21:43:40< lipkab> If somebody *wanted* to complain about it, they could have.
20140205 21:43:51< _8680_> Isn’t there also a mention of Ishtar in UtBS?
20140205 21:44:28< lipkab> Espreon said something similar when I mentioned the Eloh thing to him, but I can't remember.
20140205 21:46:01< Velensk> So when I enter 'git push' after giving it my username/password it tells me that the requested URL returns error 403
20140205 21:46:18< lipkab> _8680_: "Kaleh, I am Eloh, bearer of the staff of Ishtar and slayer of the demon-god Zhangor." <- here it is
20140205 21:46:27< happygrue> IMO that is part of what makes UtBS interesting though, is that it does draw on those themes in a very interesting way.
20140205 21:46:39< happygrue> taking bits out of real history is fantasy at it's best
20140205 21:47:11< happygrue> and by real history, I mean stories that we already know
20140205 21:47:45< lipkab> Certainly. So why not do the same with the Khalifate?
20140205 21:48:00< lipkab> Velensk: Do you have commit access yet?
20140205 21:48:09< Velensk> I don't believe so
20140205 21:48:16< happygrue> On the one hand, we obviously should.  On the other hand:  There are going to be people for whom this is very polarizing.
20140205 21:48:48< lipkab> Velensk: Well, then you can't push...
20140205 21:49:25< Velensk> So how would I get the changes on my computer to my branch on get then?
20140205 21:49:33< Velensk> git*
20140205 21:49:52< zookeeper> happygrue, i've never understood that taking bits out of real history thing
20140205 21:50:00< happygrue> ???
20140205 21:50:20< happygrue> what fantasy doesn't take parts of known and established traditions?
20140205 21:50:54-!- ancestral [~ancestral@71-215-205-163.mpls.qwest.net] has joined #wesnoth-dev
20140205 21:51:03< thunderstruck> Velensk: you have to clone wesnoth repository.
20140205 21:51:12< zookeeper> happygrue, i don't know, but i don't see how that makes for better fantasy
20140205 21:51:27< _8680_> Velensk: Fork the repository.
20140205 21:51:48< _8680_> <https://github.com/wesnoth/wesnoth-old/fork>
20140205 21:51:48< lipkab> Velensk: Or ask AI0867 or shadowm to give you commit access.
20140205 21:51:52< Velensk> I have a clone on my computer and a fork on git.
20140205 21:52:12< _8680_> Velensk: Then you should be pushing to your fork.
20140205 21:52:36< Velensk> Currently, the fork is exactly the same as the master branch and not the same as the copy on my computer
20140205 21:53:22< zookeeper> happygrue, i mean, "stories we already know"? sure, but that has little to do with actual history. most stories people know are just stories from other fiction, not actual historical stories.
20140205 21:53:40< _8680_> Velensk: Are you working in the master branch, or a different (topic) branch?
20140205 21:53:53< zookeeper> where the familiar story is originally from is pretty irrelevant
20140205 21:54:12< Velensk> The fork is from the master branch. I'd assume the clone is too
20140205 21:55:12< _8680_> Velensk: So your commits are in your local master branch?
20140205 21:55:39< Velensk> are you talking about changes I have made, or something else?
20140205 21:55:50< _8680_> Velensk: Have you made any commits?
20140205 21:56:22< lipkab> happygrue: I believe it should not be polarizing for any sane people.
20140205 21:56:28< Velensk> I don't think so. Or at least, I don't think any changes I have made have been committed.
20140205 21:56:57< thunderstruck> Velensk: I think it would the best if you'd read some tutorial on git.
20140205 21:57:06< shadowm> Ivanovic: The icon-title_screen.png warning is known. I believe LordBob_ is working on it.
20140205 21:57:21< _8680_> Velensk: E.g., <http://git-scm.com/book/>.
20140205 21:57:29< thunderstruck> Velensk: git-scm.org have some good ones.
20140205 21:57:30< lipkab> If we've stayed away from every questionable topic, we wouldn't have undead or magic at all...
20140205 21:57:50< thunderstruck> git-scm.com *
20140205 21:58:11< shadowm> lipkab: Or UtBS.
20140205 21:58:19< zookeeper> happygrue, "I don't know why the name changed in the first place" <- what original name are you referring to?
20140205 21:58:22< lipkab> Yeah.
20140205 21:59:13-!- shadowm_desktop [ignacio@186.11.15.108] has joined #wesnoth-dev
20140205 21:59:14< Velensk> I've read a couple. I don't claim this gives me any kind of real understanding of what I'm doing though.
20140205 21:59:32< Velensk> I generally learn best by doing
20140205 21:59:38-!- shadowm_desktop is now known as Guest40055
20140205 21:59:52-!- Guest40055 is now known as shadowm_desktop
20140205 21:59:57-!- shadowm_desktop [ignacio@186.11.15.108] has quit [Changing host]
20140205 21:59:57-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140205 22:00:45< Velensk> I see a command for git commit which is what I think is supposed to be a step inbetween what I've done and what I have been told do do previously
20140205 22:00:58< _8680_> Velensk: But for now — in SVN, one would edit files, then make a commit, which meant recording the changes and sending them “upstream” (to the central repository). Here, you edit files, then make a commit, which means recording the changes in a branch in your own local repository, then push one or more commits from one or more branches in your local repository to your fork on GitHub (or elsewhere), then submit a pull request-
20140205 22:01:04< _8680_> -to the authoritative upstream repository (wesnoth/wesnoth-old), which a developer can then accept.
20140205 22:01:12< zookeeper> yeah, in git when you commit it just commits to your local copy, and pushing is that pushes your local commits to the outside world
20140205 22:01:17< happygrue> zookeeper: Saracens
20140205 22:01:35< zookeeper> happygrue, really? that must have been a long long long time ago... i don't recall ever hearing that O.o
20140205 22:01:56< happygrue> yeah, I said at the time changing it to khalifate was a bad idea but...
20140205 22:01:59< happygrue> here we are
20140205 22:02:36< happygrue> and I could not disagree more with what you are saying about fantasy: what works of fantasy don't draw extensively on stories or facts we already know?
20140205 22:02:44< zookeeper> well, frankly i'm not sure which one would be better :p "saracen" has, according to a dictionary anyway, just as much real-world connotation
20140205 22:02:49< happygrue> sure
20140205 22:03:03< happygrue> but if we're going to change it, let's change it to something clearly not offensive at all IMO
20140205 22:03:14< _8680_> Velensk: So first, split a new topic branch off from master with your uncommitted changes on it: `git co -b velensk/somemapname-edits master`.
20140205 22:04:15< _8680_> s/co/checkout/
20140205 22:04:27< zookeeper> happygrue, they do, but i was merely trying to say that drawing from real-world history doesn't make for better fantasy than drawing from fiction
20140205 22:04:37< _8680_> Velensk: Then, commit your changes: `git commit -v <file(s) you changed>`.
20140205 22:05:02< _8680_> (The `-v` lets you see the changes to be committed as you write the commit message.)
20140205 22:05:02< happygrue> I see
20140205 22:06:00< happygrue> well that makes more sense, I didn't understand what you were saying.
20140205 22:06:17< happygrue> and it looks like 1.2 or somewhat after
20140205 22:06:19< zookeeper> this was all in context of the khalifate and drawing from real-world history/cultures/etc in a clearly identifiable way after all
20140205 22:06:26< happygrue> search for wesnoth and saracens and some things come up
20140205 22:06:37< happygrue> Becephaus and noy were working on it then
20140205 22:06:40< zookeeper> right
20140205 22:06:54< happygrue> fits and starts for some time now
20140205 22:06:59< _8680_> Velensk: Then a text editor should come up, and tell you to write a commit message. This should be formatted like an email — one line summarizing your changes, then a full description/explanation of the changes, with a blank line between the summary and the message body.
20140205 22:07:51< happygrue> and lipkab: I got distracted but I agree with you - the problem is that people arn't going to be sane about this regardless of what we do
20140205 22:08:10< happygrue> so IMO we will fight this forever or give in and change it eventually
20140205 22:08:31< Velensk> I don't see a git co command anywhere, what does it do?
20140205 22:08:41< _8680_> Velensk: The commit message body should be hard-wrapped to 72 columns; style guides (including in the Git book I linked above) say that the summary line should be limited to 50 characters, but I don’t know whether Battle for Wesnoth limits summary line length.
20140205 22:09:03< _8680_> Velensk: That was a mistake on my part, which I corrected on the next line — it should be `checkout`, not `co`.
20140205 22:09:47< zookeeper> i dunno if a name change is enough for people who'd complain about it. i've personally always been against almost every aspect of the faction, the name is just one :p
20140205 22:10:50< timotei> _8680_, Velensk: if you use vim to write the commit message, it will turn to gray any chars above the 50 limit (for the title of the commit, that is)
20140205 22:11:07-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has quit [Quit: leaving]
20140205 22:11:08< lipkab> 50 chars?! esr told me 72 when we started using git!
20140205 22:11:19< lipkab> I'm disappointed.
20140205 22:11:21< zookeeper> i thought 80
20140205 22:11:30< timotei> 80 for normal source code
20140205 22:11:38< timotei> 50 chars for commit's title (first line)
20140205 22:11:44< _8680_> lipkab: Maybe he meant for the message body?
20140205 22:11:48< lipkab> No.
20140205 22:11:55< timotei> 72 for the rest of commit's message (message body), after an empty line after the title. 
20140205 22:12:04< lipkab> "Each comment should begin with a self-contained summary line of 72 chars or less."
20140205 22:12:10< lipkab> That's what he said.
20140205 22:12:28< timotei> Hmm... I think he refers to 'comment' for the 'message body' of the commit :)
20140205 22:15:16< lipkab> No, the rest of the mail explains the formatting of the message body.
20140205 22:16:39< AI0867> my irker hook only displays the first 80 characters, so if you get cut off, you were way over the limit
20140205 22:18:25< timotei> lipkab: It really depends on how it's settled within the project :)
20140205 22:19:01< timotei> git-scm says: "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line ..."
20140205 22:19:24< _8680_> lipkab: 50 is the good-practice limit according to that Git book, but I don’t think Battle for Wesnoth has any specified limit.
20140205 22:27:16< zookeeper> line length limits are so... 1980? 70? 60?
20140205 22:27:48< AI0867> something like that
20140205 22:28:00< AI0867> as is email
20140205 22:28:10< AI0867> and that's what git commit messages are based on
20140205 22:29:19< zookeeper> but there's no such limits in emails
20140205 22:30:55< AI0867> I wouldn't be so sure =P
20140205 22:31:06< timotei> zookeeper: There are actually. Look at shadowm's emails.
20140205 22:31:13< timotei> Or, Ivanovic's
20140205 22:31:43< shadowm> My emails are line-wrapped by kmail before sending.
20140205 22:32:01< shadowm> So that doesn't count.
20140205 22:32:08< zookeeper> those are no limits, it's just their (or their clients', apparently) way of formatting the mails
20140205 22:33:28< shadowm> It means I don't need to shrink my window if I want the text to not look like crap.
20140205 22:34:00-!- Kostic [~Kostic@net6-1-245-109.mbb.telenor.rs] has quit [Quit: Leaving]
20140205 22:36:52< zookeeper> it's just funny how that particular hacky workaround (around lack of smart UI in email clients) seems so prevalent especially in the world of open source software where people like to do things right(tm) instead of having to use workarounds in regular workflow
20140205 22:37:17-!- mjs-de [~mjs-de@f048003249.adsl.alicedsl.de] has quit [Remote host closed the connection]
20140205 22:37:41< zookeeper> i mean obviously the "right" way to have things work is that whatever you use to view emails wraps the lines in the way you want, rather than hardcoding the linebreaks in the message itself
20140205 22:38:19< timotei> I think that's still part of the legacy of old, limited-width screens.
20140205 22:38:20< zookeeper> but in this particular case, the workaround is still so common
20140205 22:38:24< timotei> And the IBM punchards :D
20140205 22:38:27< zookeeper> sure
20140205 22:39:08< timotei> Also, sometimes the wall of text looks so much manageable if it's split by a certani width.
20140205 22:39:23< timotei> Look for example at the research papers which employ a two-column format instead of long lines.
20140205 22:39:33< timotei> Easier to be read and more compact.
20140205 22:49:05-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140205 22:53:24-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 245 seconds]
20140205 22:56:17-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140205 22:56:59< EliDupree> Am I missing the obvious, or is there no way for WML/Lua scripts to check whether a location is covered by fog or shroud?
20140205 22:57:51< EliDupree> In 1.10
20140205 23:03:30< EliDupree> Ooh, I can use filter_vision with wesnoth.match_unit on a private unit with no meaningful attributes except location :D
20140205 23:04:12< Velensk> I'm back. So I'd like to take the commit I made and put it online (on my remote fork so that I can send in a pull request). I can see that in the push command there is a place to specify remote and branch but I've been trying things out and I can't seem to get it to point at the fork I have on git.
20140205 23:04:32< EliDupree> Still can't check shroud, but that's less important
20140205 23:04:37< shadowm> Velensk: What specific commands have you tried?
20140205 23:07:37< EliDupree> Ooh, I can go poke around wesnoth.sides[foo].shroud_data, hee hee hee hee hee
20140205 23:09:19< Velensk> they've all been variants on git push I tried using the name and the URL of my fork for remote and a couple variations. I've tried using master, wesnoth:master, and Velensk:master for branch. I tried switching the two arguments.  I always get the error message that whatever I'm putting in doesn't seem to be a wesnoth repository
20140205 23:09:32-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140205 23:09:53< _8680_> Velensk: Do you have your fork set as a remote repository?
20140205 23:10:26< Velensk> If that is something I have to do on the local machine then no.
20140205 23:10:28< _8680_> E.g., `git remote add fork git@github.com:Velensk/wesnoth-old.git`.
20140205 23:10:49< _8680_> That would be for connecting via SSH.
20140205 23:11:33< _8680_> Do you have an SSH key pair registered with GitHub?
20140205 23:12:07< Velensk> I made the keys, I don't think I registered
20140205 23:12:26< _8680_> <http://wiki.wesnoth.org/WesnothRepository#Push_access>
20140205 23:13:57< _8680_> Ignore the first, last, and second-to-last paragraphs, given that you’re using a fork.
20140205 23:14:38< _8680_> Once your key pair is registered with GitHub, run the above `git remote add […]` command.
20140205 23:14:38< Velensk> brb
20140205 23:14:47-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140205 23:14:51-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 245 seconds]
20140205 23:15:36< _8680_> Then you should be able to run `git push fork velensk/somemap-edits`. (Assuming you’re on a branch named “velensk/somemap-edits”.)
20140205 23:17:15< _8680_> After that, <https://github.com/Velensk/wesnoth-old> should have a “Submit pull request” (or such) button.
20140205 23:19:45-!- cib0 [~cib@p20030067CE0E5A01267703FFFEE75B84.dip0.t-ipconnect.de] has quit [Ping timeout: 276 seconds]
20140205 23:20:08-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Quit: Vannak idők, mikor menni kell]
20140205 23:26:39-!- Gallaecio [~quassel@84.120.114.166.dyn.user.ono.com] has quit [Remote host closed the connection]
20140205 23:36:42-!- yann [~dwitch@nan92-1-81-57-214-146.fbx.proxad.net] has quit [Ping timeout: 252 seconds]
20140205 23:38:54-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140205 23:42:23-!- vultraz_old [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer]
20140205 23:42:51-!- vultraz_old [~chatzilla@124.109.10.167] has joined #wesnoth-dev
20140205 23:43:43< shadowm> !log 0670d34c5c971d7e87102fa57befbee026d88382 @ fendrin
20140205 23:43:43< shikadibot> fendrin: Revision 0670d34c5c97 (Emilien Rotival) on Sun Jan  5 22:18:39 2014:
20140205 23:43:47< shikadibot> fendrin: New icon for the 'preferences>hotkeys>title screen' category that was added in 1.11.8
20140205 23:43:50< shikadibot> fendrin: Web interface URL: https://github.com/wesnoth/wesnoth-old/commit/0670d34c5c97
20140205 23:44:03< shadowm> fendrin: It seems you missed/forgot this.
20140205 23:44:48< shadowm> The current requested path is slightly different in spelling:
20140205 23:44:48< shadowm> 20140205 20:44:34 error display: could not open image 'icons/icon-title_screen.png'
20140205 23:45:24-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140205 23:46:24< Velensk> Thanks very much to those who helped. The pull request is submitted.
20140205 23:47:09< shadowm> happygrue: I think you said you would handle this kind of thing: https://github.com/wesnoth/wesnoth-old/pull/93
20140205 23:48:16< happygrue> yep, until Velensk gets the key to the city
20140205 23:49:24< happygrue> so... having never done that before though, I merge it into my branch and then commit it?
20140205 23:50:41< shadowm> You can accept the pull request on the web interface if you know the results are good too.
20140205 23:50:55-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 272 seconds]
20140205 23:50:59< _8680_> happygrue: That should work, yes. Or you could merge it into your local master branch and push that.
20140205 23:51:01< shadowm> There is a big "Merge pull request" button in it.
20140205 23:51:44< mattsc> Velensk: may I be annoying for a moment?  I actually think that the subject does not say it all.
20140205 23:52:04< Velensk> Fair enough
20140205 23:52:08< mattsc> What kind of minor tweak is this?  Does it affect balance, game play, is it purely cosmetic?
20140205 23:52:18< Velensk> game balance
20140205 23:52:32< Velensk> a couple cosmetic tweaks too
20140205 23:52:39< mattsc> I'd usually look at the diff to figure this out, the problem is that the maps have a new format and therefore _everything_ has changed.
20140205 23:53:10< Velensk> I made the outside edge less flier frindly and the center a little less defensive
20140205 23:53:19-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140205 23:53:37< mattsc> So, I'm not saying you have to, but if I were to play this map, I'd prefer a comment indicating why this was done.
20140205 23:53:44< _8680_> Velensk: It would be best to have this explanation in the commit message body.
20140205 23:54:05< mattsc> That's all.  I'll stop bugging you now and go for a jog.  :)
20140205 23:54:21< Velensk> It's funny because I was actually thinking of doing just that
20140205 23:54:31< mattsc> Good to hear that you figured out the pull requests though!
20140205 23:54:46< mattsc> */though/
20140205 23:54:49< Velensk> And I'll be sure to provide more details in future patches
20140205 23:54:51< shadowm> mattsc: Maps don't have a new format...?
20140205 23:55:04< happygrue> a bit afk right now but at first glance it looks like the terrian isn't tabbed
20140205 23:55:13< shadowm> Well, I mean, they do since 1.3.10 or so, but neither that nor the previous format are very diffable.
20140205 23:55:19< happygrue> I don't know what the standard is, but the old diff has everything tabbed, is that an issue?
20140205 23:55:34< happygrue> afk again a few, back later to check
20140205 23:55:34< mattsc> shadowm: something is taking all the spaces out of the old column format.  As a result, the diffs show that all lines are different.
20140205 23:55:40< shadowm> Oh!
20140205 23:55:40< mattsc> Or am I missing something?
20140205 23:56:00< _8680_> If someday someone is reading the commit logs, it’s better for them to be able to get all the information they might need to understand a commit from its message, rather than needing to ask the author (who may not still be around).
20140205 23:56:08< shadowm> happygrue, mattsc: That whitespace between tiles has always been optional and the map editor i 1.11.x was updated to not write it to save space.
20140205 23:56:56< mattsc> shadowm: that's what I figured.  It just makes it hard to see what changed if there's only a minor difference.
20140205 23:56:59< shadowm> You can save a _lot_ of disk space that way when the files are stored in an incompressed format.
20140205 23:57:02< shadowm> uncompressed
20140205 23:57:47< shadowm> mattsc: Opening the current map and resaving it should provide it in the same style so you could e.g. word-diff both versions.
20140205 23:58:13< shadowm> Opening/resaving with the 1.11.x editor, that is.
20140205 23:59:18< mattsc> right  I'm not complaining in any way, btw, but that sounds like way too much effort unless I really care about the particular map.  I know there are ways to figure it out, but I'm too lazy to use them.  :P
--- Log closed Thu Feb 06 00:00:20 2014