00:02:49 <Gretell> Unstable branch on crawl.develz.org updated to: 0.10-a0-2008-g364ed1a (32)
00:04:34 -!- ainsophyao has joined ##crawl-dev
00:14:05 -!- Mottie has quit [Ping timeout: 258 seconds]
00:15:24 -!- valrus_ has quit [Remote host closed the connection]
00:16:58 <Gretell> Windows builds of master branch on crawl.develz.org updated to: 0.10-a0-2008-g364ed1a
00:29:26 -!- Textmode has joined ##crawl-dev
00:33:36 -!- chukamok has quit [Quit: ChatZilla 0.9.87 [Firefox 8.0/20111104165243]]
00:42:38 -!- Guest13696 has quit [Read error: Connection reset by peer]
00:45:26 -!- Twilight has joined ##crawl-dev
00:46:03 -!- Twilight is now known as Guest24897
00:50:28 -!- jeanjacques has joined ##crawl-dev
01:17:05 <Pacra> You almost think you hear a voice: "Seek not undue power, mortal."
01:17:15 <Pacra> shouldn't these TSO vaults have special cases for undead
01:17:26 <Pacra> as they are not technically mortal
01:17:39 <Pacra> also doesn't sound as.... stern :]
01:41:12 -!- dtsund has quit [Quit: dtsund]
01:59:28 -!- st_ has joined ##crawl-dev
02:06:20 <Ashenzari> Disconnected Orc (no way down to Orc:4 other than a hatch) (https://crawl.develz.org/mantis/view.php?id=4915) by elliptic
02:21:25 <Ashenzari> Corruption-summoned monsters attack each other if you attack them. (https://crawl.develz.org/mantis/view.php?id=4916) by elliptic
02:47:15 <Pacra> elliptic - it certainly sounds chaotic, though :O]
02:54:21 -!- monqy has quit [Quit: hello]
02:58:35 -!- ais523 has joined ##crawl-dev
02:58:40 -!- Wop has quit [Ping timeout: 240 seconds]
03:09:32 -!- Textmode has quit [Ping timeout: 252 seconds]
03:12:25 -!- Wop has joined ##crawl-dev
03:36:19 -!- mikee_ has quit [Quit:  I love my HydraIRC -> http://www.hydrairc.com <-]
03:38:49 -!- cosh has joined ##crawl-dev
03:39:21 <cosh> hi
03:51:43 -!- ainsophyao has quit [Remote host closed the connection]
04:01:43 -!- Zaba has quit [Ping timeout: 260 seconds]
04:10:04 -!- Zaba has joined ##crawl-dev
04:15:02 -!- syllogism- has joined ##crawl-dev
04:20:18 -!- edlothiol has joined ##crawl-dev
04:34:21 -!- Pacra has quit [Quit: This computer has gone to sleep]
04:38:20 -!- ainsophyao has joined ##crawl-dev
05:00:06 <Gretell> OSX builds of master branch on crawl.develz.org updated to: 0.10-a0-2008-g364ed1a
05:13:11 -!- ainsophyao has quit [Remote host closed the connection]
05:14:42 -!- blabber has quit [Quit: okthxbb]
05:19:26 <kilobyte> due: if you partially damage a spirit, it still gives xp when it fades away.  Is that intentional?
05:19:27 <Henzell> kilobyte: You have 7 messages. Use !messages to read them.
05:19:27 <kilobyte> due: also, they seem to ignore shouts, not awakening until you actually hit them
05:22:16 -!- ais523 has quit [Ping timeout: 240 seconds]
05:26:53 <due> hm
05:26:55 <due> I'm not sure
05:27:14 <due> I'll have to look into it later on in th eweek, I'm working this weekend
05:30:42 <kilobyte> xp on fade is easy, just tell me whether this is intentional or not
05:31:50 -!- ainsophyao has joined ##crawl-dev
05:36:00 -!- Mottie has joined ##crawl-dev
05:36:06 -!- ainsophyao has quit [Remote host closed the connection]
06:00:12 <kilobyte> The apis gores you! Elyvilon protects you from harm!
06:01:33 -!- MarvinPA has joined ##crawl-dev
06:06:08 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:07:29 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:08:24 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:09:20 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:09:28 <kilobyte> damn Nemelex scummers :p
06:09:57 <kilobyte> this guy might be already in a bazaar though
06:13:19 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:13:37 <cosh> what's the problem
06:13:57 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:14:52 <kilobyte> if you go through all the bazaars, the game will crash on trying to enter a new one
06:16:10 <kilobyte> there's 39 of them so some serious scumming is needed to get that many legendary Trowel cards
06:16:39 <cosh> so
06:16:43 <cosh> no more bazaars for clees? :D
06:22:40 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
06:27:47 <cosh> wtf
06:27:47 <cosh> just compiled the latest version
06:27:47 <cosh> playing webtiles the floor looks like trees and stairs have the shop icon
06:27:47 <cosh> Oo
06:29:19 <cosh> bbl
06:29:21 -!- cosh has quit [Quit:  Try HydraIRC -> http://www.hydrairc.com <-]
06:33:37 -!- ZChris13 has quit [Ping timeout: 260 seconds]
06:55:57 -!- G-Flex has joined ##crawl-dev
07:03:41 -!- ZChris13 has joined ##crawl-dev
07:05:35 -!- ais523 has joined ##crawl-dev
07:07:04 -!- Mu_ has quit [Quit: Defecator, may everything turn out okay so that you can leave this place.]
07:09:09 -!- Ragdoll has joined ##crawl-dev
07:17:24 -!- ais523 has quit [Read error: Connection reset by peer]
07:17:30 -!- ais523 has joined ##crawl-dev
07:24:37 -!- ais523 has quit [Ping timeout: 245 seconds]
07:27:53 -!- ais523_ has joined ##crawl-dev
07:38:03 <edlothiol> !tell cosh about the wrong tiles -- it's a caching issue; clear your browser cache as a workaround
07:38:03 <Henzell> edlothiol: OK, I'll let cosh know.
07:38:23 -!- ainsophyao has joined ##crawl-dev
07:49:45 -!- ZChris13 has quit [Ping timeout: 276 seconds]
07:53:36 -!- ais523_ has quit [Quit: Page closed]
07:59:26 -!- ZChris13 has joined ##crawl-dev
08:05:27 -!- edlothiol has quit [Ping timeout: 244 seconds]
08:05:58 -!- MarvinPA has quit []
08:09:04 -!- ZChris13 has quit [Ping timeout: 244 seconds]
08:24:59 -!- MarvinPA has joined ##crawl-dev
08:26:40 -!- Brannock has joined ##crawl-dev
08:55:07 -!- valrus_ has joined ##crawl-dev
09:22:25 -!- ZChris13 has joined ##crawl-dev
09:35:28 -!- Wop has quit [Ping timeout: 240 seconds]
09:39:19 -!- Zaba_ has joined ##crawl-dev
09:39:33 -!- Zaba has quit [Disconnected by services]
09:39:36 -!- Zaba_ is now known as Zaba
09:49:22 -!- Wop has joined ##crawl-dev
09:51:17 -!- ZChris13 has quit [Ping timeout: 245 seconds]
09:56:16 -!- ZChris13 has joined ##crawl-dev
10:10:28 -!- valrus_ has quit [Remote host closed the connection]
10:20:00 -!- ainsophyao has quit [Remote host closed the connection]
10:20:05 -!- alefury has quit [Quit: ChatZilla 0.9.85 [Iceape 2.0.11/20110929064733]]
10:21:40 -!- valrus has quit [Remote host closed the connection]
10:23:44 -!- ncampion has joined ##crawl-dev
10:25:34 -!- ncampion has quit [Client Quit]
10:25:52 -!- ncampion has joined ##crawl-dev
11:12:32 -!- Ragdoll has quit [Read error: Connection reset by peer]
11:13:23 -!- edlothiol has joined ##crawl-dev
11:27:35 -!- monqy has joined ##crawl-dev
11:28:45 -!- Ragdoll has joined ##crawl-dev
12:10:38 -!- Pacra has joined ##crawl-dev
12:14:33 -!- medgno has joined ##crawl-dev
12:19:46 -!- Xiberia has joined ##crawl-dev
12:22:51 -!- jeanjacques has quit []
12:26:35 -!- Pingas has quit [Read error: Connection reset by peer]
12:26:50 -!- Pingas has joined ##crawl-dev
12:38:21 -!- ais523 has joined ##crawl-dev
12:42:33 -!- Guest24897 has quit [Read error: Connection reset by peer]
12:43:35 -!- Guest24897 has joined ##crawl-dev
12:45:45 <Gretell> Ragdoll (L1 MuCK) ASSERT(x >= 1 && x <= sz.x) in 'libutil.cc' at line 952 failed. (D:1)
12:51:36 -!- medgno has quit [Quit: Quitting]
12:54:49 -!- Ragdoll has quit [Quit: Ik ga weg]
12:54:57 -!- Ragdoll has joined ##crawl-dev
13:14:20 -!- ZChris13 has quit [Quit: ChatZilla 0.9.87 [Firefox 8.0/20111104165243]]
13:18:17 -!- Mottie has quit [Read error: Connection reset by peer]
13:19:50 -!- Ragdoll has quit [Read error: Connection reset by peer]
13:20:02 -!- Ragdoll has joined ##crawl-dev
13:20:33 -!- SamB_ has joined ##crawl-dev
13:22:56 -!- SamB has quit [Ping timeout: 252 seconds]
13:37:19 <CIA-55> 03edlothiol * r0bd416116ad3 10/crawl-ref/source/webserver/static/scripts/client.js: Webtiles: Don't animate milestones on initial page load.
13:37:30 <CIA-55> 03edlothiol * r2ea8e6eb7743 10/crawl-ref/source/webserver/ (config.py game_data_handler.py templates/client.html): Webtiles: Improve caching settings.
13:43:49 -!- edlothiol has quit [Ping timeout: 240 seconds]
13:55:12 -!- MarvinPA_ has joined ##crawl-dev
13:55:28 -!- Wop has quit [Ping timeout: 240 seconds]
13:58:07 -!- MarvinPA has quit [Ping timeout: 248 seconds]
14:04:28 <Ashenzari> "ERROR: range check error ([random integer] / 211)" upon entering the abyss (https://crawl.develz.org/mantis/view.php?id=4917) by reid
14:08:45 -!- Pingas has quit [Quit: Leaving]
14:09:03 -!- Pingas has joined ##crawl-dev
14:09:34 -!- Wop has joined ##crawl-dev
14:11:22 -!- edlothiol has joined ##crawl-dev
14:17:32 -!- MarvinPA_ is now known as MarvinPA
14:20:12 -!- Ragdoll has quit [Read error: Connection reset by peer]
14:20:28 -!- Ragdoll has joined ##crawl-dev
14:41:13 -!- dtsund has joined ##crawl-dev
14:58:05 -!- Pingas has quit [Ping timeout: 252 seconds]
15:01:10 -!- Pingas has joined ##crawl-dev
15:02:39 -!- heteroy has joined ##crawl-dev
15:02:45 <heteroy> hi
15:03:03 <heteroy> anyone know whose pet project the dwarf branch was?
15:04:03 <elliptic> blue_anna
15:04:07 <elliptic> !seen blue_anna
15:04:07 <Henzell> I last saw blue_anna at Thu Sep 23 23:51:01 2010 UTC (about 1y 8w 21h 13m 6s ago) quitting with message Quit: Saliendo.
15:21:27 <kilobyte> heteroy: I tried to generate a map using many vaults and a postprocessor, but failed (mostly due to plenty of other projects, and too little time)
15:21:50 <kilobyte> however, there's a crapload of vaults, and the branch was already cut to a single level
15:22:43 <heteroy> I'm tempted to try my hand at more than just editing .des files. guess i need to deal with git?
15:22:46 <kilobyte> so it might be easy to do this with massive use of subvaults and perhaps ' ' with the standard builder
15:23:06 <kilobyte> for any serious patching, yeah
15:23:44 <kilobyte> an one-off small patch can use "diff -Nurd", but doing the same via git gives you nice credits and commit metadata
15:23:54 <kilobyte> so "blame" will show who's guilty for what
15:24:19 <kilobyte> people keep complaining that Elf is still boring
15:24:25 <heteroy> i still don't see how I'm supposed to get my edits looked at by other people. how does everything get amalgamated into trunk and then a released version?
15:24:53 -!- st_ has quit [Ping timeout: 252 seconds]
15:24:58 <kilobyte> so I'd say, let's cut one or two levels off Elf and subvault Dwarf into shape
15:25:21 <heteroy> elf's at what, 6 floors now?
15:25:24 <kilobyte> 5
15:26:05 <kilobyte> blue_anna's vaults are extremely loot-heavy, so even after a thorough nerfing they'd give more than two levels of Elf
15:26:22 <kilobyte> and you don't get almost any xp from Elf so no one will cry
15:26:49 <heteroy> shouldn't be too hard to add some more vaults to dwarf to thin things out.
15:27:00 <kilobyte> there's one problem: changing a branch's length requires a major save bump
15:27:25 <kilobyte> a fix for that is already ready, but, ironically, it's on a branch that breaks major save compat :p
15:27:43 <heteroy> :/
15:29:30 <elliptic> kilobyte: you added dragonskin cloak, right? any idea why it is showing up as melded for my ogre (who isn't in any form)?
15:29:38 <elliptic> "T - melded +4 dragonskin cloak"
15:37:16 <kilobyte> there's a hack with melding but it should get cleared when you exit the % screen
15:37:43 <kilobyte> hrm, I see... you might have exited via SIGHUP
15:37:57 <heteroy> ...trying to see how to go about setting up crawl for development work.
15:38:31 <heteroy> is there a simple straightforward way to do this?
15:38:56 <elliptic> kilobyte: whenever I go to the % screen it looks like that, and I'm just exiting that with esc
15:39:52 <kilobyte> ... doh :p
15:44:05 <kilobyte> fixed, got some other changes to debug first so not pushing
15:44:20 <kilobyte> (will try after midnight or tomorrow morning)
15:47:48 <elliptic> also, anyone know why CDO is hanging if you press 'w' to try to watch games?
15:48:44 <elliptic> dare I hope that this has something to do with getting webtiles watchable in console?
15:51:22 <MarvinPA> heteroy: install.txt and docs/develop/git have instructions on how to get git set up
15:51:37 <MarvinPA> and how to compile locally and so on, if that's what you mean
15:53:38 -!- Ragdoll has quit [Quit: Ik ga weg]
15:54:33 -!- cosh has joined ##crawl-dev
15:54:46 <cosh> hi
15:54:47 <Henzell> cosh: You have 1 message. Use !messages to read it.
15:54:52 <cosh> !messages
15:54:53 <Henzell> (1/1) edlothiol said (8h 16m 49s ago): about the wrong tiles -- it's a caching issue; clear your browser cache as a workaround
15:55:18 <cosh> yea right, that worked :p thanks
15:55:40 <edlothiol> cosh: I also fixed it in a more permanent way now
15:55:55 <cosh> nice :) tho it was the first time that happened to me after a lot of games
15:56:02 <cosh> so it shouldn't occur too often anyways
16:01:57 <heteroy> "Do NOT get any of the versions that do not have 'netinstall'" :/
16:02:09 <heteroy> odd choice of language
16:02:31 <heteroy> don't do what
16:02:48 <heteroy> donny don't does
16:03:31 <MarvinPA> heh
16:03:42 <MarvinPA> that isn't great wording, yeah
16:03:43 -!- evilmike has joined ##crawl-dev
16:07:27 <evilmike> I was wondering, is there anywhere I can download the source for 4.1 alpha? It would be interesting to look at it
16:08:08 <heteroy> please use to make the giant race a thing in .10
16:09:04 <evilmike> I know someone must have the source for it somewhere, 4.1 is playable on cdo after all. But I can't find it anywhere
16:09:32 -!- galefury has joined ##crawl-dev
16:09:40 <evilmike> it would also be a good addition to my collection of obsolete versions of crawl
16:09:51 -!- galefury is now known as alefury
16:10:19 <heteroy> giant race cant wear any armour except cloak or wield anything smaller than 2 handers. and large shields. can use both at the same time.
16:11:20 <heteroy> get's frost / fire / stone flavour mutations :p
16:11:41 <evilmike> great apts too
16:12:26 <SamB_> obviously -99 for short blades
16:12:50 <heteroy> it would be grayed like armour is for Op
16:13:39 <SamB_> isn't that what -99 does ?
16:13:46 * SamB_ might have the wrong number of 9s
16:13:59 <heteroy> i don't know
16:14:10 <evilmike> yeah it's -99
16:14:31 <heteroy> cd..
16:14:34 <heteroy> oops
16:22:39 -!- ais523 has quit [Remote host closed the connection]
16:34:07 -!- Pacra has quit [Quit: Leaving]
16:35:43 -!- Pacra has joined ##crawl-dev
16:38:15 <Fyren> evilmike: Asking on the roguelike.misc might find you source.
16:38:26 <Fyren> Plus a missing "newsgroup" somewhere in there.
16:39:05 <evilmike> I might try that, it seems a bit dead though. I wouldn't be surprised if someone here has it (or knows where to find it)
16:40:49 <elliptic> so nobody knows what is up with watching games not working on CDO?
16:41:34 <evilmike> I was watching 78291 playing a 4.1 game a couple hours ago, when it stopped working, and then tried to spectate again but couldn't
16:41:52 <evilmike> I'd say it happened 5 or 6 hours ago
16:43:09 <elliptic> napkin: around?
16:43:15 <Napkin> yes
16:44:05 <elliptic> napkin: any idea why CDO is hanging when you press 'w' to watch games?
16:44:12 <Napkin> DGL?
16:44:21 <elliptic> yeah
16:47:09 <Napkin> lol, nice
16:47:25 <Napkin> $> ps -ef | grep dgamelaunch | wc -l
16:47:25 <Napkin> 243
16:47:54 -!- evilmike_ has joined ##crawl-dev
16:48:45 <|amethyst> Napkin:  strace -p  one to see what it's doing maybe?
16:50:23 -!- evilmike has quit [Ping timeout: 244 seconds]
16:52:01 <Napkin> futex(0x7fd1a701a000, FUTEX_WAIT, 0, NULL) = ? ERESTARTSYS (To be restarted)
16:52:05 <Napkin> lol, right
16:52:10 <|amethyst> oh well
16:52:21 <|amethyst> was hoping it would be something referring to an open FD
16:52:31 -!- evilmike_ has quit [Ping timeout: 248 seconds]
16:53:25 <|amethyst> you could attach with gdb -p  and do a backtrace, depending on how much you optimised and whether the binary is stripped
16:53:57 <Gretell> Eodun (L3 DsFi)  (D:2)
16:53:58 <Gretell> effo (L11 DgWz)  (Orc:2)
16:53:59 <Gretell> Danei (L6 HaEn)  (D:4)
16:54:00 <Gretell> dwarfmountainbat (L27 DDEE)  (D:15)
16:54:01 <Gretell> Turgor (L17 DrCj)  (D:16)
16:54:02 <Gretell> soul (L10 SpAK)  (D:11)
17:04:53 <Napkin> omg, can't get anything done... geez...
17:05:07 -!- Elynae has joined ##crawl-dev
17:07:54 <Napkin> seems to be a problem with shared memory
17:14:30 <heteroy> trying to clone the crawl repository...do i want to do this as a developer (git clone git@gitorious.org:crawl/crawl.git)?
17:14:41 <SamB_> of course there's a problem with shared memory
17:19:38 <Napkin> ok, fixed
17:20:16 <elliptic> napkin: thanks!
17:20:37 <Napkin> first one of this kind
17:20:54 -!- Elynae has left ##crawl-dev
17:21:29 <elliptic> heteroy: I think you want to do git clone git://gitorious.org/crawl/crawl.git
17:21:52 <elliptic> the other thing is for people with commit rights
17:22:17 <Napkin> you can use ssh for any project, if you have a gitorious account
17:22:34 <heteroy> I just created one
17:22:37 <Napkin> in any case, easier to set the protocol instead of relying on guessing
17:23:44 <heteroy> i just didn't know if you should generate an ssh key. i plan to do some dev stuff, but can't figure if I should try and get those rights.
17:24:15 <heteroy> obviously I want to stay out of the way as much as possible
17:24:21 <Napkin> i think you will need an ssh key, if you want to use git-over-ssh on gitorious
17:26:35 -!- Pacra has quit [Quit: Leaving]
17:27:02 <CIA-55> 03edlothiol * r1bf799a66bc9 10/crawl-ref/source/webserver/ws_handler.py: Fix Webtiles rc editing being broken because of the lobby refactoring.
17:27:08 <Napkin> once you uploaded your key, heteroy, you can use ssh://git@gitorious.org/crawl/crawl.git
17:28:51 <Napkin> but git://gitorious.org/crawl/crawl.git is just as good for read-only access
17:34:18 -!- Pacra has joined ##crawl-dev
17:41:32 -!- Danei has quit [Ping timeout: 244 seconds]
17:42:25 <|amethyst> heteroy:  you should do the ssh key thing anyway, though, so you can push to your cloned repositories
17:43:18 <|amethyst> heteroy:  since you need to have the commit in some repo on gitorious before you can make a merge request (which seems to be the easiest way to get large changes to the devs)
17:44:49 <heteroy> wading through it now.   would i want to have my own repo, or is there a specific place. guess that will become apparent soon
17:45:23 <Napkin> to make your changes available to others in an easy way, a repo of your own is best
17:45:36 <heteroy> or clone rather. i'm still not completely clear on the terms
17:45:43 <Napkin> you will clone crawl, hack, commit, hack, commit, and then push to your repo
17:46:07 <|amethyst> you use "fork this project" on the website to make your repo
17:46:22 <Napkin> another option, yeah
17:46:35 <|amethyst> ah, yeah, I guess you can just push
17:47:25 <|amethyst> does gitorious still provide the backlink to the original crawl repo when you do it that way?
17:47:48 <Napkin> is that important?
17:48:00 <|amethyst> not really I guess
17:48:13 <Napkin> would be clever if
17:48:20 <|amethyst> unless it prevents you from doing (or makes it harder to do) a merge request
17:48:31 <edlothiol> you don't really need to bother with making a clone on gitorious anyway until you actually have something you want to make available
17:48:36 <|amethyst> yeah
17:48:51 <edlothiol> and for small patches, uploading them on mantis is also fine
17:49:11 <|amethyst> you can clone your local copy from git:// or http://, and only when you're ready to share do you push to your own repo
17:49:52 <|amethyst> git lets you configure your local repo to push to a different address than your origin, so that's not a problem
17:50:12 <Napkin> first time git, heteroy?
17:50:16 <heteroy> yes
17:50:35 <Napkin> used any other source code management system before?
17:50:42 <heteroy> no
17:50:48 <Napkin> great! lucky you :)
17:50:58 <Napkin> that will make learning git _much_ easier
17:51:27 <Napkin> you need to keep in the back of your head, that this clone creates a full copy of the current crawl and all its history as well
17:52:57 <Napkin> you do some changes, and then "commit" (as in save game) for you only. once you are comfy with the changes, then you can "push" (as in upload) your full copy somewhere for others to look at
17:55:40 <heteroy> if people are editing the same files at the same time on different clones doesn't that cause problems when they both have changes to commit to the main repository.
17:55:59 <heteroy> even coordinated it seems like it could be unwieldy
17:56:05 <|amethyst> heteroy:  before you can push, you have to pull to make yourself up-to-date
17:56:21 <|amethyst> then git will inform you of any conflicts, and not let you commit until you've resolved them
17:56:34 <|amethyst> once you have, you commit and try to push again
17:56:36 <Napkin> *not let you push/upload until..
17:56:52 <|amethyst> you also can't commit locally until you've resolved them
17:57:21 <Napkin> using "pull" is weird, ja ;)
17:57:56 <|amethyst> if you're doing a bunch of stuff that isn't ready to go into trunk yet, you can create a branch... this is like an alternate history, alongside trunk
17:58:30 <SamB_> is, in fact
17:58:33 <|amethyst> then when it's ready you merge that into trunk, resolve conflicts, and then push the new trunk
17:58:54 <SamB_> and, hopefully, nobody pushed anything in the meantime ;-)
17:59:03 <|amethyst> are you familiar with graph-theory terms?  "directed acyclic graph" in particular?
17:59:36 <heteroy> i'd worry about working in files that get modified often because won't that create a lot of conflicts if you've been working on a project for a while in the meantime.
17:59:51 <heteroy> no
17:59:57 <ghallberg> heteroy: The merging is pretty intelligent.
18:00:13 <ghallberg> So unless you've been changing the same lines, it shouldn't be that problematic.
18:01:03 <MarvinPA> that's probably only likely to be an issue in really large changes over a long period of time (like the fight rewrite which had a few months of not being worked on and then a ton of conflicts to resolve)
18:01:09 <|amethyst> heteroy:  if you're modifying the same lines can be... Cryp71c has a branch in which he is refactoring and rewriting the fight code; he was away for a few months and it took him a number of days to successfully resolve all the conflicts
18:01:44 <|amethyst> but that's because that's a huge refactoring, touching a lot of places
18:02:06 <heteroy> i'm sick of wikipedia's founder staring into my soul
18:02:15 <heteroy> i could image
18:02:18 <heteroy> imagine
18:02:29 <Napkin> and he continues to stare even after you donated!
18:02:41 <|amethyst> the picture kind of reminds me of Kevin Spacey from Se7en
18:02:57 <Napkin> heh, reminds me..
18:03:10 -!- HangedMan has joined ##crawl-dev
18:03:13 <Napkin> http://1.asset.soup.io/asset/2547/1905_9289_960.jpeg !
18:04:14 <heteroy> someone posted one from the article about paranoia about being seen
18:17:13 -!- Danei has joined ##crawl-dev
18:20:01 -!- Pacra has quit [Read error: Connection reset by peer]
18:23:33 -!- Pacra has joined ##crawl-dev
18:42:23 <G-Flex> Napkin: hahahaha
18:43:17 <G-Flex> see also: http://i.imgur.com/jgJMd.jpg
18:51:16 -!- cosh has quit []
18:52:19 -!- alefury has quit [Remote host closed the connection]
19:00:46 -!- Textmode has joined ##crawl-dev
19:43:47 -!- syllogism- has quit []
19:47:11 -!- Wensley has joined ##crawl-dev
19:51:42 -!- Cryp71c_ has joined ##crawl-dev
19:51:52 -!- Cryp71c has quit [Disconnected by services]
19:51:55 -!- Cryp71c_ is now known as Cryp71c
19:52:15 -!- Cryp71c_ has joined ##crawl-dev
19:53:14 <Cryp71c> Grr, left my work system on, clearly...now it will bug me all weekend.
20:01:21 -!- ainsophyao has joined ##crawl-dev
20:02:30 -!- Aegrisomnia has joined ##crawl-dev
20:10:49 <Cryp71c> !seen kilobyte
20:10:50 <Henzell> I last saw kilobyte at Fri Nov 18 21:44:21 2011 UTC (4h 26m 29s ago) saying (will try after midnight or tomorrow morning) on ##crawl-dev.
20:15:50 <Gretell> clees42 (L27 DsFi) ERROR in 'dungeon.cc' at line 2386: No maps or tags named 'bazaar', and no backup either. (Bazaar)
20:26:44 <Cryp71c> !tell Cryp71c Antaeus; dagger ego: flaming v Antaeus; dagger ego:flaming = crash at mon-util.cc:445
20:26:44 <Henzell> Cryp71c: OK, I'll let Cryp71c know.
20:29:54 <Cryp71c> !tell kilobyte oddness afoot, from my limited testing, the damage_done crash occurs in the flaming code only under a chaos brand, never under a true flaming brand, will do more testing and debugging tomorrow.
20:29:55 <Henzell> Cryp71c: You have 1 message. Use !messages to read it.
20:29:55 <Henzell> Cryp71c: OK, I'll let kilobyte know.
20:30:24 <Cryp71c> !tell kilobyte Certainly an easy fix (just to fix the division by 0), but I fear there may be an underlying instability that would remain uncorrected, arising later in other areas that utilize the same buggy code.
20:30:24 <Henzell> Cryp71c: OK, I'll let kilobyte know.
20:35:25 -!- valrus has joined ##crawl-dev
20:38:07 -!- Cryp71c has quit [Ping timeout: 248 seconds]
20:40:38 <SamB_> hmm, this artifact amulet isn't auto-IDing as stasis, even though it's plain as day that it is stasis...
20:41:35 <kilobyte> SamB_: auto-ID on artefacts is buggier than Ballmer's dog
20:41:36 <Henzell> kilobyte: You have 9 messages. Use !messages to read them.
20:42:05 <SamB_> I've never met Ballmer's dog
20:42:11 <kilobyte> most of ID code starts with if (!artefact(item))
20:42:13 <SamB_> I didn't even know he had a dog
20:42:21 <SamB_> yeah, I'm seeing that
20:43:00 <kilobyte> so don't I :p  just assuming the dog has something to do with Windows (and dogs suck in general)
20:43:33 <kilobyte> although I'd be really happy if I could teach this kitty to stop suckling on me :p
20:43:35 <SamB_> I don't think they let the dogs write Windows proper
20:43:44 <SamB_> they might let them do the documentation, though
20:43:53 <kilobyte> heh
20:44:28 <kilobyte> Windows' code is of pretty uneven quality
20:44:43 <SamB_> I said "proper"
20:45:12 <SamB_> i.e. non-extraneous stuff
20:45:47 <kilobyte> kernel is damn solid, networking is flaky (even excluding drivers), etc
20:46:43 <kilobyte> back to ID of artefacts: I admit I am guilty of the if (!is_artefact(item)) thingy too
20:47:07 <kilobyte> STOP SUCKLING, DAMN CAT!!
20:47:58 -!- |Blade has joined ##crawl-dev
20:48:50 <kilobyte> have you investigated auto-ID?
20:50:00 <SamB_> I'm looking at it
20:50:15 <kilobyte> if so, places like main.cc:2110 or player-stats.cc:452 would need to handle artefacts
20:50:33 <kilobyte> (SInv and SustAb)
20:51:08 <kilobyte> I didn't know how to do it so I went the lame incomplete way :(
20:51:10 <kilobyte> sorry
20:52:05 <SamB_> kilobyte: what exactly would it need to do there?
20:52:27 <SamB_> I mean, besides not bailing when is_artefact(*ring)
20:53:54 <kilobyte> if I knew, I'd code it already :p
20:54:13 <kilobyte> I suspect it's something to do with fake_rap
21:01:04 <CIA-55> 03SamB * rb3cfd969840c 10/crawl-ref/.gitignore: Add cscope & callgrind files to .gitignore
21:01:14 <CIA-55> 03SamB * rdc92e7232a21 10/crawl-ref/source/dat/lua/stash.lua: New "{throwable}" stash-search prefix.
21:02:38 <kilobyte> <3 {throwable}
21:03:03 <SamB_> how can you already love it, I just added it a minute ago!
21:03:18 <kilobyte> now need to get it into drop filter
21:04:04 <SamB_> make them share lua, then ;-)
21:06:18 <kilobyte> looks like there's no lua hook in the dropping interface
21:06:27 <SamB_> well, there *could* be
21:07:09 <kilobyte> might be too complex though... people would want to have multiple commands, all with its own key
21:07:44 <kilobyte> no idea how to do that right
21:07:49 <SamB_> I just meant that the Ctrl-F there could call into the same sort of hooks
21:08:51 <kilobyte> perhaps just drop_filter could allow Lua, giving people only a single filter at once
21:09:40 <kilobyte> (a good part of it comes from building stacks for Ely and Nemelex)
21:11:01 -!- Cryp71c has joined ##crawl-dev
21:11:50 <kilobyte> cat seems to finally have fallen asleep, looks like I can now try that too :p
21:13:12 <Cryp71c> Rar
21:13:16 <Cryp71c> I'm back, temporarily
21:13:21 <SamB_> 7zip!
21:13:26 <SamB_> lzma!
21:13:31 <SamB_> xz!
21:14:08 -!- |Blade has quit [Ping timeout: 265 seconds]
21:17:52 -!- Wensley has quit [Ping timeout: 240 seconds]
21:23:25 <SamB_> okay, now I'm *really* confused
21:41:05 -!- edlothiol has quit [Ping timeout: 252 seconds]
21:57:36 -!- heteroy has quit [Quit: ChatZilla 0.9.87 [Firefox 3.6.24/20111103063747]]
22:04:24 -!- HangedMan has quit [Ping timeout: 265 seconds]
22:41:07 -!- ainsophyao has quit [Remote host closed the connection]
22:45:48 -!- mikee_ has joined ##crawl-dev
22:47:00 -!- Guest24897 has quit [Ping timeout: 244 seconds]
23:04:36 -!- Pingas has quit [Read error: Connection reset by peer]
23:06:08 -!- Twilight has joined ##crawl-dev
23:06:34 -!- Twilight is now known as Guest33522