00:31:25 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4926-gc5d0056c4d 00:55:49 Fork (bcadrencrawl) on crawl.kelbi.org updated to: 0.03-1974-ge843348d55 03:22:34 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-4926-gc5d0056c4d 08:30:00 <09gammafunk> Well, I said this back in march, when I had only 22 "work in progress" commits, and that of course ballooned to 74, with another 11 commits in side branch. Now I'm going to basically merge all of it in one commit because it's just too much work to go through 85 commits and split them into coherent topics that are actually properly separated 08:31:11 <09gammafunk> So the lesson learned is that wip commit approach is fine, but only for shorter time periods. You just have to make periodic attempts to split the work into sane commits, otherwise you'll never put all the pieces back together 08:38:35 <06pleasingfungus> don’t think there’s a good way to handle long running branches 08:38:49 <06pleasingfungus> whatever you do, you will feel pain 08:39:03 <06pleasingfungus> solution is to not have long lived branches 08:43:20 <09gammafunk> yep 10:25:23 <13Sastreii> so Sniper lets you see invisible bc it's a weapon blessed by Ash! i didn't know that, and i've tried to make the tile more lore focused. also Eos now emits light and is different than a regular morningstar. (fixed shadow too, lol) 10:25:23 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/1117142475979632691/weppsss.png 10:25:23 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/1117142476277436586/legendary_weapons.zip 10:26:19 <13Sastreii> Requested tiles coming soon too 12:10:03 <06pleasingfungus> ooh, excellent! 15:59:46 hi, looking to do some work with dcss, looking to do some simple stuff to refresh my git skills before I start looking at bugs - is there a reason some of the files in the docs are textfiles vs. markdown 16:01:54 <06pleasingfungus> probably not 16:02:10 was thinking of doing a pull request with them rewritten to markdown for consistency's sake 16:13:16 <06pleasingfungus> doesn’t seem like an incredibly useful way to spend time, truthfully 16:13:36 <06pleasingfungus> don’t see much value to that kind of consistency 16:14:48 probably, I tend to be more neurotic about that kind of consistency than most 16:20:14 <06pleasingfungus> crawl is not a game or a codebase that’s consistent, for better or worse 16:20:52 <06pleasingfungus> it’s a hodgepodge of 25+ years and hundreds of contributors’ preferences and whims 16:35:38 might page through things and see if anything needs updated, do the conversion then. got a lot of time on my hands 16:57:35 <06pleasingfungus> sure, that’s reasonable 16:58:00 <06pleasingfungus> we’ve got plenty of archaicisms in those docs, i’m sure 17:06:08 03nicolae02 07[slime_crime_prime_time] * 0.30-a0-1043-gd4105da4af: Add some new Slime Pit endings 10(9 weeks ago, 1 file, 679+ 124-) 13https://github.com/crawl/crawl/commit/d4105da4af1f 17:06:08 03nicolae02 07[slime_crime_prime_time] * 0.31-a0-118-geee9e6aa77: Merge branch 'slime_crime_prime_time' of github.com:crawl/crawl into slime_crime_prime_time 10(22 hours ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/eee9e6aa77f1 17:06:08 03nicolae02 07[slime_crime_prime_time] * 0.31-a0-119-gbea1479570: Make some changes to the slime endings. 10(6 minutes ago, 1 file, 149+ 216-) 13https://github.com/crawl/crawl/commit/bea1479570ce 17:06:08 Branch pull/3088 updated to be equal with slime_crime_prime_time: 13https://github.com/crawl/crawl/pull/3088 17:06:49 <08nicolae> oh for the love of 17:07:39 <08nicolae> that's two commits too many! 17:07:56 <08nicolae> how do i make my local version follow the remote one 17:14:35 not sure what you mean there 17:15:33 at one point I ended up with a null merge that I couldn't get rid of and wasn't on my local branch; I think I ended up doing `git reset --soft` then re-committing my changes and force-pushing? 17:16:15 yeh, that's what my shell history shows 17:18:07 (`git reset --soft HEAD^^` in my case, to back up the repo state to before the good commit and the merge. you may need `HEAD^^^` since you have 3 commits to "squash") 17:28:39 oh, and `git pull` on my branch to get the merge that github had added, before that 18:02:24 <05icoson> Markdown is more user friendly and there’s some value in that 19:48:06 -!- rabbit_ is now known as Guest9420 22:14:01 03PleasingFungus02 07* 0.31-a0-153-ge6debcdd2c: Update hunter description (CarefulOdds) 10(14 minutes ago, 2 files, 2+ 2-) 13https://github.com/crawl/crawl/commit/e6debcdd2c3e 22:14:01 03PleasingFungus02 07* 0.31-a0-154-g56bf346678: Add some tiles that just don't miss (Sastreii) 10(11 minutes ago, 4 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/56bf3466789c 22:22:22 Unstable branch on crawl.kelbi.org updated to: 0.31-a0-154-g56bf346678 (34) 22:34:44 Unstable branch on crawl.develz.org updated to: 0.31-a0-154-g56bf346678 (34) 22:56:11 Windows builds of master branch on crawl.develz.org updated to: 0.31-a0-154-g56bf346678 23:15:10 Unstable branch on cbro.berotato.org updated to: 0.31-a0-154-g56bf346678 (34) 23:54:03 Monster database of master branch on crawl.develz.org updated to: 0.31-a0-154-g56bf346678