--- Log opened Wed Jul 06 00:00:41 2011
--- Day changed Wed Jul 06 2011
20110706 00:00:41< anonymissimus> I guess the "native" setting for the eol stly is a problem too then, isnt it; in case someone uses the same local svn repository using a win/Linux dual boot
20110706 00:01:23< anonymissimus> that's why I wonder whether iit might be better to set it to use LF only
20110706 00:03:35-!- Upth [~ogmar@public-nat1.scc.losrios.edu] has joined #wesnoth-dev
20110706 00:03:35-!- Upth is now known as Upthorn
20110706 00:15:34-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Quit: cronjob disabled]
20110706 00:20:05< anonymissimus> "This is still an issue if you are using msysgit for instance. You have to specify that autocrlf should be off when importing an SVN repo or you get 'changes' due to line endings being different."
20110706 00:20:24< anonymissimus> from here http://weierophinney.net/matthew/archives/191-git-svn-Tip-dont-use-core.autocrlf.html
20110706 00:21:03< anonymissimus> well I've not found "the" solution so far
20110706 00:22:25< anonymissimus> good luck xD
20110706 00:22:28-!- anonymissimus [~chatzilla@HSI-KBW-095-208-215-104.hsi5.kabel-badenwuerttemberg.de] has quit [Quit: ChatZilla 0.9.86.1 [Firefox 3.6.2/20100316074819]]
20110706 00:31:13-!- vultraz [~chatzilla@124.109.11.91] has quit [Ping timeout: 258 seconds]
20110706 00:32:18-!- Sytyi [~sytyi@23-208-133-95.pool.ukrtel.net] has quit [Ping timeout: 255 seconds]
20110706 00:39:37-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has quit [Quit: Computer has gone to sleep]
20110706 00:42:06-!- loonybot [~loonybot@wesnoth/bot/loonybot] has quit [Remote host closed the connection]
20110706 00:44:13-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110706 00:47:01-!- Appleman1234 [~Appleman1@emerch3.lnk.telstra.net] has joined #wesnoth-dev
20110706 00:49:16-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Quit: Leaving.]
20110706 01:09:12-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has joined #wesnoth-dev
20110706 01:09:12-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has quit [Client Quit]
20110706 01:26:24-!- Guest19132 is now known as Espreon
20110706 01:26:29-!- Espreon [~espreon@ai0867.net] has quit [Changing host]
20110706 01:26:30-!- Espreon [~espreon@wesnoth/developer/espreon] has joined #wesnoth-dev
20110706 01:28:35-!- Upthorn [~ogmar@public-nat1.scc.losrios.edu] has quit [Ping timeout: 260 seconds]
20110706 01:28:50-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has joined #wesnoth-dev
20110706 01:28:55-!- shadowm_laptop2 [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110706 01:29:26-!- Dragonking is now known as deekay
20110706 01:29:39-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has quit [Client Quit]
20110706 01:30:12-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Disconnected by services]
20110706 01:30:21-!- shadowm_laptop2 is now known as shadowm_laptop
20110706 01:43:05-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has joined #wesnoth-dev
20110706 02:18:19-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev
20110706 02:36:56-!- deekay [~dk@wesnoth/developer/dragonking] has quit [Quit: deekay]
20110706 02:42:09-!- atomicbomb [~quassel@125.161.23.22] has joined #wesnoth-dev
20110706 03:02:12-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has quit [Quit: Blueblaze]
20110706 03:03:55-!- Exasperation [4a47319b@gateway/web/freenode/ip.74.71.49.155] has quit [Quit: Page closed]
20110706 03:43:50-!- Upth [~ogmar@c-76-105-37-245.hsd1.ca.comcast.net] has joined #wesnoth-dev
20110706 03:43:50-!- Upth is now known as Upthorn
20110706 03:52:41-!- enchilado [~enchilado@ppp118-208-86-146.lns20.bne4.internode.on.net] has quit [Ping timeout: 240 seconds]
20110706 04:07:34-!- atomicbomb [~quassel@125.161.23.22] has quit [Remote host closed the connection]
20110706 04:09:58-!- atomicbomb [~quassel@180.246.188.42] has joined #wesnoth-dev
20110706 04:38:23-!- alkenrinnstet [~alkenrinn@spnp55078.spnp.nus.edu.sg] has joined #wesnoth-dev
20110706 04:53:49-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has joined #wesnoth-dev
20110706 04:59:08-!- Ivanovic_ [~ivanovic@dtmd-4db2344e.pool.mediaWays.net] has joined #wesnoth-dev
20110706 05:01:32-!- alkenrinnstet [~alkenrinn@spnp55078.spnp.nus.edu.sg] has quit [Quit: Leaving.]
20110706 05:03:12-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 276 seconds]
20110706 05:05:22-!- Ivanovic_ is now known as Ivanovic
20110706 05:13:17-!- tschmitz_ [626cdb95@gateway/web/freenode/ip.98.108.219.149] has joined #wesnoth-dev
20110706 05:15:56-!- alkenrinnstet [~alkenrinn@spnp55078.spnp.nus.edu.sg] has joined #wesnoth-dev
20110706 05:29:21-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has quit [Quit: ...]
20110706 05:37:09-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has quit [Quit: Blueblaze]
20110706 05:49:17< shadowmaster> why do I need two leaders for my team in SP LoW?
20110706 05:49:45-!- Gambit [~Gambit@wesnoth/developer/grickit] has quit [Read error: Connection reset by peer]
20110706 05:56:31< shadowmaster> three
20110706 06:01:21< shadowmaster> lol @ the music selection for LoW 1
20110706 06:03:41-!- alkenrinnstet [~alkenrinn@spnp55078.spnp.nus.edu.sg] has quit [Quit: Leaving.]
20110706 06:03:47-!- alkenrinnstet [~alkenrinn@spnp55078.spnp.nus.edu.sg] has joined #wesnoth-dev
20110706 06:08:11-!- alkenrinnstet [~alkenrinn@spnp55078.spnp.nus.edu.sg] has quit [Ping timeout: 258 seconds]
20110706 06:08:33< shadowmaster> what the hell
20110706 06:08:39< shadowmaster> breaking_the_chains.ogg is outdated
20110706 06:09:31< shadowmaster> ah, no. it's lotn that had another section added
20110706 06:15:14-!- enchilado [~enchilado@ppp118-208-137-145.lns20.bne1.internode.on.net] has joined #wesnoth-dev
20110706 06:22:45-!- enchilad1 [~enchilado@ppp118-208-190-150.lns20.bne4.internode.on.net] has joined #wesnoth-dev
20110706 06:25:26-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has joined #wesnoth-dev
20110706 06:26:24-!- enchilado [~enchilado@ppp118-208-137-145.lns20.bne1.internode.on.net] has quit [Ping timeout: 276 seconds]
20110706 06:30:03-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has quit [Ping timeout: 255 seconds]
20110706 06:37:31< shadowmaster> more lulz: Kalenz is loyal (to whom?)
20110706 06:50:14< Espreon> ... And why do I bother treating TSL like Hurd?
20110706 06:50:33< Rhonda> is it gnu tls?
20110706 06:50:52< Espreon> No.
20110706 06:50:53< Rhonda> uh, tsl, not tsl
20110706 06:50:57< Rhonda> bleah
20110706 06:51:01< Rhonda> tsl, not tls :)
20110706 06:51:02< Espreon> TSL's my campaign.
20110706 06:51:14< Espreon> Since it MUST be perfect... shadowmaster calls it my Hurd.
20110706 06:51:25< Rhonda> What's hurd in that context then?
20110706 06:51:51< Rhonda> ah, makes sense.
20110706 06:51:56< Rhonda> So it will never release?
20110706 06:52:01< Espreon> Yup.
20110706 06:52:06< Rhonda> Not even when Duke Nukem 4ever gets released?
20110706 06:52:57< Espreon> It has been released.
20110706 06:53:35< Espreon> So... yeah...
20110706 06:54:09< shadowmaster> for god's sake, LoW 2's music selection is even more dissonant.
20110706 06:54:18< Rhonda> DAMN!!!!
20110706 06:54:31< Rhonda> I SHOULD have asked RMS after the talk when hurd gets released!!!
20110706 06:54:32< shadowmaster> fendrin: these elves have lost their home and you really give them Over the Northern Mountains as soundtrack?
20110706 06:54:48< Rhonda> Missed a perfectly good chance for a laugh  %-/
20110706 06:55:13< Espreon> Rhonda: Let's just say this: TSL's at least three years old, and I only have... one scenario done.
20110706 06:56:55< Rhonda> With a good story that can be enough!!!
20110706 06:57:27< Espreon> Noooo... there has to be at least one complete scenario that uses my multifloor system.
20110706 06:57:54< Rhonda> And that scenario isn't it?
20110706 06:58:35< Espreon> The only complete scenario's just your typical scenario...
20110706 06:59:13< Rhonda> Espreon, listen to thisÖ http://www.youtube.com/watch?v=WYGjg8eMA7s
20110706 06:59:49< Rhonda> Do it after zou get up. Every day. I It helped me to get motivation up a fair bit. Ö=
20110706 07:00:27 * Rhonda . o O ( And I hate switching us lazout and german lazout all the time … )
20110706 07:00:44< Espreon> And why do you switch?
20110706 07:00:56< Rhonda> Because this keyboard only has 104 kezs, not 105.
20110706 07:01:14< Rhonda> And thus is missing an important key when working with German layout.
20110706 07:01:42< Rhonda> But when I do translation stuff or writing mails, I need the German umlauts.
20110706 07:02:01< Rhonda> A bit of a pain at times indeed, but usually I manage quite well.
20110706 07:02:05< Espreon> Just emulate a compose key.
20110706 07:02:20< enchilad1> And Z and Y are the wrong way around :P
20110706 07:02:36< Rhonda> enchilad1: They always are :)
20110706 07:02:41< Rhonda> But the smileys get worse.
20110706 07:02:56< Espreon> Þæt þing...
20110706 07:03:18< Espreon> Ðæt þing...
20110706 07:03:24< Espreon> Does almost everything I need it to do.
20110706 07:04:02< Espreon> If only I would bother to create a compose combo for wynn.
20110706 07:04:53< Rhonda> I rather try to check out neo layout :)
20110706 07:05:11< Espreon> Hmmm?
20110706 07:05:23< Rhonda> neo-layout.org
20110706 07:05:26-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has joined #wesnoth-dev
20110706 07:05:37< Rhonda> hover the "Ebene" labels above the keyboard
20110706 07:06:17< Espreon> Doesn't do it for me.
20110706 07:06:20< Espreon> I need serious shit.
20110706 07:07:22-!- enchilad1 is now known as enchilado
20110706 07:07:35< Rhonda> I love shift shiftlock 6  ;)
20110706 07:08:04< Espreon> Let's just say this: unless it can get me wynn... it doesn't do it for me.
20110706 07:10:12-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20110706 07:10:28< Rhonda> what is wznn_
20110706 07:10:35< Espreon> http://en.wikipedia.org/wiki/Wynn
20110706 07:11:22 * Rhonda . o O ( and WTH did it switch to de layout without notice … )
20110706 07:13:16< Rhonda> it does Rho, good enough for me ;)
20110706 07:13:39< Espreon> I don't need rho.
20110706 07:13:50< shadowmaster> http://shadowm.ai0867.net/dwarf.png . The one who guesses correctly the dwarf's next move wins a cookie.
20110706 07:14:05< Espreon> I actually *need* wynn.
20110706 07:14:10< Rhonda> kill the elf
20110706 07:14:38< shadowmaster> no cookie for you
20110706 07:14:46< Rhonda> Into the town and kill the injured troll
20110706 07:14:56< shadowmaster> close
20110706 07:15:10< Rhonda> shadowmaster: The dwarf ALWAYS kills the elf.
20110706 07:15:12< shadowmaster> he stays on his hex because AIs don't know how to steal ally villages
20110706 07:15:18< Rhonda> You have to learn your history
20110706 07:15:18< shadowmaster> or so it seems
20110706 07:15:26-!- vultraz [~chatzilla@124.109.11.91] has joined #wesnoth-dev
20110706 07:15:36< shadowmaster> (of course, he gets himself killed during the trolls' turn because the troll takes the village instead)
20110706 07:15:55< Rhonda> they do, but they don't out of courtsey
20110706 07:16:40-!- tschmitz [626cdb95@gateway/web/freenode/ip.98.108.219.149] has quit [Ping timeout: 252 seconds]
20110706 07:17:15 * Rhonda . o O ( coward dwarf, should have to die of embarassment )
20110706 07:18:55< enchilado> Why won't they take ally villages?
20110706 07:19:19< shadowmaster> courtesy sounds like the most reasonable explanation
20110706 07:20:12< enchilado> Obviously if allies took your villages all the time it'd be incredibly frustrating, but in a situation like that...
20110706 07:20:18< shadowmaster> maybe the AI should ignore that rule when it's a life-or-death situation (i.e. an ally village is the only optimal attack source)
20110706 07:20:24< shadowmaster> yes
20110706 07:20:42< enchilado> Or maybe if you have waaay more villages than them too
20110706 07:27:32-!- timotei [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev
20110706 07:33:01< timotei> tschmitz_: yes, git svn works good on windows
20110706 07:33:10< timotei> I and annonymissimus use it on windows 7
20110706 07:34:48< timotei> tschmitz_: and yeah, anonymissimus wrote about how to use it on windows too ;) 
20110706 07:35:50< timotei> ah. didn't read anonymissimus's respoinse :P
20110706 07:38:23< shadowmaster> fendrin: in scenario 3 there are villages and labels on the map border; that's slightly confusing for players, may want to fix it
20110706 07:39:51< timotei> Rhonda: I need to change a lot the layout from Romanian to English myself too. I don't have any compose key on windows iirc
20110706 07:54:12-!- mono_laptop [~monochrom@pool-173-59-73-4.phlapa.east.verizon.net] has quit [Quit: g'nite. *yawn*]
20110706 07:59:54< shadowmaster> playing LoW is slowly turning into a laughfest
20110706 08:00:14< shadowmaster> the background music still doesn't help
20110706 08:00:59< shadowmaster> furthermore, what the hell, sadism? where are my healers? why don't I have any healers? I could use some healing here.
20110706 08:03:33-!- zookeeper [~l@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20110706 08:05:40< tschmitz_> timotei: Hey my "git diff" is showing me the fact that there are extra carriage returns on every line
20110706 08:05:42-!- cjhopman [~chris@wesnoth/developer/cjhopman] has quit [Read error: Connection reset by peer]
20110706 08:06:34-!- Gallaecio [~quassel@zla02.domus.cz] has quit [Ping timeout: 258 seconds]
20110706 08:06:51-!- tschmitz [626cdb95@gateway/web/freenode/ip.98.108.219.149] has joined #wesnoth-dev
20110706 08:07:01< timotei> tschmitz: yes. :)
20110706 08:07:22< tschmitz> timotei: Do you know how to fix it?
20110706 08:07:23< timotei> tschmitz: you should make them LF *especially* if you're working on the C++ source
20110706 08:07:56< timotei> tschmitz: well... you could download dos2unix utility and run that on a folder
20110706 08:08:08< timotei> so it will convert the CRLF to LF
20110706 08:08:21< shadowmaster> okay, Cleodil cannot recruit the same units as Kalenz and Landar when she first appears in scenario 4... figures
20110706 08:08:33< tschmitz> timotei: OK so the fix is to get rid of the CR's?
20110706 08:08:49< timotei> tschmitz: yeah
20110706 08:08:57< tschmitz> timotei: K cool, thanks
20110706 08:11:25< timotei> tschmitz: iirc anonymissimus was searching for some CRLF->LF Visual studio addin
20110706 08:12:02< timotei> tschmitz: http://grebulon.com/software/stripem.php
20110706 08:12:16< timotei> tschmitz: did you make new files?
20110706 08:12:24< timotei> because, IIRC, MSVC retains the current EOL
20110706 08:12:51< tschmitz> timotei: I dunno; they are there, though
20110706 08:13:00< tschmitz> timotei: I didn't make new ones, I'm editing old ones
20110706 08:13:30< tschmitz> timotei: but I downloaded them via TortoiseSVN a while ago and then copied them over into the git local repository
20110706 08:13:43< tschmitz> timotei: because I made changes to them before I got git
20110706 08:14:06< timotei> tschmitz: well, then you could set config.autocrlf=input
20110706 08:14:06< timotei> :P
20110706 08:14:13< timotei> if you'll use the git repo just from windows
20110706 08:28:53< shadowmaster> fendrin: so, my recruit and recall list changes depending on which of the three main heroes I have previously selected (regardless of which one is on which keep, if any at all). That may require an explanation somewhere.
20110706 08:36:03-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 255 seconds]
20110706 08:38:17< tschmitz> timotei: So "git svn rebase" is probably not supposed to say error, is it?
20110706 08:38:25< timotei> tschmitz: depends what error :P
20110706 08:38:41< timotei> if you have local changes it's fine to give you errors ;)
20110706 08:38:50< timotei> uncommited local changes*
20110706 08:39:12< tschmitz> timotei: update-index --refresh: command returned error: 1
20110706 08:39:18< timotei> yeah
20110706 08:39:22< tschmitz> after it told me that everything "needs update"
20110706 08:39:23< timotei> but it tells you
20110706 08:39:41< timotei> yeah
20110706 08:39:47< timotei> you either commit that before rebasing
20110706 08:39:50< timotei> or stash the changes
20110706 08:39:54< timotei> git stash
20110706 08:40:03< timotei> that'll push on the stack the changes
20110706 08:40:13< tschmitz> timotei: So after I said git reset hard
20110706 08:40:13< timotei> you can then git svn update
20110706 08:40:23< timotei> and then, git stash pop to get back the stashed things
20110706 08:40:23< tschmitz> timotei: and then say "git svn rebase"
20110706 08:40:28< timotei> hm
20110706 08:40:31< timotei> git reset --hard :P
20110706 08:40:39< tschmitz> timotei: "git reset --hard"
20110706 08:40:46< timotei> tschmitz: did you set the core.autocrlf=false?
20110706 08:40:55< timotei> there was in guide about them
20110706 08:40:59< tschmitz> timotei: Before resetting hard?
20110706 08:41:04< timotei> well... yeah
20110706 08:41:15< tschmitz> timotei: Hmm, I don't think so
20110706 08:41:40< timotei> there are some notes :P
20110706 08:41:43< timotei> in that git-svn page
20110706 08:41:47< timotei> please follow them
20110706 08:41:51< tschmitz> timotei: is that "git config core.autocrlf false" ?
20110706 08:41:56< timotei> yeah
20110706 08:42:10< tschmitz> timotei: I'm looking at it, it's hard to understand, blah ...
20110706 08:42:16< timotei> :)
20110706 08:42:31< tschmitz> timotei: I think learning will occur though, don't worry
20110706 08:44:51< tschmitz> timotei: OK so I said "git config core.autocrlf false", "git reset --hard" (which didn't take long and told me HEAD is now at 5769571), and "git svn rebase" and it said the same thing
20110706 08:45:53< timotei> git status what says?
20110706 08:46:04< timotei> use git status to see what changes are waiting
20110706 08:54:11< tschmitz> timotei: It said a ton of stuff; so I committed it locally and tried rebasing again; now I'm waiting for it to respond
20110706 08:54:19< timotei> tschmitz: NO
20110706 08:54:26< timotei> tschmitz: don't commit that stuff
20110706 08:54:41< timotei> because it's just stupid LF-> CRLF conversion
20110706 08:54:43< timotei> 90% sure
20110706 08:54:46< timotei> :P
20110706 08:54:53< timotei> please read the messages on the screen
20110706 08:55:01< timotei> and copy some of them on pastebin if you don't understand them
20110706 08:55:07< tschmitz> timotei: Yeah that would make sense but
20110706 08:55:46< tschmitz> timotei: So do I delete this repository and reset hard again?
20110706 08:55:55< timotei> no...
20110706 08:55:57< tschmitz> timotei: is it going to happen correctly after the config thing?
20110706 08:55:58< timotei> hm
20110706 08:56:04< timotei> just:
20110706 08:56:06< timotei> git checkout master
20110706 08:56:11< timotei> and then rebase
20110706 08:56:43< tschmitz> it told me "Already on 'master'"
20110706 08:57:23-!- cjhopman [~chris@c-71-202-164-232.hsd1.ca.comcast.net] has joined #wesnoth-dev
20110706 08:57:23-!- cjhopman [~chris@c-71-202-164-232.hsd1.ca.comcast.net] has quit [Changing host]
20110706 08:57:23-!- cjhopman [~chris@wesnoth/developer/cjhopman] has joined #wesnoth-dev
20110706 08:57:33< shadowmaster> okay, now this is getting better
20110706 08:58:18< tschmitz> timotei: rebasing again and waiting for it to finish
20110706 08:58:25< timotei> k
20110706 08:58:47< tschmitz> so what did "git checkout master" do?
20110706 08:58:52< tschmitz> timotei: 
20110706 08:59:03< timotei> just cleaning up local changes
20110706 09:08:38-!- lamefun [~dingbing@unaffiliated/lamefun] has joined #wesnoth-dev
20110706 09:19:22-!- Ivanovic [~ivanovic@dtmd-4db2344e.pool.mediaWays.net] has quit [Changing host]
20110706 09:19:22-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20110706 09:21:52< Ivanovic> moin
20110706 09:22:16< shadowmaster> fendrin: help. Olurf arrived in Elves Last Stand and I chose to deploy him in the west and he's got no castle to recruit units.
20110706 09:23:41< shadowmaster> is this intentional? I remember that when LoW was UMC he'd get a castle.
20110706 09:27:57-!- alkenrinnstet [~alkenrinn@bb121-6-181-175.singnet.com.sg] has joined #wesnoth-dev
20110706 09:28:32-!- alkenrinnstet [~alkenrinn@bb121-6-181-175.singnet.com.sg] has left #wesnoth-dev []
20110706 09:29:56< tschmitz> timotei: Thanks for the help, we'll see tomorrow whether it worked
20110706 09:30:00< tschmitz> Going to sleep now
20110706 09:31:10-!- tschmitz_ [626cdb95@gateway/web/freenode/ip.98.108.219.149] has quit [Quit: Page closed]
20110706 09:33:01-!- deekay [~dk@wesnoth/developer/dragonking] has joined #wesnoth-dev
20110706 09:35:15< shadowmaster> well, since there doesn't appear to be any future this way, I'll resume playing another day.
20110706 09:35:55-!- lamefun [~dingbing@unaffiliated/lamefun] has quit [Quit: Leaving]
20110706 09:42:42-!- Appleman1234 [~Appleman1@emerch3.lnk.telstra.net] has quit [Ping timeout: 276 seconds]
20110706 09:49:52-!- stikonas [~and@ctv-213-164-115-173.vinita.lt] has joined #wesnoth-dev
20110706 09:49:52-!- stikonas [~and@ctv-213-164-115-173.vinita.lt] has quit [Changing host]
20110706 09:49:52-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110706 09:49:53-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has joined #wesnoth-dev
20110706 10:09:19-!- Cookiee [~quassel@unaffiliated/cookiee] has joined #wesnoth-dev
20110706 10:14:13-!- covale [~covale@h55eb1ca0.selukra.dyn.perspektivbredband.net] has joined #wesnoth-dev
20110706 10:17:16-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has quit [Quit: Blueblaze]
20110706 10:24:50-!- neph [~neph@80.233.231.12] has joined #wesnoth-dev
20110706 10:53:49-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has joined #wesnoth-dev
20110706 10:58:33-!- mjs-de [~mjs-de@f053188142.adsl.alicedsl.de] has joined #wesnoth-dev
20110706 10:58:45-!- deekay [~dk@wesnoth/developer/dragonking] has quit [Quit: deekay]
20110706 11:23:20-!- enchilado [~enchilado@ppp118-208-190-150.lns20.bne4.internode.on.net] has quit [Read error: Connection reset by peer]
20110706 11:24:22-!- enchilado [~enchilado@ppp118-208-190-150.lns20.bne4.internode.on.net] has joined #wesnoth-dev
20110706 11:27:49-!- MeccaGod [majs@host189-199.bornet.net] has joined #wesnoth-dev
20110706 11:31:30-!- Elvish_Pillager [~eli@71-10-224-192.dhcp.oxfr.ma.charter.com] has quit [Ping timeout: 240 seconds]
20110706 11:42:36-!- loonybot [~loonybot@46.138.90.123] has joined #wesnoth-dev
20110706 11:42:36-!- loonybot [~loonybot@46.138.90.123] has quit [Changing host]
20110706 11:42:36-!- loonybot [~loonybot@wesnoth/bot/loonybot] has joined #wesnoth-dev
20110706 11:45:10-!- Elvish_Pillager [~eli@71-10-224-192.dhcp.oxfr.ma.charter.com] has joined #wesnoth-dev
20110706 11:49:01< fendrin> shadowmaster: hi
20110706 12:01:43-!- atomicbomb [~quassel@180.246.188.42] has quit [Remote host closed the connection]
20110706 12:05:43-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20110706 12:08:42-!- stikonas [~gentoo@ctv-213-164-115-173.vinita.lt] has joined #wesnoth-dev
20110706 12:08:42-!- stikonas [~gentoo@ctv-213-164-115-173.vinita.lt] has quit [Changing host]
20110706 12:08:42-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110706 12:24:30-!- atomicbomb [~quassel@61.94.195.234] has joined #wesnoth-dev
20110706 12:44:50< CIA-85> shadowmaster * r50167 /trunk/data/campaigns/Legend_of_Wesmere/scenarios/ (3 files): LoW: .generate_traits -> .random_traits
20110706 12:56:26-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 258 seconds]
20110706 13:08:41-!- Shakey [HydraIRC@c-24-1-105-76.hsd1.il.comcast.net] has quit [Quit:  Want to be different? Try HydraIRC -> http://www.hydrairc.com <-]
20110706 13:16:22-!- atomicbomb [~quassel@61.94.195.234] has quit [Ping timeout: 258 seconds]
20110706 13:16:35-!- atomicbomb [~quassel@61.94.195.234] has joined #wesnoth-dev
20110706 13:25:44-!- covale [~covale@h55eb1ca0.selukra.dyn.perspektivbredband.net] has quit [Quit: Leaving.]
20110706 13:44:33-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Ping timeout: 252 seconds]
20110706 13:51:27-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20110706 13:57:10-!- stikonas [~and@ctv-213-164-115-173.vinita.lt] has joined #wesnoth-dev
20110706 13:57:10-!- stikonas [~and@ctv-213-164-115-173.vinita.lt] has quit [Changing host]
20110706 13:57:11-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110706 14:14:21-!- timotei [~timotei@193.34.190.70] has joined #wesnoth-dev
20110706 14:14:21-!- timotei [~timotei@193.34.190.70] has quit [Changing host]
20110706 14:14:21-!- timotei [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev
20110706 14:21:18-!- Gambit [~Gambit@wesnoth/developer/grickit] has joined #wesnoth-dev
20110706 15:10:25-!- neph [~neph@80.233.231.12] has quit [Quit: Leaving]
20110706 15:12:07-!- Nephro [~Dmitry@80.233.231.12] has joined #wesnoth-dev
20110706 15:12:34-!- enchilado [~enchilado@ppp118-208-190-150.lns20.bne4.internode.on.net] has quit [Ping timeout: 244 seconds]
20110706 15:34:52-!- Netsplit *.net <-> *.split quits: vultraz
20110706 15:35:10-!- Netsplit over, joins: vultraz
20110706 15:43:14< tschmitz> Instead of waking up and seeing the rebase finished, I wake up and see "The authenticity of host 'svn.gna.org (78.40.125.80)' can't be established."
20110706 15:44:10< tschmitz> when I tell it "yes" continue connecting anyway, it tells me "Write failed: The connection was aborted"
20110706 15:44:14< tschmitz> dang.
20110706 15:44:24< timotei> tschmitz: hm
20110706 15:44:45< timotei> tschmitz: did you say "yes" when it asked for whatever authenticity?
20110706 15:45:19< tschmitz> it asked "Are you sure you want to continue connecting (yes/no)?"
20110706 15:45:36< timotei> try again
20110706 15:45:36< timotei> :)
20110706 15:45:42< tschmitz> first I typed "y" and it told me to type 'yes' or 'no'
20110706 15:45:50< tschmitz> so I typed 'yes'
20110706 15:46:04< tschmitz> without quotes
20110706 15:46:40< tschmitz> I started up the rebase again but so far it still has no indication of taking any less time than it did when I started it last night
20110706 15:46:57< tschmitz> Is it supposed to work silently instead of telling me what it's doing while rebasing?
20110706 15:47:44< timotei> yeah iir
20110706 15:48:05< tschmitz> mk
20110706 15:51:39-!- zaroth [~zaroth@wesnoth/developer/zaroth] has quit [Ping timeout: 255 seconds]
20110706 16:12:43< Nephro> tschmitz, that's nothing comparing to my crazy debugger, which moves backwards through the code
20110706 16:13:01< tschmitz> I don't understand how that's possible
20110706 16:13:02< tschmitz> !
20110706 16:13:31< Nephro> Me too :D But I am not surprised at all, not the first time it goes wild
20110706 16:18:15-!- dtiger [~dtiger@dynamic-vpdn-93-125-14-217.telecom.by] has joined #wesnoth-dev
20110706 16:19:54< timotei> Nephro: why not go backwards ?:P
20110706 16:19:59< timotei> it follows the call stack ;)
20110706 16:25:59< tschmitz> timotei: Do I have to do anything different to authenticate myself?
20110706 16:26:06< tschmitz> timotei: I am using Pageant
20110706 16:28:10-!- atomicbomb [~quassel@61.94.195.234] has quit [Read error: Connection reset by peer]
20110706 16:28:16< tschmitz> Rebase finished with the following message:
20110706 16:28:31< tschmitz> "Permission denied (publickey)."
20110706 16:28:36< Nephro> timotei, backwards in one function... that doesn't seem right at all
20110706 16:28:42< Nephro> but the behavior is gone now
20110706 16:29:34< timotei> tschmitz: then you forgot to add the public key in the gna reositor :)
20110706 16:29:38< timotei> repository*
20110706 16:30:02< tschmitz> timotei: I have been using it to commit to SVN for a couple of commits already =[
20110706 16:30:20< timotei> tschmitz: hmm
20110706 16:30:30< timotei> tschmitz: so pageant is running?
20110706 16:30:31< timotei> a
20110706 16:30:35< timotei> you need to set a variable
20110706 16:30:41< tschmitz> Got the icon in the lower right
20110706 16:30:43< tschmitz> added the key
20110706 16:30:48< timotei> you need the environmental variable:
20110706 16:30:55< timotei> GIT_SSH
20110706 16:31:02< timotei> point it to tortoise's plink.exe ;0
20110706 16:31:20< tschmitz> So I should have selected that when installing msysgit?
20110706 16:32:25< loonycyborg> tschmitz: Did you download the tarball with git repo?
20110706 16:32:28< timotei> tschmitz: yeah
20110706 16:32:38< timotei> tschmitz: but it's not late. just add the variable and you're done
20110706 16:32:49< tschmitz> loonycyborg: Yes Ivanovic gave me the URL
20110706 16:32:52< timotei> brb need to restart
20110706 16:32:53-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Quit: SIGKILL]
20110706 16:33:10< loonycyborg> It's based on read-only SVN checkout. You shouldn't need ssh.
20110706 16:33:46< tschmitz> loonycyborg: Will I be able to use it to commit?
20110706 16:34:15< loonycyborg> You'd need to change the url .git/config before you'll be able to do that.
20110706 16:34:52< tschmitz> loonycyborg: The timotei/anonymissimus tutorial told me to do that and I did
20110706 16:35:53< loonycyborg> Then try undoing that. It'll probably fix your Permission denied (publickey) issue :P
20110706 16:36:22< tschmitz> loonycyborg: heh yeah you are probably right ...
20110706 16:36:50-!- Sytyi [~sytyi@16-161-112-92.pool.ukrtel.net] has joined #wesnoth-dev
20110706 16:38:34-!- Cookiee [~quassel@unaffiliated/cookiee] has quit [Read error: Connection reset by peer]
20110706 16:41:10-!- Nephro [~Dmitry@80.233.231.12] has quit [Remote host closed the connection]
20110706 16:41:10-!- Sytyi [~sytyi@16-161-112-92.pool.ukrtel.net] has quit [Read error: Connection reset by peer]
20110706 16:42:12-!- Sytyi [~sytyi@16-161-112-92.pool.ukrtel.net] has joined #wesnoth-dev
20110706 16:48:58< Ivanovic> loonycyborg: but, uhm, to use it for commits he will likely have to rely on svn+ssh
20110706 16:49:14< Ivanovic> and IIRC he has commit access
20110706 16:49:29< loonycyborg> He can change it again later.
20110706 16:49:53< Ivanovic> jepp, he is among those with access
20110706 16:58:26-!- timotei [~timotei@193.34.190.70] has joined #wesnoth-dev
20110706 16:58:26-!- timotei [~timotei@193.34.190.70] has quit [Changing host]
20110706 16:58:26-!- timotei [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev
20110706 16:59:18< timotei> loonycyborg, tschmitz the tutorial says how to make git-svn use the git tarbal for commit access :P
20110706 16:59:41< timotei> but yeah, that's optional
20110706 16:59:59-!- Sytyi [~sytyi@16-161-112-92.pool.ukrtel.net] has quit [Quit: Leaving.]
20110706 17:02:40< tschmitz> timotei: Unless I need to commit stuff, yeah?
20110706 17:02:57< tschmitz> It's still rebasing
20110706 17:03:05< tschmitz> re-re-rebasing
20110706 17:08:05-!- alkenrinnstet [~alkenrinn@bb116-14-194-197.singnet.com.sg] has joined #wesnoth-dev
20110706 17:12:52-!- Sytyi [~sytyi@16-161-112-92.pool.ukrtel.net] has joined #wesnoth-dev
20110706 17:21:07< fendrin> hi
20110706 17:21:44-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20110706 17:22:42< fendrin> shadowmaster: You remember Olurf having his own keep in LoW scenario7 when the campaign was UMC? What would he have done with the keep? The last umc version of LoW was for 1.4/1.5 and that Wesnoth version did not support multiple leaders per side.
20110706 17:23:13< tschmitz> timotei: I set GIT_SSH = "C:\Program Files\TortoiseSVN\bin\TortoisePlink.exe"
20110706 17:23:42< tschmitz> timotei: but now that I think about it, I didn't restart my computer or restart Git, so presumably the change wouldn't have taken effect
20110706 17:24:05< tschmitz> timotei: In any case, it said Permission denied (publickey). again
20110706 17:25:34-!- Sytyi [~sytyi@16-161-112-92.pool.ukrtel.net] has quit [Quit: Leaving.]
20110706 17:46:18-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Ping timeout: 276 seconds]
20110706 17:46:31-!- timotei [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev
20110706 17:47:54< timotei> tschmitz: you don't need to restart the computer for that environmental variable
20110706 17:48:26< tschmitz> How about the git session?
20110706 17:48:50< timotei> yeah
20110706 17:49:03< timotei> basically, you would need to relaunch it
20110706 17:49:05< timotei> but from explorer
20110706 17:49:19< tschmitz> timotei: Right
20110706 17:49:20< timotei> so if you launched git from total commander or so, you'd need to relaunch total commander aswell
20110706 17:49:28< tschmitz> timotei: re-re-re-rebasing
20110706 17:49:42< tschmitz> timotei: What's total commander?
20110706 17:49:58< timotei> a windows gui variant of the old norton commander :P
20110706 17:50:03< timotei> http://www.ghisler.com/
20110706 17:50:13< tschmitz> What's the norton commander?
20110706 17:50:21< timotei> a file manager
20110706 17:50:27< timotei> tschmitz: you are young, aren't you? :P
20110706 17:50:36< timotei> or you have used just linux ?
20110706 17:50:37< tschmitz> I think I'm going to take a shower during this rebase
20110706 17:50:42< timotei> ok, have fun
20110706 17:50:57< tschmitz> cya
20110706 17:51:31-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev
20110706 17:52:20< loonycyborg> timotei: I remember norton commander.
20110706 17:52:29< timotei> loonycyborg: :)
20110706 17:52:29< loonycyborg> I use mostly Krusader now :P
20110706 17:52:40< timotei> yeah, I use that on linux too
20110706 17:53:05< fendrin> Yeah krusader is nice.
20110706 17:55:28-!- p1mps [~p1mps@adsl-ull-204-210.49-151.net24.it] has joined #wesnoth-dev
20110706 17:57:13-!- Crab_ [~Crab@wesnoth/developer/crab] has joined #wesnoth-dev
20110706 18:10:10-!- chpln [~chpln@ppp118-210-141-139.lns20.adl6.internode.on.net] has quit [Ping timeout: 260 seconds]
20110706 18:11:48-!- chpln [~chpln@ppp118-210-18-164.lns20.adl2.internode.on.net] has joined #wesnoth-dev
20110706 18:20:10< tschmitz> Finally spitting out some progress
20110706 18:23:03-!- Elvish_Pillager [~eli@71-10-224-192.dhcp.oxfr.ma.charter.com] has quit [Ping timeout: 240 seconds]
20110706 18:31:27-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has joined #wesnoth-dev
20110706 18:34:53-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20110706 18:35:01-!- alkenrinnstet [~alkenrinn@bb116-14-194-197.singnet.com.sg] has quit [Quit: Leaving.]
20110706 18:35:01< boucman> hey all
20110706 18:35:21< Crab_> hi, boucman
20110706 18:38:09-!- mjs-de [~mjs-de@f053188142.adsl.alicedsl.de] has quit [Read error: Connection reset by peer]
20110706 18:38:28-!- mjs-de [~mjs-de@f053188142.adsl.alicedsl.de] has joined #wesnoth-dev
20110706 18:43:32-!- Blueblaze [~Blueblaze@adsl-76-202-22-38.dsl.hstntx.sbcglobal.net] has quit [Quit: Blueblaze]
20110706 18:45:19-!- Blueblaze [~Blueblaze@76.202.22.38] has joined #wesnoth-dev
20110706 18:50:18< fendrin> hi Crab_, boucman
20110706 18:50:53< CIA-85> timotei * r50168 /trunk/utils/umc_dev/ (48 files in 15 dirs): 
20110706 18:50:54< CIA-85> eclipse plugin: Fix the grammar so the order
20110706 18:50:54< CIA-85> in the file of the WML expressions is maintained.
20110706 18:51:08< CIA-85> timotei * r50169 /trunk/utils/umc_dev/ (2 files in 2 dirs): eclipse plugin: remove preferences file
20110706 18:51:19< CIA-85> timotei * r50170 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (9 files in 6 dirs): 
20110706 18:51:19< CIA-85> eclipse plugin: Implement the persistance for the
20110706 18:51:19< CIA-85> DependencyTreeBuilder
20110706 18:51:30< CIA-85> timotei * r50171 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (13 files in 8 dirs): eclipse plugin: Externalize some strings
20110706 18:51:39-!- p1mps [~p1mps@adsl-ull-204-210.49-151.net24.it] has quit [Ping timeout: 255 seconds]
20110706 18:51:41< CIA-85> timotei * r50172 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java: 
20110706 18:51:41< CIA-85> eclipse plugin: Remove the UTF-16 encoded loading
20110706 18:51:41< CIA-85> for the project cache file
20110706 18:51:51< CIA-85> timotei * r50173 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java: 
20110706 18:51:51< CIA-85> eclipse plugin: Use a LinkedHashSet instead of a HashSet
20110706 18:51:51< CIA-85> to maintain the order in which we add the tree nodes
20110706 18:52:00< CIA-85> timotei * r50174 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java: 
20110706 18:52:01< CIA-85> eclipse plugin: Uncomment main builder but comment
20110706 18:52:01< CIA-85> the resource visitors as we're gonna visit them
20110706 18:52:01< CIA-85> in out own order
20110706 18:52:10< CIA-85> timotei * r50175 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ (ResourceUtils.java WMLTools.java): eclipse plugin: Refactor the WMLTools's methods
20110706 18:52:20< CIA-85> timotei * r50176 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wizards/generator/ (4 files): eclipse plugin: Use int instead of byte
20110706 18:52:25-!- Gallaecio [~quassel@zla02.domus.cz] has joined #wesnoth-dev
20110706 18:52:30< CIA-85> timotei * r50177 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wml/schema/ (10 files in 2 dirs): eclipse plugin: Remove the now obsolete schema implementation
20110706 18:52:41< CIA-85> timotei * r50178 /trunk/utils/umc_dev/org.wesnoth/ (2 files in 2 dirs): eclipse plugin: Remove some old-schema leftovers
20110706 18:52:53< CIA-85> timotei * r50179 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (32 files in 17 dirs): eclipse plugin: Cleanup in the externalized strings
20110706 18:53:07< CIA-85> timotei * r50180 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (3 files in 2 dirs): 
20110706 18:53:07< CIA-85> eclipse plugin: Add the 'isConfigFile' method
20110706 18:53:07< CIA-85> to eliminante duplicate code
20110706 18:53:17< CIA-85> timotei * r50181 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/preprocessor/Define.java: 
20110706 18:53:17< CIA-85> eclipse plugin: Remove a TODO by implementing the
20110706 18:53:17< CIA-85> toString method of the Define class
20110706 18:53:26< CIA-85> timotei * r50182 /trunk/utils/umc_dev/ (3 files in 3 dirs): 
20110706 18:53:26< CIA-85> eclipse plugin: Implement the map creation when
20110706 18:53:26< CIA-85> trying to open a non-existing map
20110706 18:53:36< CIA-85> timotei * r50183 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (4 files in 4 dirs): eclipse plugin: Tweak a bit the setup workspace workflow
20110706 18:53:46< CIA-85> timotei * r50184 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (builder/WesnothProjectBuilder.java utils/WMLTools.java): eclipse plugin: Cleanup a bit the project builder
20110706 18:53:56< CIA-85> timotei * r50185 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/WMLTools.java: 
20110706 18:53:56< CIA-85> eclipse plugin: Relax the Python path checking to
20110706 18:53:56< CIA-85> allow unix variants (e.g.: 'python' ) to be set
20110706 18:53:56< CIA-85> as the path executable
20110706 18:54:06< CIA-85> timotei * r50186 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/WorkspaceUtils.java: 
20110706 18:54:06< CIA-85> eclipse plugin: Remove duplicate method and use
20110706 18:54:06< CIA-85> one already existing
20110706 18:54:19< CIA-85> timotei * r50187 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java: 
20110706 18:54:19< CIA-85> eclipse plugin: Preserve the ProjectCache got first time
20110706 18:54:19< CIA-85> and use that in every other place needed instead of
20110706 18:54:19< CIA-85> creating it each time we need it
20110706 18:54:25< CIA-85> timotei * r50188 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/ (DependencyTreeBuilder.java WesnothProjectBuilder.java): eclipse plugin: Implement the new full build
20110706 18:54:34< CIA-85> timotei * r50189 /trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/ (3 files in 2 dirs): eclipse plugin: Tweak a bit the building reports
20110706 19:19:29-!- EdB [~edb@89.82.194.231] has joined #wesnoth-dev
20110706 19:25:12-!- Crab_ [~Crab@wesnoth/developer/crab] has quit [Quit: Miranda IM! Smaller, Faster, Easier. http://miranda-im.org]
20110706 19:28:43-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Read error: Operation timed out]
20110706 19:29:49-!- stikonas [~gentoo@ctv-213-164-115-173.vinita.lt] has joined #wesnoth-dev
20110706 19:29:49-!- stikonas [~gentoo@ctv-213-164-115-173.vinita.lt] has quit [Changing host]
20110706 19:29:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110706 19:39:10-!- Crendgrim [~crend@77-22-254-233-dynip.superkabel.de] has joined #wesnoth-dev
20110706 19:41:57< tschmitz> timotei: How can I destroy any changes that I've (allegedly) made in my working copy? "git checkout" or "git reset --hard" or something?
20110706 19:42:12< timotei> tschmitz: git checkout
20110706 19:42:18< timotei> git checkout master
20110706 19:42:44< timotei> tschmitz: did you get warning that CRLF is converted to LF?
20110706 19:42:49< timotei> when doing reset/rebase?
20110706 19:43:17< tschmitz> timotei: I think that information is lost to history, but I don't recall seeing one
20110706 19:43:50-!- noy [~Noy@wesnoth/developer/noy] has quit [Read error: Connection reset by peer]
20110706 19:44:59< tschmitz> timotei: It tells me "Please, commit your changes or stash them before you can switch branches." so I wrote "git stash" and tried again, but it still says to please commit or stash
20110706 19:45:33< timotei> oh
20110706 19:45:43< timotei> let's take it by step
20110706 19:46:01< timotei> tschmitz: the git repo is vanilla from website right?
20110706 19:46:07< timotei> no commits from your side
20110706 19:46:14< timotei>  (you gsoc code that is)
20110706 19:46:20< timotei> s/you/your
20110706 19:46:21< tschmitz> vanilla?
20110706 19:46:26< timotei> the original:
20110706 19:46:39< tschmitz> I downloaded the .git thing that Ivanovic linked me to
20110706 19:46:53< tschmitz> and I haven't stuck in any of my own changes yet
20110706 19:46:54< timotei> ok
20110706 19:46:57< timotei> does git stash list say anything?
20110706 19:47:02< timotei> `git stash list'
20110706 19:47:18< tschmitz> 2 items
20110706 19:47:28< timotei> do: `git stash clear'
20110706 19:47:31< tschmitz> most likely from the 2 times I called stash
20110706 19:47:31< tschmitz> ok
20110706 19:47:45< tschmitz> git stash list says nothing
20110706 19:47:56< timotei> ok, now `git status' does say something?
20110706 19:48:05< timotei> (maybe copy it to pastebin)
20110706 19:48:09< tschmitz> tons of modified files
20110706 19:48:13< tschmitz> OK,
20110706 19:48:31< tschmitz> got any tips on how to select the text?
20110706 19:48:34< timotei> hm
20110706 19:48:34< tschmitz> in
20110706 19:48:43< tschmitz> the msysgit window thing
20110706 19:49:03< timotei> right click on the icon of the windows
20110706 19:49:05< timotei> window*
20110706 19:49:11< timotei> edit -> select all
20110706 19:49:32< timotei> then again, click on the icon-> edit->copy
20110706 19:49:37< tschmitz> http://pastebin.com/xCJWFgQn
20110706 19:49:44< tschmitz> timotei: Thanks
20110706 19:50:01< timotei> oh
20110706 19:50:03< timotei> ops
20110706 19:50:09< timotei> you wre in the middle of... rebasing
20110706 19:50:14< timotei> Tommy@EDWARD-PC ~/My Documents/Tommy Folder/wesnoth/wesnoth ((4ab2cf2...))
20110706 19:50:17< timotei> or something like that
20110706 19:50:18< tschmitz> timotei: on the other hand, I actually did insert some of my crap
20110706 19:50:33< timotei> usually it should say just `master" (if you're on trunk)(
20110706 19:50:36< timotei> ok, then:
20110706 19:50:39< timotei> `git checkout ."
20110706 19:50:59< timotei> `git rebase --abort"
20110706 19:51:15< tschmitz> "No rebase in progress?"
20110706 19:51:18< timotei> hm
20110706 19:51:31< timotei> ok, now you are left just with the "untracked files" in `git status" right?
20110706 19:51:40< tschmitz> still some "modified"
20110706 19:51:46< timotei> lol?
20110706 19:51:46< timotei> hm
20110706 19:51:57< timotei> was there any message when you did: `git checkout ." ?
20110706 19:52:03< timotei> (while the command executed, that is)
20110706 19:52:17< timotei> aa. you are not on any branch
20110706 19:52:18< timotei> hm
20110706 19:52:22< tschmitz> git diff wiki_grabber.py says "old mode 100755" and "new mode 100644"
20110706 19:52:23< timotei> `git checkout master' :P
20110706 19:52:27< timotei> oh
20110706 19:52:33-!- Unnheulu [~ieuan@host86-147-248-76.range86-147.btcentralplus.com] has joined #wesnoth-dev
20110706 19:52:49< tschmitz> "git checkout ." did not say anything to me
20110706 19:52:57< tschmitz> "git checkout master" said please commit or stash
20110706 19:53:01< timotei> then do a : git config core.filemode false
20110706 19:53:33< tschmitz> Cool, thanks timotei =]
20110706 19:54:07< tschmitz> now git status just mentions untracked files
20110706 19:55:09< tschmitz> Sorry about all that
20110706 19:56:26< timotei> tschmitz: wait. we're not done yet
20110706 19:56:31< timotei> now do git checkout master
20110706 19:56:41< tschmitz> timotei: Did that
20110706 19:56:43< tschmitz> it said ...
20110706 19:57:13< tschmitz> "Previous HEAD position was 4ab2cf2... LoW: .generate_traits -> .random_traits"
20110706 19:57:18< tschmitz> "switched to branch 'master'"
20110706 19:57:21< timotei> good
20110706 19:57:24< tschmitz> sounds good to me
20110706 19:57:26< timotei> yep
20110706 19:57:33< timotei> now do: git svn rebase
20110706 19:57:35< timotei> :D
20110706 19:58:32< tschmitz> Any idea why the initial rebase spent a long long time saying nothing before it started listing modified files and whatnot?
20110706 19:59:14< timotei> IDK
20110706 19:59:25< timotei> does git svn rebase do things?
20110706 19:59:42< tschmitz> timotei: Yeah it got your commits from earlier this morning
20110706 19:59:58< timotei> tschmitz: maybe it's something related to the reason you have changed from anonymous to svn+ssh thingy
20110706 20:00:02< timotei> otherwise IDK
20110706 20:00:04< timotei> tschmitz: good.
20110706 20:00:21< timotei> tschmitz: if anything ask
20110706 20:00:22< timotei> :)
20110706 20:00:32< tschmitz> timotei: Cool, thank you very much
20110706 20:00:35< timotei> don't forget that rebase doesn't work with local changes. 
20110706 20:00:38< timotei> either stash or commit them
20110706 20:01:02< timotei> well anyway, most of the time git is verbose and tells you your current command choices
20110706 20:01:03< timotei> :P:
20110706 20:01:21< timotei> tschmitz: btw, 
20110706 20:01:37< tschmitz> timotei: If I commit and then rebase, then it'll get the new head and reapply my modifications right?
20110706 20:01:56< timotei> tschmitz: yep :)
20110706 20:02:10< timotei> tschmitz: copy paste this into your current .gitignore
20110706 20:02:10< timotei> http://pastebin.com/bSAyP9az
20110706 20:02:25< timotei> some of them are not neccessary, but that's my gitignore
20110706 20:02:37< timotei> especifally for not commiting visual studio's compiled files :P
20110706 20:03:04< timotei> tschmitz: and if you see untracked files that shouldn't get into the repo, just add a new line in .gitignore
20110706 20:03:29< tschmitz> timotei: OK thanks
20110706 20:13:29< timotei> yw
20110706 20:23:33-!- Unnheulu [~ieuan@host86-147-248-76.range86-147.btcentralplus.com] has left #wesnoth-dev ["Ex-Chat"]
20110706 20:29:36-!- mordante [~mordante@roadie.xs4all.nl] has joined #wesnoth-dev
20110706 20:29:39-!- mordante [~mordante@roadie.xs4all.nl] has quit [Changing host]
20110706 20:29:39-!- mordante [~mordante@wesnoth/developer/mordante] has joined #wesnoth-dev
20110706 20:29:48< mordante> servus
20110706 20:32:06< timotei> hi mordante 
20110706 20:32:28< mordante> hi timotei 
20110706 20:32:40-!- Sytyi [~sytyi@84-170-133-95.pool.ukrtel.net] has joined #wesnoth-dev
20110706 20:33:01< mordante> hi Sytyi 
20110706 20:33:47< Sytyi> mordante: HI! want to speak about design
20110706 20:36:10< mordante> ok I have time now
20110706 20:36:35< Sytyi> mordante: I need to design Type class. Type will be build from two strings - name, and value (usually regex)
20110706 20:37:03< Sytyi> mordante: But I want to add support of predefined simple types
20110706 20:38:11< Sytyi> mordante: That will greatly done with AbstractType and BoolType, IntType, Special type (etc) inheriting it.
20110706 20:40:16< Sytyi> mordante: The another variant is to return function validate(atribute value) , but I dont know if creating fuction object is possible in C++ and suppose that no. 
20110706 20:41:04< Sytyi> mordante: Can you advice some another variants? 
20110706 20:41:29< mordante> function object are common in C++, they're know as functors (need to think whether it's the best approach)
20110706 20:41:40< mordante> you can use them in the standard algorithms
20110706 20:42:12< mordante> and for example boost::function helps to create functors
20110706 20:42:42< mordante> will the value be a regex or a value?
20110706 20:42:53< Sytyi> mordante: I know, but the function schould be defined some out of method returning it. Or no?
20110706 20:43:14< Sytyi> mordante: value will be regex, except simple types. 
20110706 20:43:27< mordante> what will it be for simple types?
20110706 20:44:37< Sytyi> mordante: but I think to define simple types without value - to make it clearer. The possible value could be "!bool" Most of regex (and maybe all) begins with ^
20110706 20:45:51< mordante> the Type class will be used to match the argument of a field?
20110706 20:46:03< Sytyi> mordante: Yes.
20110706 20:46:46< Sytyi> mordante: And I have an idea how to easy use  map<string,AbstractType>
20110706 20:46:52< mordante> maybe you can use an abstract base class with a function bool match(const std::string& data) const;
20110706 20:47:32< mordante> of course when you use an abstract base class you need to store pointers in the map
20110706 20:47:56< mordante> btw if you store things in a map, the Type class shouldn't need to know its name
20110706 20:48:24< mordante> what might also be possible is
20110706 20:48:46< Sytyi> mordante: I think that easier to support will be write a AbstactTypeHandler which will hide all pointers work 
20110706 20:48:59< Sytyi> mordante: name - maybe. 
20110706 20:49:38< mordante> std::map<std::string, boost::function<bool(const std::string&)> >
20110706 20:50:26< mordante> then you just need several match functions...
20110706 20:50:28< mordante> hmm 
20110706 20:50:48< Sytyi> mordante: seems interesting. Need to read boost::function. Also then  an TypeFactory is needed
20110706 20:51:16< mordante> then the boost::bind you use can give extra parameters like the regex to match
20110706 20:52:01< mordante> if you read boost::function also look at boost::bind at the same time, they're closely related
20110706 20:53:39< mordante> even if you don't use them for this task, they're nice to know about
20110706 20:53:40< Sytyi> ok.
20110706 20:54:26< Sytyi> mordante: But I want to decide at last. AbstractType is rather close to me now. But boost variant is interesting.  
20110706 20:55:21-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has quit [Ping timeout: 264 seconds]
20110706 20:55:22< Sytyi> mordante: I suppose that attribute_value::to_bool will not help me in validation.
20110706 20:56:26< Sytyi> but attribute::value::to_int(INT_MAX) can help. Dont think anywhere in config it is used. :-)
20110706 20:56:57< mordante> might be not sure what is and what is not used
20110706 20:58:17< Sytyi> mordante: so I will need to check attribute_value.str() in both cases bool and int ?  
20110706 20:58:23< mordante> do you think boost::function will work or do you want to look further
20110706 20:59:25< mordante> in general, I think those the conversion functions are no good as validation tool
20110706 21:00:03< mordante> INT_MAX is a valid integer value, so if the user supplies that value you don't know whether it's a failure or valid input
20110706 21:00:24< Sytyi> then I can just define  simple types with regexes, and no need in any special cases, can write ONE bool match(const std::string &);
20110706 21:00:25< mordante> we have lexical_cast which does more validation and throws an exception upon an error
20110706 21:03:36< mordante> wesbot, seen exasperation
20110706 21:03:37< wesbot> mordante: The person with the nick Exasperation last spoke 21h 12m ago.  17h 59m ago they left with the message: Quit: Page closed
20110706 21:05:22-!- neph [~neph@80.233.231.12] has joined #wesnoth-dev
20110706 21:05:27< mordante> Sytyi, do you know enough for now?
20110706 21:06:02< Sytyi> mordante: Yes. Tomorrow will be more questions  but now I need to read lexical_cast and boost::fuction
20110706 21:06:38< mordante> ok, and don't forget boost:bind ;-)
20110706 21:07:06-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Quit: SIGKILL]
20110706 21:07:44< Sytyi> mordante: ok. Now I need to prepare for tomorrow - I will read a little lecture to students. :-)
20110706 21:08:13< mordante> ok good, good luck with it
20110706 21:08:57< Sytyi> and suppose a screen cast :-) with implementation of course work in 2-3 hours
20110706 21:09:50< Sytyi> mordante: thanks
20110706 21:12:22< neph> Hi, guys! I've stumbled upon another problem. I am iterating through a vector and deleting some of its elements. The problem is that I am deleting them using an external function, so my iterators get screwed up. ANy ideas how should I act in this situation(I have a solution myself, but it's ugly and not beatiful at all)
20110706 21:18:07-!- Gallaecio [~quassel@zla02.domus.cz] has quit [Quit: No Ping reply in 180 seconds.]
20110706 21:18:23-!- Gallaecio [~quassel@zla02.domus.cz] has joined #wesnoth-dev
20110706 21:18:56< mordante> Sytyi, you're welcome
20110706 21:19:10< mordante> neph, why delete them in an external function?
20110706 21:19:23< mordante> do you need to validate all elements?
20110706 21:20:00< neph> mordante, well, the elements are tied with all kinds of things, so the proper way of deleting them is manager::delete_component(side, cfg);
20110706 21:20:58< neph> I just to for (...){ if (it->to_be_removed()) { cfg = ... ; manager::delete_component(side, cfg); } }
20110706 21:21:41< neph> But this proved to be faulty, causing segfaults from time to time
20110706 21:21:55< mordante> no surprises here ;-)
20110706 21:22:19-!- Gallaecio [~quassel@zla02.domus.cz] has quit [Client Quit]
20110706 21:22:32< neph> Yeah, I somehow forgot about these the behavior of iterators, haven't used them for a while
20110706 21:22:40-!- Gallaecio [~quassel@zla02.domus.cz] has joined #wesnoth-dev
20110706 21:23:13< mordante> depends on the container, but a vector invalidates all elements after it
20110706 21:25:16< mordante> neph, use while(it != vector.end()) { if(it->to_be_removed()) { ...; it = vector.erase(it)); } else { ++it}}
20110706 21:25:24-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev
20110706 21:25:40< neph> I could run the for to create a new vector and fill it with stuff to be removed, then a while that just does the removal
20110706 21:25:47< neph> mordante, I can't use v.erase()
20110706 21:25:56< mordante> why not?
20110706 21:26:07< neph> I have to use manager::delete_component :)
20110706 21:26:37-!- Gallaecio [~quassel@zla02.domus.cz] has quit [Client Quit]
20110706 21:26:45< [Relic]> Hello :)
20110706 21:26:48< neph> As I said, there's other stuff tied to the components, which are kept elsewhere
20110706 21:27:22< mordante> ah yes, of course, then let the manager::delete_compnent use the erase and let it return the iterator to the next item
20110706 21:27:26< mordante> hi [Relic] 
20110706 21:27:47< mordante> still I think the interface is odd
20110706 21:28:05< mordante> when the item is destroyed it should deregister itself
20110706 21:28:25< mordante> and the container shouldn't care
20110706 21:28:36-!- Gallaecio [~quassel@zla02.domus.cz] has joined #wesnoth-dev
20110706 21:28:48< mordante> maybe if I see the code it becomes clearer
20110706 21:29:23< neph> It's AI code... You can look at manager.cpp which has manager::delete_component()
20110706 21:29:56-!- Gallaecio [~quassel@zla02.domus.cz] has quit [Client Quit]
20110706 21:30:09< mordante> neph, btw there also is std::remove_if which places the items to be deleted at the end of the vector then you can remove them from the end to the last item to be removed
20110706 21:30:16-!- Gallaecio [~quassel@zla02.domus.cz] has joined #wesnoth-dev
20110706 21:30:24< neph> Those things aren't the clearest in the project, took me loads of time to fight through them(maybe my lack of experience makes a difference)
20110706 21:30:40< neph> mordante, sounds like a good one, I'll take a look
20110706 21:30:43< neph> thanks
20110706 21:30:55< mordante> ok good luck
20110706 21:30:56-!- Gallaecio [~quassel@zla02.domus.cz] has quit [Remote host closed the connection]
20110706 21:31:19< mordante> there might be things not entirely clean, or the usage changed
20110706 21:32:05< mordante> today at work some people where also unhappy about a piece of code, but also the external usage constrains where different as when the code was designed
20110706 21:32:43< mordante> so suddenly a hidden implementation detail had to be used completely different
20110706 21:34:25-!- Exasperation [4a47319b@gateway/web/freenode/ip.74.71.49.155] has joined #wesnoth-dev
20110706 21:35:04< Exasperation> mordante: looking for me?
20110706 21:36:07< mordante> Exasperation, yup
20110706 21:36:30< mordante> I had a look at your patch and I'm not too happy with it
20110706 21:36:30< neph> :) This reminded me about one project I worked at... It had a mystical line all over it "fillness->(this)"... Noone knew what should it do at first and noone knew where the author was... I was the one who had to investigate. It was horrible. Ended up doing find/replace this line with "" and rewriting the system from scratch
20110706 21:37:14< neph> The word filness didn't give any hints on what it does too
20110706 21:37:17< mordante> Exasperation, the engine normally determines whether markup is allowed or the definition of the widget
20110706 21:37:53< mordante> with your patch it adds another vector where it's unsure what happens if the WML turns it on and the engine turns it off
20110706 21:38:03< Exasperation> I see
20110706 21:38:19< mordante> also keep in mind that the person that added the Lua interface to the widgets never discussed his ideas with me
20110706 21:38:41< mordante> and to be honest I'm not too happy with his design
20110706 21:39:17< Exasperation> there are parts of it I'm not particularly happy with either - I've been trying to remedy some of the issues
20110706 21:39:18< mordante> brb
20110706 21:39:21< Exasperation> ok
20110706 21:53:02-!- Johannes13 [~Johannes@unaffiliated/johannes13] has joined #wesnoth-dev
20110706 21:53:53-!- deekay [~dk@89-79-35-236.dynamic.chello.pl] has joined #wesnoth-dev
20110706 21:53:53-!- deekay [~dk@89-79-35-236.dynamic.chello.pl] has quit [Changing host]
20110706 21:53:54-!- deekay [~dk@wesnoth/developer/dragonking] has joined #wesnoth-dev
20110706 22:04:16-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev
20110706 22:07:01-!- Blueblaze [~Blueblaze@76.202.22.38] has quit [Quit: Blueblaze]
20110706 22:13:50-!- gabba [~gabba@wesnoth/developer/gabba] has joined #wesnoth-dev
20110706 22:14:03< gabba> hi all
20110706 22:14:55< Espreon> Hello.
20110706 22:16:15-!- Sytyi [~sytyi@84-170-133-95.pool.ukrtel.net] has quit [Quit: Leaving.]
20110706 22:16:29-!- EdB [~edb@89.82.194.231] has quit [Remote host closed the connection]
20110706 22:22:18< gabba> tschmitz: How are things?
20110706 22:22:39< tschmitz> gabba: Just learning to use git-svn
20110706 22:22:53< gabba> aha
20110706 22:23:00< tschmitz> gabba: I am about to commit a partial working version of invalid actions
20110706 22:23:02< gabba> What motivated you to start using that?
20110706 22:23:19< tschmitz> the part that doesn't work is seeing the new arrow styles on network allied clients
20110706 22:23:20< gabba> (It's great btw, but the learning curve is steep)
20110706 22:23:43< tschmitz> I didn't want to lump unrelated things into bigger commits anymore
20110706 22:23:58< Aethaeryn> hooray stability
20110706 22:24:04< Aethaeryn> SVN trunk crashes when I fill things in the editor
20110706 22:24:16< Aethaeryn> going to run update to hope it was spotted and fixed
20110706 22:24:37< tschmitz> gabba: How are things goign with you?
20110706 22:24:57< gabba> tschmitz: makes sense, I like being able to modify my commit stack locally before sending the batch with git-svn
20110706 22:25:20< gabba> me, I'm fine :)
20110706 22:25:30< gabba> Pretty busy though
20110706 22:26:25< tschmitz> Oh really?
20110706 22:26:27< gabba> tschmitz: I'll look at your code tonight
20110706 22:26:29< tschmitz> gabba: What with?
20110706 22:28:24< gabba> Various uninteresting stuff... paperwork, housecleaning (didn't do any during my summer course), etc. etc.
20110706 22:28:41< tschmitz> You took a summer class already?
20110706 22:28:53< gabba> Yup, economy remember - that's done
20110706 22:29:43< tschmitz> gabba: Is there more than one summer session at your school?
20110706 22:30:15< gabba> there's a short (intensive) one and an extended (all summer) one
20110706 22:30:36< tschmitz> gabba: I assume you're an intensive student
20110706 22:30:54< gabba> They don't offer the same course, the intensive one usually offers the toughest science/economy courses
20110706 22:30:58< gabba> yup
20110706 22:32:12< tschmitz> gabba: So wait what code of mine were you going to look at tonight?
20110706 22:32:14< gabba> tschmitz: Hmm. July 16: Mid-term evaluation deadline
20110706 22:32:31< gabba> only 10 days left already
20110706 22:32:36< tschmitz> right ...
20110706 22:32:38< tschmitz> that nuisance
20110706 22:32:54< tschmitz> I'm sure both of us will thoroughly enjoy the eval process
20110706 22:33:13< gabba> ^Well, you said you were committing, so I'll look at that commit and whatever other changes you got it since
20110706 22:33:22-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has quit [Remote host closed the connection]
20110706 22:33:57< tschmitz> gabba: Yeah I am still recompiling, presumably due to the "move" to the git repo
20110706 22:34:21< tschmitz> gabba: fortunately, in case I hadn't mentioned this a long time ago, my dad is letting me use his desktop for development while I'm here
20110706 22:35:04-!- dtiger [~dtiger@dynamic-vpdn-93-125-14-217.telecom.by] has quit [Remote host closed the connection]
20110706 22:35:07< gabba> For the mid-term, what's important is that all the bases are in place, with fairly clean and bug-free code
20110706 22:35:51< tschmitz> gabba: Will you be the only one reading the code?
20110706 22:35:54< gabba> That means you should set aside at least 4-5 days for pure testing and bugfixing
20110706 22:36:18< gabba> so you have 5 days left to add features and improve the existing ones
20110706 22:36:38< gabba> Nope, all mentors take a look, but of course I'll be the main evaluator
20110706 22:37:10< tschmitz> Well fortunately this commit will bring us to
20110706 22:37:21< tschmitz> having finished, in some capacity, all the tasks listed as pre-midterm eval
20110706 22:37:47< tschmitz> suppose dead, invalid actions, and network support
20110706 22:37:54< gabba> ^That's assuming you work 7 days a week, which I can't really ask of you, but I know what I'd do facing this kind of pressure :P
20110706 22:38:16< gabba> Right, we're close
20110706 22:39:07< gabba> I'm a bit worried about how you do identification of units across the network though, I'll have to look at how you use underlying_id
20110706 22:39:24< gabba> But it sounded hackish and unreliable in the long-term
20110706 22:39:34< gabba> Did you discuss it with any dev?
20110706 22:40:01< tschmitz> before I implemented that strategy, I asked someone, but I forget whom
20110706 22:40:18< tschmitz> they weren't certain, but I went ahead and tried it anyway
20110706 22:40:59-!- deekay [~dk@wesnoth/developer/dragonking] has quit [Quit: deekay]
20110706 22:42:11< gabba> tschmitz: tomorrow, show up during the busy IRC hours and get a discussion going on your strategy
20110706 22:43:03-!- Upthorn [~ogmar@c-76-105-37-245.hsd1.ca.comcast.net] has quit [Ping timeout: 240 seconds]
20110706 22:45:24< tschmitz> gabba: Who do you think would be interested?
20110706 22:46:17< tschmitz> gabba: or, y'know, know about the stuff
20110706 22:46:33< tschmitz> "the stuff" being ... I guess unit underlying_id's
20110706 22:46:35< gabba> tschmitz: ask at least boucman, mordante, alink, fendrin, Crab_ and Ivanovic if they have an opinion on this - if they don't have an opinion and don't tell you who to ask, we'll decide ourselves
20110706 22:47:23< tschmitz> K well fortunately you mentioned each of their names, so ...
20110706 22:48:00< tschmitz> gabba: As far as what I've discovered myself on the matter,
20110706 22:48:09< gabba> Make sure to describe what you want to achieve and what you're doing, if you just ask "what do you think about underlying_id's they'll likely go "huh?" ;)
20110706 22:48:58< tschmitz> the replay information doesn't give other clients enough information to reliably establish "unit identity" between clients
20110706 22:49:46< gabba> Yeah... how things work in general is that units are tracked through the unit map
20110706 22:50:04< gabba> And as you can only have one unit per hex, basically hex=unit
20110706 22:50:19< tschmitz> yeah exactly
20110706 22:50:41< tschmitz> so if it's at the "right place" at the "right time", then it's the "right unit"
20110706 22:50:57< gabba> Since our planned moves are projected upon the existing unit positions, I think you should be able to build on this
20110706 22:50:59< tschmitz> so now we just need to make sure that whiteboard data also get processed at the "right time"
20110706 22:51:23-!- MeccaGod [majs@host189-199.bornet.net] has quit []
20110706 22:51:24< tschmitz> gabba: Do you think it would be a good idea to include whiteboard data in the replay itself?
20110706 22:51:51< gabba> Interesting question
20110706 22:52:12< gabba> Now that whiteboard and undo are mutually exclusive, it could be possible
20110706 22:52:41< tschmitz> gabba: I avoided that because I didn't want to dump our whiteboard tags into replay files that don't want to know about it
20110706 22:52:46< tschmitz> gabba: Or that kind of thing
20110706 22:53:06< tschmitz> gabba: i.e. I made my own packet type so that our separate thing is separate
20110706 22:53:14< tschmitz> er, y'know, tag type
20110706 22:53:46< tschmitz> I think it'll work if we keep it that way
20110706 22:53:56< gabba> tschmitz: well, one good question is whether we want whiteboard planning to be shown when you actually use the replay to see the game again
20110706 22:54:01< tschmitz> I think it'd also be workable to insert it into the replay itself, but probably not necessary
20110706 22:54:09< tschmitz> gabba: Yeah I was wondering what you thought about that
20110706 22:54:40< tschmitz> gabba: Do you think people watch the whiteboard forum topic?
20110706 22:55:27< gabba> Yes, people post there once in a while, but we could move it to a more visible spot eventually
20110706 22:55:37< gabba> I guess it's not really relevent what people were planning once they've picked a move though
20110706 22:55:57< tschmitz> Aye
20110706 22:56:00< gabba> Not sure the replay needs to know about it
20110706 22:56:17< tschmitz> I think we can work without putting it in the replay
20110706 22:56:39< tschmitz> So I was thinking that part of the next step at this point would be
20110706 22:56:41< gabba> No, what you need to worry about is that a planned move isn't transmitted before the gamestate is synchronized on all clients
20110706 22:56:57< gabba> Not even sure it can happen... I mean, wesnoth isn't multithreaded after all
20110706 22:56:59< tschmitz> determining why we needed unit identity established reliably in the first place
20110706 22:57:27< tschmitz> yeah
20110706 22:59:20< gabba> Well, I'll look at your code tonight as I said, the discussion will be less abstract once I do that
20110706 22:59:31< tschmitz> OK.
20110706 22:59:45< gabba> Can you point me to the sections where you used underlying_id to identify units?
20110706 22:59:48< tschmitz> I'll continue thinking on it and I'll get this code committed in the meantime
20110706 23:00:00< tschmitz> gabba: Um, yes, let's see ...
20110706 23:00:14< tschmitz> that's in the serialization and deserialization code, which is
20110706 23:00:29< gabba> (I can use a search on the whiteboard files too, if you think that's sufficient to understand what's going on)
20110706 23:00:36< tschmitz> in the constructor of every action subclass that needs it
20110706 23:00:39< tschmitz> and
20110706 23:00:49< tschmitz> the to_config function of every action subclass that needs it
20110706 23:01:05-!- Crendgrim [~crend@77-22-254-233-dynip.superkabel.de] has quit [Remote host closed the connection]
20110706 23:01:18< gabba> Ok, that should be fairly straightforward
20110706 23:01:18< tschmitz> I think wb::recruit doesn't need to serialize a unit, and wb::attack relies on its superclass move to do the job, so
20110706 23:01:40< tschmitz> it's just wb::move, wb::recall (especially this one), and wb::suppose_dead
20110706 23:02:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20110706 23:03:10< tschmitz> their respective constructors will have the meat of the deal
20110706 23:03:44< tschmitz> to_config() just gets the unit's underlying_id and puts it in the config
20110706 23:11:00-!- mjs-de [~mjs-de@f053188142.adsl.alicedsl.de] has quit [Remote host closed the connection]
20110706 23:15:28-!- neph [~neph@80.233.231.12] has quit [Ping timeout: 252 seconds]
20110706 23:28:26-!- Upth [~ogmar@public-nat1.scc.losrios.edu] has joined #wesnoth-dev
20110706 23:28:26-!- Upth is now known as Upthorn
20110706 23:36:22< mordante> Exasperation, what exactly are you not happy with
20110706 23:37:28< mordante> gabba, I'm interested when around
20110706 23:39:23< Exasperation> well, from the perspective of someone who has to use the interface, there are a lot of things that you either can't do from Lua, or that you can only do awkwardly/in a limited fashion
20110706 23:40:45-!- Shakey [HydraIRC@c-24-1-105-76.hsd1.il.comcast.net] has joined #wesnoth-dev
20110706 23:40:49< mordante> yeah when originally designed there was no Lua
20110706 23:41:19< mordante> but I'm somewhat disappointed since the person who implemented it said everything could be done from Lua
20110706 23:42:06< Exasperation> well, it can, if somebody implements interface functions between Lua and gui2
20110706 23:42:33< mordante> I was lead to believe that interface was already there
20110706 23:42:48< Exasperation> lots of things are missing from the interface provided
20110706 23:44:23< Exasperation> for example, there's currently no access to tcontrol's set_use_markup member function from Lua
20110706 23:44:53< mordante> true but that function shouldn't be accessed directly
20110706 23:45:05< mordante> only a few places should have access to it
20110706 23:45:33< mordante> just too bad you can't friend just for one function in C++
20110706 23:49:11< Exasperation> well, but there doesn't seem to be access to the indirect methods of access for it either
20110706 23:50:19< Exasperation> for example, if you have something like the tip of the day multi-page
20110706 23:51:30< Exasperation> that specifies markup in what gets passed to add_row
20110706 23:53:13< Exasperation> but you can't currently use add_row directly from Lua, either; the Lua function that does have access to add_row doesn't allow you to specify whether markup is allowed
20110706 23:56:18-!- Upthorn [~ogmar@public-nat1.scc.losrios.edu] has quit [Quit: this quit message is 100% guaranteed not to contain obscenity.]
20110706 23:56:24< mordante> like I said I never was consulted by the person who decided it was a good idea to export gui2 to Lua
20110706 23:56:38< mordante> and he told me everything worked completely
20110706 23:57:07< mordante> IMO gui2 is too immature to expose to Lua, there's still some lowlevel stuff that hasn't settled yet
20110706 23:57:31< mordante> the WML part is rather stable but the C++ side still has some issues left
20110706 23:58:20< Exasperation> well, the things that there's access to do work, but there are also things that there just aren't access to
20110706 23:58:51< Exasperation> in some cases very basic things
20110706 23:59:12< mordante> yup so it seems, it seems the person who exported didn't export everything properly
20110706 23:59:26< mordante> and misinformed us about the status :-(
--- Log closed Thu Jul 07 00:00:04 2011