--- Log opened Tue Feb 25 00:00:33 2014
20140225 00:05:30-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140225 00:12:05< iceiceice> shadowm: its not a debugging command because its active even when debug mode is not on
20140225 00:12:26< iceiceice> i guess i could change it in that way but its a bit pointless.
20140225 00:12:37< iceiceice> its just to help if someone gets confused while trying to do soemthing with idle sides
20140225 00:15:37< anonymissimus> shadowm: there's no way to connect to the 1.11 addons server with the gui now, is there ? (such as when connecting to the mp server)
20140225 00:16:12< anonymissimus> last time I tried specifying it didnt work IIRC
20140225 00:16:17< shadowm> add-ons.wesnoth.org:15006
20140225 00:18:02< anonymissimus> okay, this time it does
20140225 00:20:55< anonymissimus> shadowm: and where is the list with 15006 etc ?
20140225 00:21:52< shadowm> CampaignClient.portmap in data/tools/wesnoth/campaignserver_client.py
20140225 00:22:37< anonymissimus> (and I hope they are the same for the mp servers...)
20140225 00:22:43< shadowm> No.
20140225 00:22:47< anonymissimus> that is, same version, same number
20140225 00:22:50< anonymissimus> bad
20140225 00:23:03< shadowm> Not really, what you are asking for is a physical impossibility.
20140225 00:23:45< shadowm> Each wesnothd and campaignd is a separate process, all living in the same host. Without an external mux process, it's impossible for a wesnothd and campaignd instance to listen on the same port.
20140225 00:24:08< shadowm> And on the same network interface.
20140225 00:24:57< shadowm> Users generally should have nothing to do with the implementation details of the MP server, which are subject to change at our discretion, so they should connect to the redirector on (default) port 15000.
20140225 00:35:41-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn]
20140225 00:48:47-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev
20140225 00:51:54-!- sachith500 [~kvirc@112.134.14.182] has joined #wesnoth-dev
20140225 00:58:34-!- sachith500 [~kvirc@112.134.14.182] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
20140225 00:59:01-!- Crab_ [~Crab_@wesnoth/developer/crab] has quit [Quit: Crab_]
20140225 01:05:46-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140225 01:17:10-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140225 01:39:13-!- kex [~kex@78.157.29.205] has quit [Ping timeout: 272 seconds]
20140225 01:46:23< AI0867> shadowm: git tag -af 1.11.10 1.11.10 <-- this works
20140225 01:47:02< AI0867> we should probably get Ivanovic to run it though
20140225 01:48:25-!- Fortescue [sid1929@gateway/web/irccloud.com/x-hbmospscuxctxhpd] has quit [Ping timeout: 240 seconds]
20140225 01:49:31-!- Fortescue [sid1929@gateway/web/irccloud.com/x-rlifyijoomuwmolk] has joined #wesnoth-dev
20140225 02:20:40< irker200> wesnoth: Bär Halberkamp wesnoth-old:master 0efe12da4fe5 / data/campaigns/Eastern_Invasion/maps/ (08_Training_the_Ogres.map 11_Captured.map): Updates to the new EI maps http://git.io/1wV61A
20140225 02:24:08< irker200> wesnoth: Bär Halberkamp wesnoth-old:master a099a520b767 / changelog players_changelog: Updated changelogs http://git.io/GwpJ3w
20140225 02:24:16< shadowm> AI0867: Will that preserve the date, though?
20140225 02:24:29< AI0867> no, but perhaps you can manipulate it
20140225 02:24:49< shadowm> Then it may be simpler to have someone who knows how to change the date run it? :p
20140225 02:25:13< AI0867> Ivanovic: for the release process: use annotated (or even better, signed) tags rather than lightweight ones
20140225 02:26:42< shadowm> AI0867: http://wiki.wesnoth.org/ReleasingWesnoth#Tagging_and_extra_release_related_steps
20140225 02:26:55< shadowm> That command needs to be amended.
20140225 02:27:25< shadowm> It's not what he uses in reality, though, since his tags obviously don't contain the redundant "using commit <commit>" part.
20140225 02:28:29< shadowm> He doesn't bump the Doxyfile version either.
20140225 02:45:16-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20140225 02:53:49-!- iceiceice [~chris@207-237-132-90.ny.subnet.cable.rcn.com] has quit [Ping timeout: 244 seconds]
20140225 02:56:01-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Quit: Ik ga weg]
20140225 02:56:53-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Ping timeout: 252 seconds]
20140225 03:01:13-!- jamit [~jamit@wesnoth/developer/jamit] has joined #wesnoth-dev
20140225 03:02:15-!- Ivanovic_ [~ivanovic@x2f46682.dyn.telefonica.de] has joined #wesnoth-dev
20140225 03:03:44< jamit> Ivanovic (or whoever can/wants to do something about it): I just noticed a typo at https://mail.gna.org/listinfo/wesnoth-bugs/ The first paragraph advises "He carefull" instead of "Be careful".
20140225 03:04:03< jamit> Just stopped by to throw that out before I forget.
20140225 03:04:03-!- jamit [~jamit@wesnoth/developer/jamit] has quit [Client Quit]
20140225 03:04:54-!- Ivanovic_ [~ivanovic@x2f46682.dyn.telefonica.de] has quit [Changing host]
20140225 03:04:54-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20140225 03:05:44-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 252 seconds]
20140225 03:06:06-!- Ivanovic_ is now known as Ivanovic
20140225 03:06:20-!- iceiceice [~chris@pool-108-21-12-72.nycmny.east.verizon.net] has joined #wesnoth-dev
20140225 03:15:30-!- anonymissimus [~chatzilla@HSI-KBW-149-172-228-192.hsi13.kabel-badenwuerttemberg.de] has quit [Quit: ChatZilla 0.9.90.1 [Firefox 12.0/20120423122928]]
20140225 03:17:37-!- mjs-de [~mjs-de@g228160059.adsl.alicedsl.de] has quit [Remote host closed the connection]
20140225 03:31:21-!- kex [~kex@78.157.29.205] has joined #wesnoth-dev
20140225 03:39:35-!- iceiceice [~chris@pool-108-21-12-72.nycmny.east.verizon.net] has quit [Remote host closed the connection]
20140225 03:42:41< irker200> wesnoth: hp wesnoth-old:master debd2d7c21d1 / src/menu_events.cpp: Fixed bug #21486: Team label clears a non-team label http://git.io/OQdtzA
20140225 03:42:43< irker200> wesnoth: Sachith Hasaranga Seneviratne wesnoth-old:master 5a3969a47585 / changelog data/core/about.cfg players_changelog: Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com> http://git.io/BuUHFw
20140225 03:42:45< irker200> wesnoth: Sachith Hasaranga Seneviratne wesnoth-old:master ebd111ba45fa / changelog players_changelog: Added changelog entries and updated about.cfg. Minor typo-fix in http://git.io/dEkXBQ
20140225 03:42:47< irker200> wesnoth: Alexander van Gessel wesnoth-old:master 76b9976b7584 / changelog data/core/about.cfg players_changelog src/menu_events.cpp: Merge branch 'bug21486' of github.com:sachith500/wesnoth-old (PR #94) http://git.io/HDrdaw
20140225 03:43:29< shadowm> Um.
20140225 03:43:47< AI0867> ?
20140225 03:43:55< shadowm> Commit debd2d7c21d1's author identity.
20140225 03:44:04< AI0867> point
20140225 03:44:14< AI0867> same person
20140225 03:44:28< AI0867> as the email shows
20140225 03:44:30< shadowm> Yeah, but couldn't we make sure this kind of thing isn't taking place before merging pull requests?
20140225 03:44:42< AI0867> I didn't see
20140225 03:45:02< AI0867> we've also had some cases of people merging pull requests before configuring their github accounts
20140225 03:45:18< AI0867> thus not having real names or emails to use for those generated commits
20140225 03:45:37< shadowm> Clearly, everyone is trying to trigger my perfectionism so we end up rewriting history again, huh?
20140225 03:46:02< shadowm> No matter, I will keep resisting the urge.
20140225 03:46:26< AI0867> you're not going to be as bad as esr
20140225 03:46:36< AI0867> you're not going to read and rewrite 50k commits
20140225 03:47:27< shadowm> Oh, ho ho ho ho, don't say that kind of thing. I almost succumbed to the temptation to rewrite all commits when converting IftU and AtS to Git.
20140225 03:47:34< AI0867> =P
20140225 03:48:02< shadowm> It takes a lot of self-restraint to turn a blind eye to past commits that violate every style guide in existence.
20140225 03:49:28< vultraz> I simply got rid of them when converting NX. I had no idea what I was doing before moved to git so I erased all my unsavorable history :P
20140225 03:49:45< shadowm> Just imagine, what it'd be like if we could use git filter-branch on humanity's history as well.
20140225 03:50:12< AI0867> evil
20140225 03:50:20< AI0867> nobody would have any lessons to learn from
20140225 03:50:22< shadowm> Here's the answer: you get an orwellian dystopia.
20140225 03:50:26< AI0867> I mean, that's what teaching is about
20140225 03:50:43< AI0867> allowing you to learn from *other people's* mistakes
20140225 03:51:25< vultraz> gir rm hitler/
20140225 03:51:30< vultraz> git*
20140225 03:51:44< AI0867> that's not what shadowm said
20140225 03:52:46< AI0867> more like a git filter-branch where hitler never existed
20140225 03:52:58< AI0867> and hitler served a purpose
20140225 03:53:10< AI0867> eugenetics was a big thing in the west
20140225 03:53:29< AI0867> until the holocaust went public
20140225 03:53:45< AI0867> though in the US, some things lingered until the 50s
20140225 03:59:35-!- lobby [~wesnoth@wesnoth/bot/lobby] has joined #wesnoth-dev
20140225 03:59:35-!- Topic for #wesnoth-dev: string+feature freeze active on master | 216 bugs, 350 feature requests, 28 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
20140225 03:59:35-!- Topic set by wesbot [~wesbot@asteria.debian.or.at] [Mon Feb 24 07:27:11 2014]
20140225 03:59:35[Users #wesnoth-dev]
20140225 03:59:35[ _8680_         ] [ DHost_   ] [ Fortescue ] [ kex         ] [ melinath] [ Soliton  ] 
20140225 03:59:35[ AI0867         ] [ elias    ] [ Gambit    ] [ knotwork    ] [ molgrum ] [ timotei__] 
20140225 03:59:35[ alcedine       ] [ EliDupree] [ Guest33521] [ lobby       ] [ noy     ] [ ToBeFree ] 
20140225 03:59:35[ apoi           ] [ enchilado] [ irker200  ] [ loonycyborg ] [ nurupo  ] [ Upth     ] 
20140225 03:59:35[ ChrisOelmueller] [ Espreon  ] [ Ivanovic  ] [ LordNasty   ] [ Rhonda  ] [ vultraz  ] 
20140225 03:59:35[ Crendgrim_     ] [ esr1     ] [ iwaim___  ] [ MaraJade    ] [ Samual  ] [ wesbot   ] 
20140225 03:59:35[ crimson_penguin] [ exciton  ] [ janebot_  ] [ matthiaskrgr] [ shadowm ] [ {V}      ] 
20140225 03:59:35[ DDR            ] [ fabi_    ] [ Jetrel    ] [ mattsc      ] [ Smar    ] 
20140225 03:59:35-!- Irssi: #wesnoth-dev: Total of 47 nicks [0 ops, 0 halfops, 0 voices, 47 normal]
20140225 03:59:42-!- Channel #wesnoth-dev created Tue Jan 27 05:28:41 2009
20140225 04:00:13-!- lobby [~wesnoth@wesnoth/bot/lobby] has joined #wesnoth-dev
20140225 04:00:13-!- Topic for #wesnoth-dev: string+feature freeze active on master | 216 bugs, 350 feature requests, 28 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
20140225 04:00:13-!- Topic set by wesbot [~wesbot@asteria.debian.or.at] [Mon Feb 24 07:27:11 2014]
20140225 04:00:13[Users #wesnoth-dev]
20140225 04:00:13[ _8680_         ] [ DHost_   ] [ Fortescue ] [ kex         ] [ melinath] [ Soliton  ] 
20140225 04:00:13[ AI0867         ] [ elias    ] [ Gambit    ] [ knotwork    ] [ molgrum ] [ timotei__] 
20140225 04:00:13[ alcedine       ] [ EliDupree] [ Guest33521] [ lobby       ] [ noy     ] [ ToBeFree ] 
20140225 04:00:13[ apoi           ] [ enchilado] [ irker200  ] [ loonycyborg ] [ nurupo  ] [ Upth     ] 
20140225 04:00:13[ ChrisOelmueller] [ Espreon  ] [ Ivanovic  ] [ LordNasty   ] [ Rhonda  ] [ vultraz  ] 
20140225 04:00:13[ Crendgrim_     ] [ esr1     ] [ iwaim___  ] [ MaraJade    ] [ Samual  ] [ wesbot   ] 
20140225 04:00:13[ crimson_penguin] [ exciton  ] [ janebot_  ] [ matthiaskrgr] [ shadowm ] [ {V}      ] 
20140225 04:00:13[ DDR            ] [ fabi_    ] [ Jetrel    ] [ mattsc      ] [ Smar    ] 
20140225 04:00:13-!- Irssi: #wesnoth-dev: Total of 47 nicks [0 ops, 0 halfops, 0 voices, 47 normal]
20140225 04:00:19-!- Channel #wesnoth-dev created Tue Jan 27 05:28:41 2009
20140225 04:00:26-!- Ivanovic_ [~ivanovic@x2f51877.dyn.telefonica.de] has joined #wesnoth-dev
20140225 04:01:18-!- Irssi: Join to #wesnoth-dev was synced in 73 secs
20140225 04:03:05-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection]
20140225 04:03:39-!- Ivanovic_ [~ivanovic@x2f51877.dyn.telefonica.de] has quit [Changing host]
20140225 04:03:39-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20140225 04:04:02-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 252 seconds]
20140225 04:04:35-!- Ivanovic_ is now known as Ivanovic
20140225 04:07:41-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140225 04:08:25-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 04:20:39-!- Guest33521 [~shikadi@ai0867.net] has quit [Changing host]
20140225 04:20:39-!- Guest33521 [~shikadi@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev
20140225 04:20:43-!- Guest33521 is now known as shikadibot
20140225 04:22:14-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20140225 04:52:39-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 244 seconds]
20140225 04:54:39-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140225 05:14:31-!- iwaim___ [~iwaim@2001:2c0:40e:2002:0:4:14:80] has quit [Ping timeout: 245 seconds]
20140225 05:28:49-!- iwaim___ [~iwaim@2001:2c0:40e:2002:0:4:14:80] has joined #wesnoth-dev
20140225 05:28:55-!- mattsc [~mattsc@154.20.32.246] has quit [Quit: Ciao]
20140225 05:59:09-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 06:37:28-!- Gallaecio [~quassel@84.120.219.139.dyn.user.ono.com] has joined #wesnoth-dev
20140225 06:43:26-!- knotwork [~markm@unaffiliated/knotwork] has quit [Read error: Connection reset by peer]
20140225 06:50:51< Ivanovic> [02:46:23] <AI0867> shadowm: git tag -af 1.11.10 1.11.10 <-- this works
20140225 06:50:59< Ivanovic> AI0867: this did not work here when trying to push
20140225 06:51:49< Ivanovic> To git@github.com:wesnoth/wesnoth-old.git
20140225 06:51:50< Ivanovic>  ! [rejected]        1.11.10 -> 1.11.10 (already exists)
20140225 06:51:52< Ivanovic> error: failed to push some refs to 'git@github.com:wesnoth/wesnoth-old.git'
20140225 06:51:53< Ivanovic> hint: Updates were rejected because the tag already exists in the remote.
20140225 06:52:47< Ivanovic> shadowm: the potential mentors are listed here: http://wiki.wesnoth.org/SoC_Information_for_Google#How_many_potential_mentors_do_you_have_for_this_year.27s_program.3F_What_criteria_did_you_use_to_select_them.3F.2A
20140225 06:53:45-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20140225 06:54:15-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has joined #wesnoth-dev
20140225 07:01:39-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20140225 07:04:28-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140225 07:12:20< lipkab> thunderstruck: Good question :P The MP stats task is the closest to my area of expertise, and actually I wrote a patch implementing one of the suggested features years ago, though it was never applied.
20140225 07:13:30< lipkab> On the other hand, I've been secretly preparing to work on the SDL2 transition some weeks already when mordante announced his intention to do so.
20140225 07:14:15< lipkab> (No, mordante, I don't yet have any usable patches)
20140225 07:15:08< lipkab> And on the third hand, the sprite sheet idea has been sitting somewhere in my endless for quite a long time.
20140225 07:15:19< lipkab> *endless todo list
20140225 07:16:47< lipkab> And besides that, I have my own ideas, although I'm not sure who could mentor those.
20140225 07:17:33< lipkab> Maybe I'll just file 4 applications and let the wise mentors decide what should I work on, if any.
20140225 07:17:40< lipkab> :P
20140225 07:25:26-!- trademark_ [~trademark@nsg93-8-88-175-59-164.fbx.proxad.net] has quit [Ping timeout: 246 seconds]
20140225 07:45:56< shadowm> Ivanovic: What does git show 1.11.10 show?
20140225 08:03:39-!- chris__ [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev
20140225 08:03:49-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 244 seconds]
20140225 08:04:03-!- chris__ is now known as iceiceice_
20140225 08:04:15< iceiceice_> are there any preferred profiling tools to use with wesnoth?
20140225 08:04:22< iceiceice_> i didn't notice anything in the tools section in the repo
20140225 08:05:11-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140225 08:05:34< iceiceice_> i have a theory that a large portion of the bottleneck of carrying out quick replays is the recalculation of the visibility maps at every turn
20140225 08:13:43-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140225 08:22:58-!- knotwork [~markm@unaffiliated/knotwork] has joined #wesnoth-dev
20140225 08:24:50-!- kex [~kex@78.157.29.205] has quit [Ping timeout: 264 seconds]
20140225 08:29:04-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Quit: Vannak idők, mikor menni kell]
20140225 08:35:26-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 246 seconds]
20140225 08:39:36-!- LordNasty [~NaSTy@93-43-144-31.ip92.fastwebnet.it] has quit [Ping timeout: 240 seconds]
20140225 08:40:07-!- LordNasty [~NaSTy@93-43-144-31.ip92.fastwebnet.it] has joined #wesnoth-dev
20140225 08:40:41-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer]
20140225 08:40:48-!- Yukiria [~chatzilla@124.109.10.167] has joined #wesnoth-dev
20140225 08:41:06-!- Yukiria is now known as vultraz
20140225 08:45:01-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20140225 08:53:51-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Remote host closed the connection]
20140225 08:53:52-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev
20140225 08:53:59-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20140225 09:08:26-!- Crab_ [~Crab_@wesnoth/developer/crab] has quit [Quit: Crab_]
20140225 09:09:48-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev
20140225 09:14:13-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has joined #wesnoth-dev
20140225 09:43:04-!- Coffee_irc [~david@ppp118-210-3-133.lns20.adl2.internode.on.net] has joined #wesnoth-dev
20140225 09:45:00-!- irker200 [~irker@ai0867.net] has quit [Quit: transmission timeout]
20140225 10:06:46-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140225 10:12:28-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 244 seconds]
20140225 10:26:02-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20140225 10:35:16-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit []
20140225 10:40:32-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20140225 10:46:24-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140225 11:08:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140225 11:12:59-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 11:14:17-!- kex [~kex@89.205.75.19] has quit [Read error: Connection reset by peer]
20140225 11:14:19-!- Kexoth [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 11:17:59-!- Octalot [~noct@31.185.149.167] has joined #wesnoth-dev
20140225 11:36:15-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev
20140225 11:44:39-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!]
20140225 12:21:31-!- Kexoth [~kex@89.205.75.19] has quit [Remote host closed the connection]
20140225 12:22:05-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 12:22:07-!- kex [~kex@89.205.75.19] has quit [Remote host closed the connection]
20140225 12:22:24-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 12:39:14-!- kex [~kex@89.205.75.19] has quit [Remote host closed the connection]
20140225 12:39:50-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 12:44:51-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 272 seconds]
20140225 12:53:39-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 240 seconds]
20140225 12:55:15-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 13:03:38-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 240 seconds]
20140225 13:05:16-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 13:10:19-!- exciton_ [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 13:12:38-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 240 seconds]
20140225 13:20:34-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev
20140225 13:27:53-!- mjs-de [~mjs-de@f048144011.adsl.alicedsl.de] has joined #wesnoth-dev
20140225 13:42:01-!- exciton_ [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 13:42:16-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 13:49:03-!- sachith500 [~kvirc@112.135.55.111] has joined #wesnoth-dev
20140225 13:50:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 13:50:15-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 13:53:21-!- sachith500|2 [~kvirc@61.245.163.14] has joined #wesnoth-dev
20140225 13:54:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 13:55:15-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 13:56:25-!- sachith500 [~kvirc@112.135.55.111] has quit [Ping timeout: 272 seconds]
20140225 14:01:51-!- cib0 [~cib@p5DD21670.dip0.t-ipconnect.de] has joined #wesnoth-dev
20140225 14:03:39-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 240 seconds]
20140225 14:05:16-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 14:10:00-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 14:10:17-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 14:12:25-!- mattsc [~mattsc@207.230.251.234] has joined #wesnoth-dev
20140225 14:12:29-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 14:17:38-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 264 seconds]
20140225 14:19:58-!- Octalot [~noct@31.185.149.167] has quit [Write error: Broken pipe]
20140225 14:19:58-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Write error: Broken pipe]
20140225 14:23:06-!- stikonas [~gentoo@maths-pgs-002.maths.ed.ac.uk] has joined #wesnoth-dev
20140225 14:23:06-!- stikonas [~gentoo@maths-pgs-002.maths.ed.ac.uk] has quit [Changing host]
20140225 14:23:06-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140225 14:27:14-!- Coffee_irc [~david@ppp118-210-3-133.lns20.adl2.internode.on.net] has quit [Ping timeout: 264 seconds]
20140225 14:30:23-!- exciton_ [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 14:34:08-!- exciton [chuck-the-@89.208.170.132] has quit [Ping timeout: 240 seconds]
20140225 14:50:01-!- exciton_ [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 14:50:16-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 14:52:04-!- stikonas_ [~gentoo@129.215.155.83] has joined #wesnoth-dev
20140225 14:52:04-!- stikonas_ [~gentoo@129.215.155.83] has quit [Changing host]
20140225 14:52:04-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140225 14:53:24-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Write error: Broken pipe]
20140225 14:54:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 15:07:11-!- mattsc [~mattsc@207.230.251.234] has quit [Quit: Computer's napping]
20140225 15:26:56-!- mattsc [~mattsc@fw.hia.nrc.ca] has joined #wesnoth-dev
20140225 15:41:10-!- sachith500 [~kvirc@112.135.55.111] has joined #wesnoth-dev
20140225 15:44:11-!- sachith500|2 [~kvirc@61.245.163.14] has quit [Ping timeout: 246 seconds]
20140225 16:00:40-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 16:05:37-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 272 seconds]
20140225 16:08:35-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 16:14:34-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 16:21:55-!- kex [~kex@89.205.75.19] has quit [Remote host closed the connection]
20140225 16:25:19-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 16:38:27-!- serados [Junwei@nusnet-186-95.dynip.nus.edu.sg] has joined #wesnoth-dev
20140225 16:41:42-!- serados [Junwei@nusnet-186-95.dynip.nus.edu.sg] has quit [Client Quit]
20140225 16:46:13-!- serados [Junwei@nusnet-186-95.dynip.nus.edu.sg] has joined #wesnoth-dev
20140225 16:47:42-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140225 16:52:26-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 264 seconds]
20140225 16:58:22-!- noy_ [~Noy@209.153.242.114] has joined #wesnoth-dev
20140225 16:58:22-!- noy_ [~Noy@209.153.242.114] has quit [Changing host]
20140225 16:58:22-!- noy_ [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20140225 16:58:34-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 16:58:49-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 272 seconds]
20140225 16:58:49-!- noy_ is now known as noy
20140225 17:07:14-!- sachith500 [~kvirc@112.135.55.111] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
20140225 17:18:25-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20140225 17:31:55-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Quit: Disconnecting from stoned server.]
20140225 17:32:26-!- Ivanovic [~ivanovic@x2f51877.dyn.telefonica.de] has joined #wesnoth-dev
20140225 17:34:24-!- ozzbI [05a4ddb4@gateway/web/freenode/ip.5.164.221.180] has joined #wesnoth-dev
20140225 17:36:47-!- ozzbI [05a4ddb4@gateway/web/freenode/ip.5.164.221.180] has quit [Client Quit]
20140225 17:43:37-!- SlowThinker [~SlowThink@207.69.broadband2.iol.cz] has joined #wesnoth-dev
20140225 17:50:03-!- mattsc [~mattsc@fw.hia.nrc.ca] has quit [Quit: Ciao]
20140225 17:50:17-!- SlowThinker [~SlowThink@207.69.broadband2.iol.cz] has left #wesnoth-dev []
20140225 18:00:14-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 264 seconds]
20140225 18:06:42-!- DCW [~Thunderbi@cpc1-finc14-2-0-cust12.4-2.cable.virginm.net] has joined #wesnoth-dev
20140225 18:14:25-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 18:21:05-!- Fortescue [sid1929@gateway/web/irccloud.com/x-rlifyijoomuwmolk] has quit [Ping timeout: 279 seconds]
20140225 18:24:14-!- Fortescue [sid1929@gateway/web/irccloud.com/x-watwlswjmppnlruc] has joined #wesnoth-dev
20140225 18:26:52-!- Ivanovic [~ivanovic@x2f51877.dyn.telefonica.de] has quit [Changing host]
20140225 18:26:52-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20140225 18:28:05-!- Velensk [~Velensk@cpe-75-187-86-211.woh.res.rr.com] has joined #wesnoth-dev
20140225 18:28:10< Ivanovic> shadowm: it now shows me the tag i tried to commit which it did not allow me to push
20140225 18:28:48< Ivanovic> at least it fails when trying "git push --tags"
20140225 18:28:49< Velensk> Does anyone know where I can find a list of the numerical priorities for the CA AI stages? I would like to know so that I can tune a micro AI
20140225 18:31:36< AI0867> Ivanovic: yeah, you'd have to force push. The question is whether you should do so
20140225 18:31:38-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20140225 18:31:59< Ivanovic> AI0867: i guess when forcing the push i might again be able to destroy 500 things, right?
20140225 18:33:33< AI0867> Velensk: data/core/macros/ai_candidate_actions.cfg
20140225 18:33:44< Velensk> thank you
20140225 18:34:04< AI0867> Ivanovic: well, if you git push --tags --force, that should only push the tags, but it'll still cause conflicts for people who have already pulled
20140225 18:34:56< AI0867> the best options I think are 1) not doing anything or 2) adding a tag with a different name
20140225 18:42:54-!- DCW [~Thunderbi@cpc1-finc14-2-0-cust12.4-2.cable.virginm.net] has quit [Quit: DCW]
20140225 18:50:02-!- iceiceice_ [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Ping timeout: 264 seconds]
20140225 18:52:29< _8680_> The existing tag could also be deleted from the upstream repository, but that could still make pulling messy, though there would be less risk of data loss.
20140225 18:53:15< _8680_> (`git push <remote> :1.11.10`)
20140225 18:54:05-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 272 seconds]
20140225 18:56:02-!- boucman_work [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 18:58:07< Velensk> I hope that it is in the plans for the next stable version to include a units alignment somewhere in the information panel.
20140225 19:00:43-!- werlley [~werlley@179.124.130.66] has joined #wesnoth-dev
20140225 19:03:04< werlley> hi my name is werlley took interest SoC_Ideas_SpriteSheets2014 is my first time GSOS, how do I take part?
20140225 19:06:56-!- mattsc [~mattsc@fw.hia.nrc.ca] has joined #wesnoth-dev
20140225 19:07:25-!- werlley_ [b37c8242@gateway/web/freenode/ip.179.124.130.66] has joined #wesnoth-dev
20140225 19:07:31< werlley_> hi??
20140225 19:08:09-!- werlley_ [b37c8242@gateway/web/freenode/ip.179.124.130.66] has quit [Client Quit]
20140225 19:08:32< zookeeper> werlley, things move slowly here. be patient and eventually someone will say something. :p
20140225 19:10:19-!- boucman_work [~rosen@wesnoth/developer/boucman] has quit [Ping timeout: 244 seconds]
20140225 19:11:02-!- iceiceice_ [~chris@207-237-132-90.ny.subnet.cable.rcn.com] has joined #wesnoth-dev
20140225 19:12:54< werlley> lol. I'm a little nervous the first time is tricky lol I really want to participate : (
20140225 19:15:00< werlley> but Zookeeper, you part of the dev? Do they come in contact to put my email? or so is the IRC?
20140225 19:15:26< zookeeper> this channel is where you want to be
20140225 19:16:14< werlley> ok
20140225 19:16:29< zookeeper> and yes, i'm one of the developers but i've never handled anything regarding GSoC
20140225 19:18:33-!- Crendgrim_ is now known as Crendgrim
20140225 19:19:55-!- stikonas [~gentoo@cpc18-sgyl27-2-0-cust35.18-2.cable.virginm.net] has joined #wesnoth-dev
20140225 19:19:55-!- stikonas [~gentoo@cpc18-sgyl27-2-0-cust35.18-2.cable.virginm.net] has quit [Changing host]
20140225 19:19:55-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140225 19:21:08-!- mordante [~mordante@roadie.xs4all.nl] has joined #wesnoth-dev
20140225 19:21:08-!- mordante [~mordante@roadie.xs4all.nl] has quit [Changing host]
20140225 19:21:08-!- mordante [~mordante@wesnoth/developer/mordante] has joined #wesnoth-dev
20140225 19:21:23< mordante> servus
20140225 19:21:27< mordante> nice to see we're in GSoC again :-)
20140225 19:21:56< mordante> let's hope tonight I can join as mentor, without resupplying all information :-/
20140225 19:24:55< mordante> lipkab what kind of work did you do on SDL2?
20140225 19:25:12< mordante> lipkab, I'd like to see your own GSoC ideas
20140225 19:26:09< werlley> I'm a student in Bachelor of Computer Science, how do I participate in SoC_Ideas_SpriteSheets2014?
20140225 19:26:38< mordante> werlley, in IRC it's common that it takes a while before people answer ;-)
20140225 19:27:09< mordante> werlley, but you're lucky, I wrote the sprite sheet idea
20140225 19:27:36< werlley> ok lol 
20140225 19:27:37< mordante> werlley, did you read our wiki regarding GSoC?
20140225 19:28:57< werlley> yes, but I identified more with SoC Ideas SpriteSheets2014
20140225 19:32:02< werlley> sending the questionnaire to whoever it?
20140225 19:33:50< mordante> werlley, I meant this page http://wiki.wesnoth.org/SoC2014_Template_of_Student_page is should explain how to answer the questionnaire
20140225 19:34:13< mordante> in short we like a wiki page with your proposal and the answers to your questions
20140225 19:34:21-!- Delfinisko [~Delfinisk@ip-85.163.35.209.o2inet.sk] has joined #wesnoth-dev
20140225 19:34:39< mordante> once the application process in Google starts you can copy the information there 
20140225 19:35:05< mordante> but by adding it in the wiki now it's easier to discuss your proposal
20140225 19:36:31< mordante> also we like students to work on some patches so they can familiarise themselves with the codebase
20140225 19:38:25< werlley> then I have to create an account and make a wiki of my resume?
20140225 19:40:54< Ivanovic> werlley: you don't have to enter the personal information in the wiki for everybody to see
20140225 19:41:14< Ivanovic> but the proposal itself (with deliverables/milestones) and the timetable needs to be in the wiki
20140225 19:41:32< Ivanovic> and it should evolve over the next weeks based on discussions taking place in here and you getting a better idea about wesnoth
20140225 19:44:41< werlley> ok
20140225 19:45:06< mordante> who is Chris Beck on IRC?
20140225 19:45:19< _8680_> mordante: iceiceice.
20140225 19:46:29< mordante> iceiceice_, is the blindfold code a new feature in master? We are in a feature freeze
20140225 19:47:05< iceiceice_> no it was committed before feature freeze, the commits since are just bug fix
20140225 19:47:52< mordante> iceiceice_, oke, the description of 2cf867aa371a1457bb0005f4adca3ef95c306b09 was really confusing
20140225 19:48:19-!- somzzz [~somzzz@188.26.40.102] has joined #wesnoth-dev
20140225 19:48:55< iceiceice_> let me have a look 
20140225 19:49:31< iceiceice_> ah i see
20140225 19:49:39< iceiceice_> yeah if you only look at that commit message in isolation it would be confusing
20140225 19:50:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 19:50:02< iceiceice_> so prior to this there was a boolean flag for the blindfold,
20140225 19:50:15-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 19:50:26< iceiceice_> but it creates bugs to do it that way, so i made it reentrant and created a "locker" object which is the blindfold struct,
20140225 19:50:39< iceiceice_> essentially isomorphic to the "update_locker" for the Cvideo object
20140225 19:51:07< iceiceice_> this guarantees that if someone quits the game or there is an error or something, the display actually does get unlocked
20140225 19:51:20< mordante> of course that would have been better information in the commit message ;-)
20140225 19:51:39< iceiceice_> yeah or even if i had just added "instead of the previous system"
20140225 19:51:43-!- mordante_ [~mordante@wesnoth/developer/mordante] has joined #wesnoth-dev
20140225 19:51:51-!- mordante_ [~mordante@wesnoth/developer/mordante] has quit [Client Quit]
20140225 19:51:52< iceiceice_> i guess there is no way to amend the commit message now?
20140225 19:52:03< mordante> no not after pushing
20140225 19:52:13< iceiceice_> maybe i'll put it as a coment on github then to that commit?
20140225 19:52:39< iceiceice_> maybe i'll just paste this whole little exchange there actually
20140225 19:52:45< Delfinisko> :)
20140225 19:52:58< mordante> if that's possible I only use GitHub to get my code
20140225 19:53:19< iceiceice_> yeah so if u go to the web entry for hte commit: https://github.com/wesnoth/wesnoth-old/commit/2cf867aa371a1457bb0005f4adca3ef95c306b09
20140225 19:53:26< iceiceice_> i guess we can have little comments there
20140225 19:54:18< mordante> cant' hurt
20140225 19:54:23< mordante> thanks for the info
20140225 19:56:01-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 19:56:15-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 19:56:24-!- boucman [~rosen@2a02-8428-034f-f800-92e6-baff-fe93-a07d.rev.sfr.net] has joined #wesnoth-dev
20140225 19:56:24-!- boucman [~rosen@2a02-8428-034f-f800-92e6-baff-fe93-a07d.rev.sfr.net] has quit [Changing host]
20140225 19:56:24-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 19:59:00-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20140225 19:59:46-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has joined #wesnoth-dev
20140225 20:01:01< Delfinisko> it is so nice, to continue a campaign after several years :)
20140225 20:01:08-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20140225 20:01:15-!- exciton [chuck-the-@89.109.219.164] has joined #wesnoth-dev
20140225 20:01:32< Delfinisko> anyone bored enough for some feedback? :)
20140225 20:01:48-!- Crab_ [~Crab_@wesnoth/developer/crab] has quit [Quit: Crab_]
20140225 20:04:11< _8680_> iceiceice_: You could add it as a note on the commit: `git notes add 2cf867aa371a1457bb0005f4adca3ef95c306b09`.
20140225 20:04:22-!- mattsc [~mattsc@fw.hia.nrc.ca] has quit [Quit: Computer's napping]
20140225 20:04:55< _8680_> That should open a text editor, as for commit messages.
20140225 20:05:08-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20140225 20:05:08< iceiceice_> i see, i was just going to ask how that worked
20140225 20:05:37< mordante> I'm off bye
20140225 20:05:49-!- mordante [~mordante@wesnoth/developer/mordante] has quit [Quit: Leaving]
20140225 20:05:54-!- mattsc [~mattsc@fw.hia.nrc.ca] has joined #wesnoth-dev
20140225 20:06:32-!- irker175 [~irker@ai0867.net] has joined #wesnoth-dev
20140225 20:06:32< irker175> wesnoth: Chris Beck wesnoth-old:master bab03d554bea / src/playsingle_controller.cpp: Turn dialog used for hotseat mp games now applies a blindfold http://git.io/xd1NLQ
20140225 20:06:34< irker175> wesnoth: Chris Beck wesnoth-old:master 2c201a162639 / / (6 files in 4 dirs): Merge branch 'master' of https://github.com/wesnoth/wesnoth-old http://git.io/OaMi9Q
20140225 20:07:21< werlley> I am Brazilian (Portuguese native speak), could translate to Portuguese, this would greatly help to spread the game, what do you think?
20140225 20:08:22< iceiceice_> uhhh
20140225 20:08:37< iceiceice_> i think i did something i shouldn't have... i thought my master was synced with upstream but apparently i had something on it?
20140225 20:09:27< _8680_> If you thought you had nothing to push, why did you push?
20140225 20:09:49< iceiceice_> i thought i only had the note
20140225 20:10:32< iceiceice_> here's my terminal: 
20140225 20:11:09< iceiceice_> http://pastebin.com/jLFF9m3A
20140225 20:12:21< zookeeper> werlley, you can help the portuguese translation, yes.
20140225 20:12:54< _8680_> Okay. My guess is that your local master branch originates from origin, not upstream, so `git status` only diffed master with origin/master.
20140225 20:13:07< iceiceice_> oh i see
20140225 20:13:19< werlley> :) yup
20140225 20:13:56< iceiceice_> hmm...
20140225 20:14:22< iceiceice_> i should perhaps just stick to PRs, it seems much easier to check what i'm going to push before i do it when i use PRs
20140225 20:14:31< _8680_> If you want, you could change that with… `git config branch.master.remote upstream`.
20140225 20:14:32< iceiceice_> or learn to use status correctly
20140225 20:14:48< iceiceice_> so more importantly, should we reset HEAD^1 to try to fix this?
20140225 20:15:06< iceiceice_> i guess that's not proper on wesnoth-old
20140225 20:15:13< iceiceice_> idk whats the best thing to do now
20140225 20:15:17< _8680_> In upstream? I’d say no, and I expect the people in authority would too.
20140225 20:15:55< iceiceice_> hmm is git revert what i want then? 
20140225 20:15:58< _8680_> Did you break something or violate policy with your accidental push?
20140225 20:16:05< zookeeper> free tip: git's too hard. :p
20140225 20:16:41< iceiceice_> i actually really like git, i just have been doing it the "training wheels" way using github PRs instead of actually pushing to wesnoth-old in command line
20140225 20:17:01< iceiceice_> so it looks like i possibly changed 3 unrelated files,
20140225 20:17:06< iceiceice_> in changelog, eastern invasion...
20140225 20:17:22< iceiceice_> i'm not sure what happened here, maybe this has something to do with the earlier force push that happened that i read about on forum?
20140225 20:17:35< iceiceice_> i didnt modify any of those files myself
20140225 20:18:15< iceiceice_> but this is now the most recent commit: https://github.com/wesnoth/wesnoth-old/commit/2c201a162639b54f58e441f53edec4198edfc7d3
20140225 20:18:15< _8680_> The increased conceptual complexity of DVCSs over the older centralized model does, I think, incur a somewhat steeper learning curve, but I don’t think it’s really “too” hard.
20140225 20:19:46< _8680_> iceiceice_: Sticking to pull requests should not be a problem at all, indeed, it’s more the “Git way” than committing directly to a central master branch.
20140225 20:20:01< iceiceice_> tbh, i really really like git, i guess it is common to advise others to be wary of git proselytizers, but i'm going to put my cards on the table. git rebase has completely changed the way i think about coding, and i have not only drank the coolaid but now i mix up cauldrons at my house for personal private consumption XD
20140225 20:21:12< iceiceice_> _8680_: i think i will try to stick to that mainly, as i really find it so easy to look at the diffs on github
20140225 20:22:19< iceiceice_> ok so here's my question.
20140225 20:22:34< iceiceice_> did i actually push those changes or is the github interface just attaching my note to some other commit?
20140225 20:23:23< iceiceice_> actually,
20140225 20:23:26< iceiceice_> why did my push become a merge?
20140225 20:23:36< iceiceice_> i think i have completely misunderstood what happened --
20140225 20:23:52< iceiceice_> the EI changes and changelog etc. were earlier commits by others, not thing that i pushed,
20140225 20:24:00< iceiceice_> but by pushing master i created a merge of things that were separate?
20140225 20:24:37 * zookeeper is a git hater
20140225 20:24:40< zookeeper> there's my cards
20140225 20:25:15< iceiceice_> ohh i see
20140225 20:25:23< iceiceice_> i think i have accidentally merged a topic branch somehow
20140225 20:25:38< _8680_> If you had unpushed changes on your local master, and pulled changes into it from upstream master, than those differing histories of development would have needed to be merged, yes.
20140225 20:26:11< _8680_> If you don’t want Git to automatically merge when you pull like that, use the --ff-only switch on `git pull`.
20140225 20:26:43< _8680_> I have a `git ffpull` alias for this (`git config --global alias.ffpull 'pull --ff-only'`).
20140225 20:27:23 * _8680_ likes DVCSs, and considers the bit of extra complexity worthwhile, there’s my cards.
20140225 20:28:00< iceiceice_> ok so actually what happened here is i messed up on my local repo some time ago
20140225 20:28:37< mattsc> Velensk: around?
20140225 20:28:39< iceiceice_> i had a topic branch, which normally i would have pushed to origin and made into a PR
20140225 20:29:05< zookeeper> _8680_, yeah, i just think that for example this discussion is the perfect demonstration of why it's not just a "bit" ;)
20140225 20:29:13< iceiceice_> but i decided instead to push the topic branch to a matching topic branch on wesnoth-old, since i thought someone else might want to work on it
20140225 20:29:26< iceiceice_> and it wont be committed at least until after feature freee
20140225 20:29:29< iceiceice_> *freeze
20140225 20:29:46< iceiceice_> so i think that worked a few days ago, I could see it in the github interface and everything looked right
20140225 20:29:58< iceiceice_> but i think somehow later on, or perhaps just now? i merged it into my master by accident
20140225 20:30:31< Velensk> mattsc: I'm back
20140225 20:31:12< mattsc> Velensk: hi - just saw your post on the MAIs and since I don't know Salt Wars, I figure I ask you some questions before replying.
20140225 20:31:27< Velensk> fair enough
20140225 20:31:37< iceiceice_> the topic branch actually only had 2 lines, i think i shoudl just delete them and push it back to wesnoth-old and it will be fine
20140225 20:32:07-!- Delfinisko [~Delfinisk@ip-85.163.35.209.o2inet.sk] has quit [Quit:  HydraIRC -> http://www.hydrairc.com <- The professional IRC Client :D]
20140225 20:32:26< mattsc> Velensk: First, the error you encountered: is the error message about l.67 in ca_messenger_move.lua ? 
20140225 20:32:38< _8680_> If you committed something you shouldn’t have, and you want to “un-commit” it, and it’s not in a personal branch/repository (in which case force-pushing it away should be fine), then `git revert` is the proper way to undo a commit.
20140225 20:32:51< iceiceice_> ok
20140225 20:33:06< Velensk> mattsc: No, it was about sending a bad arguement
20140225 20:33:38< Velensk> I'd have to recreate it to tell you what exactly it said
20140225 20:33:44< iceiceice_> i'm going to find a guide on git revert so i dont eff this up :)
20140225 20:33:59< _8680_> `git help revert`
20140225 20:34:19< Velensk> something about __index
20140225 20:34:20< mattsc> Velensk: okay, well, from what you describe it is probably about an invalid argument caused by that line in the code.
20140225 20:34:26< mattsc> Yes, that's it ...
20140225 20:35:13< mattsc> Velensk: so that has nothing to do with there being several units with the same id, it's a bug in the code (that I am aware of for about 12 hours now).
20140225 20:37:04< Velensk> mattsc: I would in general wish to avoid giving multiple units ids if possible but it works alright for now. But in any case, this sounds like something I can't really fix. Is there something that could be done about the message?
20140225 20:37:42< mattsc> I've fixed it already, but that doesn't help the player, of course.  I don't think there's a way of working around it either.
20140225 20:37:42< mattsc> Velensk: As for your question about which other MAI might work, since I don't know the scenario, I can't really say.  The Goto MAI, maybe?
20140225 20:38:28< Velensk> That was the first one I tried, the problem is that it doesn't cause the escourt to guard the convoys so they charge the player.
20140225 20:38:48< irker175> wesnoth: Chris Beck wesnoth-old:master 1dcef7f8a359 / src/playsingle_controller.cpp: Revert "Merge branch 'master' of https://github.com/wesnoth/wesnoth-old" http://git.io/IiuHJg
20140225 20:40:07< iceiceice_> ok i think it is all good now
20140225 20:40:58< Velensk> mattsc: To describe the scenario: The player starts in the middle of the map in a knot of rough terrain. At the north and south ends of the map are heavilly guarded cities (that arn't worth attacking). There's a river on the left, and a road that goes around the rough terrain on the east side. Caravan units are spawned in the north and want to go to the south. Guards are spawned to protect them. The player must try to kill the conv
20140225 20:40:58< Velensk> oys. There is more but that's the basic idea.
20140225 20:41:19-!- exciton [chuck-the-@89.109.219.164] has quit [Read error: Connection reset by peer]
20140225 20:41:20-!- fabi_ [~fabi@wesnoth/developer/fendrin] has quit [Read error: Connection reset by peer]
20140225 20:41:45< Velensk> the road is the fastest path for the convoys
20140225 20:42:27-!- fabi__ [~fabi@88-134-21-163-dynip.superkabel.de] has joined #wesnoth-dev
20140225 20:42:27-!- fabi__ [~fabi@88-134-21-163-dynip.superkabel.de] has quit [Changing host]
20140225 20:42:27-!- fabi__ [~fabi@wesnoth/developer/fendrin] has joined #wesnoth-dev
20140225 20:42:29< mattsc> The Messenger MAI was meant for a single messenger with accompanying units, rather than moving multiple units.  That can be changed in the code, of course, but we're in a feature freeze now, so not until 1.13/1.14
20140225 20:42:31< mattsc> You could press ctrl-x to clear it ...
20140225 20:42:31< mattsc> Velensk: I'll have it fixed in 1.11.11, which is likely not far off
20140225 20:42:32< mattsc> Velensk: well, I guess, you could copy the MAI code into your campaign, fix the bug in it, and use that.
20140225 20:42:32< mattsc> Velensk: so should the caravans move straight to a specific part of the map?
20140225 20:43:28< mattsc> Oh, and I guess now that we're done talking about bugs in mainline, we should probably take this over to #wesnoth-umc-dev, if you want to continue.
20140225 20:44:02< Velensk> mattsc: alright I'll finish out there
20140225 20:45:10-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has joined #wesnoth-dev
20140225 20:45:15-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20140225 20:55:20-!- Spoffy [~chatzilla@152.78.175.8] has joined #wesnoth-dev
20140225 20:57:43< irker175> wesnoth: Nils Kneuper wesnoth-old:master c77f8a2d9299 / / (9 files in 8 dirs): updated Slovak translation http://git.io/Vezy7A
20140225 20:57:45< irker175> wesnoth: Nils Kneuper wesnoth-old:master 8fddbe13a57b / players_changelog: fixed players_changelog style http://git.io/1X0bUA
20140225 20:57:47< irker175> wesnoth: Nils Kneuper wesnoth-old:master 954eb7b287fe / players_changelog: another fix... http://git.io/6EDuUQ
20140225 20:59:29-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 21:06:51< lipkab> mordante: Most of my effort went into familiarizing with SDL2's texture renderer and planning the strategy to convert Wesnoth's rendering engine to it. I haven't really looked into event handling and audio yet.
20140225 21:08:37< lipkab> I was just about starting to write up a list of tasks for the conversion when you stepped in.
20140225 21:10:21< lipkab> As for my own ideas: 1) I'd like to implement a touchscreen UI, but the SDL2 move is a prerequisite for that so that's not for GSoC.
20140225 21:12:12< lipkab> 2) Better organization of savegames. You could have savegame folders, and saves from separate campaign playthroughs could go to separate folders, etc. Also add an option to download replays from replays.w.o.
20140225 21:15:28< lipkab> 3) Optimized loading time. I believe that a parallelized WML preprocessor and/or storing files in (big) archives could have a positive impact on loading time, but I might be mistaken about that. (Haven't done any profiling yet, so actually I have only ideas about what makes Wesnoth load so slow).
20140225 21:16:31< lipkab> Out of those, I think 2) could be a decent GSoC project, but I don't know who would mentor it.
20140225 21:16:52< lipkab> (That's why I didn't put it on the ideas list.)
20140225 21:25:20< mattsc> Ivanovic, shadowm or whoever else knows this: stupid question: on OS X, the path to the user directory is some_path/Wesnoth_1.11/ (set in an obscure location in the Xcode project that Alarantalara pointed me to).  When should that be changed to Wesnoth_1.12/ ?
20140225 21:29:08-!- Gambit [~derek@wesnoth/developer/grickit] has joined #wesnoth-dev
20140225 21:41:05-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev
20140225 22:00:55< shadowm> mattsc: I'd say for 1.12.0.
20140225 22:01:09< shadowm> That is between RC 1 and gold, not after gold.
20140225 22:01:19< shadowm> Last-minute changes always end badly.
20140225 22:01:39-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20140225 22:01:46< mattsc> shadowm: okay, sounds good.  I was just wondering since the add-ons server has already been changed.
20140225 22:02:12< shadowm> On X11 Wesnoth still uses 1.11 because those are the first two numbers of the version number for now.
20140225 22:02:59< mattsc> shadowm: no, actually, that's what I would have expected too, but that's not the reason.  It's hard-coded in the Xcode project.
20140225 22:03:36-!- kex [~kex@89.205.75.19] has quit [Remote host closed the connection]
20140225 22:03:42< mattsc> Oh, sorry, on X11...  Misread.
20140225 22:04:27< Spoffy> Has there been much interest in Wesnoth for SoC? :)
20140225 22:11:59-!- Velensk [~Velensk@cpe-75-187-86-211.woh.res.rr.com] has quit [Quit: Leaving]
20140225 22:23:44-!- lipkab [~the_new_l@host-91-147-212-189.biatv.hu] has quit [Quit: Vannak idők, mikor menni kell]
20140225 22:24:28-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has quit [Quit: leaving]
20140225 22:25:42-!- somzzz [~somzzz@188.26.40.102] has quit []
20140225 22:25:54-!- somzzz [~somzzz@188.26.40.102] has joined #wesnoth-dev
20140225 22:26:24< happygrue> Spoffy: some that I have seen
20140225 22:27:23< happygrue> which reminds me, is http://wiki.wesnoth.org/SoC2014_Template_of_Student_page  the same as an application, or is there some other work we need interested students to do as well to make themselves offical?
20140225 22:30:33-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20140225 22:30:41-!- cib0 [~cib@p5DD21670.dip0.t-ipconnect.de] has quit [Ping timeout: 272 seconds]
20140225 22:30:42< happygrue> (officially interested, that is)
20140225 22:30:48< Spoffy> happygrue: Thanks. I was looking at the UMCD possibly :P
20140225 22:31:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 244 seconds]
20140225 22:31:50-!- stikonas_ [~gentoo@anon-38-183.vpn.ipredator.se] has joined #wesnoth-dev
20140225 22:31:50-!- stikonas_ [~gentoo@anon-38-183.vpn.ipredator.se] has quit [Changing host]
20140225 22:31:50-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20140225 22:32:35< happygrue> looks like mordante and trademark are not around just now, but emailing trademark (email at the bottom of the idea page) looks like a good next step if you have questions about it.  Or just lurking is fine too
20140225 22:33:01< happygrue> Spoffy: if you want to checkout stuff you can look at this:  http://wiki.wesnoth.org/WesnothRepository
20140225 22:33:27< happygrue> and just ask any questions you have here and someone will get to them eventually.  I'm off for a bit
20140225 22:35:43< Spoffy> Alright, lurking always suits me! Thanks for the help happygrue.
20140225 22:38:57-!- trewe [~trewe@50.229.137.78.rev.vodafone.pt] has joined #wesnoth-dev
20140225 22:41:24< Spoffy> Heading out, thanks for the info guys,]
20140225 22:42:42-!- Spoffy [~chatzilla@152.78.175.8] has quit [Quit: ChatZilla 0.9.90.1 [Firefox 27.0.1/20140212131424]]
20140225 22:43:01-!- cib0 [~cib@p5DD21670.dip0.t-ipconnect.de] has joined #wesnoth-dev
20140225 22:46:26-!- werlley [~werlley@179.124.130.66] has quit [Quit: Leaving]
20140225 22:56:39-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 272 seconds]
20140225 23:15:45-!- somzzz [~somzzz@188.26.40.102] has left #wesnoth-dev []
20140225 23:48:07-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
20140225 23:49:55-!- mjs-de [~mjs-de@f048144011.adsl.alicedsl.de] has quit [Remote host closed the connection]
20140225 23:52:25-!- kex [~kex@89.205.75.19] has quit [Ping timeout: 244 seconds]
20140225 23:52:47-!- aquileia [5fd017e3@gateway/web/freenode/ip.95.208.23.227] has quit [Quit: Page closed]
20140225 23:54:11-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 246 seconds]
20140225 23:59:42-!- kex [~kex@89.205.75.19] has joined #wesnoth-dev
--- Log closed Wed Feb 26 00:00:43 2014