01:05:33 03alexjurkiewicz02 07https://github.com/crawl/crawl/pull/721 * 0.22-a0-322-g361bbe5: species: move walking_verb to data 10(87 minutes ago, 7 files, 10+ 13-) 13https://github.com/crawl/crawl/commit/361bbe56a1ff 01:05:33 03alexjurkiewicz02 07https://github.com/crawl/crawl/pull/721 * 0.22-a0-323-gf77e9e2: species: fix build 10(26 minutes ago, 1 file, 7+ 6-) 13https://github.com/crawl/crawl/commit/f77e9e23a579 01:05:33 03alexjurkiewicz02 07https://github.com/crawl/crawl/pull/721 * 0.22-a0-324-g1926224: species: move altar_action to data 10(11 minutes ago, 6 files, 12+ 15-) 13https://github.com/crawl/crawl/commit/1926224ddcd5 01:10:51 03alexjurkiewicz02 07https://github.com/crawl/crawl/pull/721 * 0.22-a0-325-g0e8878d: species: update docs [skip ci] 10(3 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/0e8878df31ac 01:49:30 I'm struggling with git submodules to get them to a good/updated state. When I check git status on any given submodule it says HEAD detached at ... I tried to git checkout master && git pull, but it just says i'm up-to-date (but my diffs online at github say I'm still not picking up latest) 02:00:32 that's how git modules should look; the main repository has the submodule repo checked out at a specific commit 02:00:45 so if you look in the submodule repo it will always have that kind of status 02:01:18 as far as updating them goes, you don't go into the submodule to manipulate it unless you're trying to change the submodule 02:01:40 you use `git submodule update' or possibly `git submodule update --init' 02:01:47 from the parent repo 02:02:02 I think it wants you to be at the base directory of the repo when you do this 02:02:23 Realzy: ^ 02:03:17 interesting 02:03:19 okay 02:04:26 generally speaking, you should not be messing around with submodules if you're not trying to modify a submodule, aside from just running that update command to get any updates 02:06:12 yeah 02:06:25 once upon a time i had to modify one and i've never really got it set straight since 02:07:26 Right now i'm looking at the diff between my fork and crawl/crawl's master, and there's tons of changed submodule stuff 02:07:41 it just looks 'wrong', and i can't seem to get back into a good state 02:08:34 for example, after googling things trying to 'fix' it previously, i added a line to .gitmodules (ignore = dirty) and I can't for the life of me get it to happily go back to the version without that line 02:15:33 I don't know what you've named the remote that's our official repo 02:16:09 but to simply get our version of the file you can do `git checkout REMOTE/master .gitmodule' where REMOTE is the remote name of our repo 02:16:29 this will get you the version of .gitmodules we have in our repo 02:16:31 how would i check that ? 02:16:58 git remote -v show 02:17:30 the name on the left next to the url for our repo will be the remote name 02:17:33 it's set as the upstream 02:17:43 yeah, that's typical 02:18:01 so you can checkout the .gitmodule file like I said above, but this just checks out the file 02:18:43 if you had commited a modification of the file then you need to undo that commit either by commiting the version you just checked out with that command 02:18:51 or by finding the commit where you modified it and rebasing it out 02:19:15 as far as submodule changes 02:19:49 https://i.imgur.com/CobeU6H.png 02:19:59 .gitmodules 02:20:00 sorry 02:20:08 whoops 02:21:34 yeah i feel like i'm in this weird state where i'm driving zig-zags to try and fix things and i should just back up 02:25:09 Unstable branch on crawl.develz.org updated to: 0.22-a0-284-g99d1f74 (34) 02:28:49 -!- KittyTac is now known as KittyTac|Away 03:00:18 Windows builds of master branch on crawl.develz.org updated to: 0.22-a0-284-g99d1f74 03:18:10 -!- KittyTac|Away is now known as KittyTac 03:53:58 Monster database of master branch on crawl.develz.org updated to: 0.22-a0-284-g99d1f74 05:30:47 New branch created: pull/724 (1 commit) 13https://github.com/crawl/crawl/pull/724 05:30:47 03Ryan02 07https://github.com/crawl/crawl/pull/724 * 0.22-a0-285-g0ddd4f1: Faerie Dragon species add. 10(71 minutes ago, 27 files, 219+ 35-) 13https://github.com/crawl/crawl/commit/0ddd4f11d185 05:35:21 -!- amalloy is now known as amalloy_ 06:02:41 Hornet can paralyze despite player have rPois 13https://crawl.develz.org/mantis/view.php?id=11421 by Ololoev 12:24:59 -!- thurin is now known as uprime 13:07:02 Casting Poisonous Vapours can leak information 13https://crawl.develz.org/mantis/view.php?id=11422 by aidanholm 13:12:02 -!- amalloy_ is now known as amalloy 15:12:33 -!- uprime is now known as thurin 16:45:37 -!- Rjs- is now known as Rjs 17:04:41 -!- Bammboobies is now known as Bammboo 18:56:04 -!- amalloy is now known as amalloy_ 22:29:51 AranosTheDestroyer (L2 GhGl) ASSERT(item.base_type == OBJ_ARMOUR || item.base_type == OBJ_STAVES) in 'itemprop.cc' at line 1485 failed. (D:2) 22:40:57 <|amethyst> !lm * crash x=cv 22:40:58 19723. [2018-03-22 01:14:27] [cv=0.21] dstrtn the Warrior (L21 VSWn of Uskayaw) ASSERT(!invalid monster(&mons)) in 'mon-death.cc' at line 1910 failed on turn 39605. (Vaults:4) 22:41:22 <|amethyst> !lm * experimental crash x=cv,vlong 22:41:24 the above crash is hellcrawl related 22:41:33 i'm looking at it 22:41:45 507. [2017-09-04 11:06:15] [cv=0.20-a;vlong=0.20-a0-969-g5a5da1e] ziggurnaut the Grave Robber (L3 DsNe) (D:2) 22:42:16 <|amethyst> yeah, I had been confused because we renamed that file to item-prop.cc a while back :) 22:59:39 wonder if rotatell could spit those into the forks channel 22:59:50 maybe it doesn't have per-crash configuration like that 23:02:58 turns out that that player is new to DCSS in general, dunno how he ended up playing hellcrawl but I guess he found a bug for me 23:30:26 -!- muffindrake1 is now known as muffindrake