00:01:13 <|amethyst> I want to see a github feature where starting your commit message with "Tora! Tora! Tora!" does something 00:01:26 <|amethyst> or "Tony! Toni! Toné!" 00:01:39 someone here willing to give me a crash course on doing git patches? it's been too long and I have a few things I want to help out with 00:01:59 basically need to re-learn how to make a change, publish the patch file then go back to base 00:02:34 |amethyst, well hello there old timer, it's been a long time 00:02:50 <|amethyst> Naruni: docs/develop/git/quickstart.txt might be helpful 00:03:32 yeah I've read that, but it does not explain the stupid git thing too well. for instance, I wrote a little patch earlier today and it screwed up my tree, I have to delete my whole local git clone and reclone it 00:03:52 <|amethyst> Naruni: git format-patch is the command to make the patch file 00:04:11 <|amethyst> git format-patch master..HEAD for example 00:04:23 if I want to tackle a patch request (the one I'm eyeing is the tornado going through a runed door) is it better to create a branch then do the changes and create the patch file? 00:05:19 <|amethyst> then, assuming you don't have stuff left uncommitted in your directory, git checkout master should switch back 00:05:22 <|amethyst> yes 00:05:42 cool thanks 00:05:57 would you suggest a git gui or stick to cli? 00:06:29 <|amethyst> the Github site has some useful stuff 00:07:00 im trying this giteye thing for now 00:07:01 <|amethyst> outside of that I've occasionally used gitg to do nice visualization of complicated histories, but otherwise I stick with the command line 00:07:18 <|amethyst> re the patch, btw 00:07:27 <|amethyst> you might consider a pull request instead 00:07:53 <|amethyst> then you can push stuff directly to github rather than having to resubmit your patch if you make changes based on feedback 00:08:38 <|amethyst> If you search the web for something like "github pull request" you should be able to find lots of docs and tutorials 00:09:10 is it possible to COMPILE_CHECK the size of an unordered_map against something? 00:09:32 I'm not an official dev for crawl, nor do I really want to be. In the past, I thought it worked well for me to post my patch file to the mantis and allow a real dev to QC my work and decide if it should be included 00:09:37 I can only see examples for ARRAYSZ 00:09:58 Naruni: the github gui app is pretty decent 00:10:43 Naruni: if you develop your change as a branch off the official master branch plus pull request, it's much easier to maintain then dealing with stuff like creating a patch file and uploading to mantis 00:10:50 <|amethyst> alexjurkiewicz: std::unordered_map isn't constexpr (and unless we migrated to C++14 or C++17 while I wasn't looking, not much in the standard library is) 00:10:55 <|amethyst> alexjurkiewicz: so you cannot 00:11:19 alexjurkiewicz, ok I'll give it a try. I'm guessing I need to get a github login then 00:11:28 <|amethyst> alexjurkiewicz: your map doesn't actually get created until the program starts up ("static initialization" before main() is called) 00:12:56 Naruni: yeah, you do. The idea is you will fork the official repo to a copy under your name. You keep your repo in sync with the "upstream" (aka official) repo (by clicking the sync button periodically). Then you create a branch in your own repo, write your code, push it to github, and open a pull request 00:14:06 <|amethyst> alexjurkiewicz: There is a function _startup_asserts() in main.cc that you could do that from, except your map is static so that wouldn't work without some way to refer to it from main 00:14:37 <|amethyst> alexjurkiewicz: oh, also, probably the map should be const just in case someone tries messing with it 00:14:47 <|amethyst> or, more likely, accidentally messes with it 00:15:09 <|amethyst> Naruni: also, hi :) 00:15:34 static const or const static? 00:15:53 03Alex Jurkiewicz02 07https://github.com/crawl/crawl/pull/1489 * 0.26-a0-514-ga87d517: squash! WIP Add M_THUNDER_RING and M_FIRE_RING mon flags 10(45 seconds ago, 1 file, 6+ 0-) 13https://github.com/crawl/crawl/commit/a87d5178e53b 00:17:39 <|amethyst> alexjurkiewicz: we use static const about 10x often, and also it's better because const is part of the type but static isn't, so the const should go next to the rest of the type name 00:21:24 03Alex Jurkiewicz02 07https://github.com/crawl/crawl/pull/1489 * 0.26-a0-515-g5d30a30: fixup! fixup! fixup! Add cloud rings for monsters 10(5 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/5d30a30bac4d 00:22:47 <|amethyst> You know, it'd be nice if the github page for the commit searched PRs before saying "This commit does not belong to any branch on this repository" 00:24:38 yeah. The rules about ownership of PR branches are pretty arbitrary 00:27:09 |amethyst: hm, marking the unordered_map const causes some errors: 00:27:09 mon-ench.cc:362:54: error: no viable overloaded operator[] for type 'const unordered_map >' 00:27:09 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/unordered_map:1288:18: note: candidate function not viable: 'this' argument has type 'const unordered_map >', but method is not marked const 00:27:41 <|amethyst> oh, right, you have to use .at() instead of [], since the latter will insert the key if it wasn't found 00:27:58 <|amethyst> (which has the advantage of throwing an exception if nothing was found) 00:28:50 good function name 00:29:18 <|amethyst> (at() will throw an exception if nothing was found, which is probably better) 00:30:05 <|amethyst> err, I said that already, sorry 00:30:22 never a bad thing to repeat c++ knowledge multiple times for me 00:38:00 03Alex Jurkiewicz02 07https://github.com/crawl/crawl/pull/1489 * 0.26-a0-516-gb8092de: Add Ring of Miasma monster enchantment 10(6 minutes ago, 5 files, 10+ 1-) 13https://github.com/crawl/crawl/commit/b8092de27c07 00:38:00 03Alex Jurkiewicz02 07https://github.com/crawl/crawl/pull/1489 * 0.26-a0-517-gca6e4f3: fixup! fixup! fixup! fixup! Add cloud rings for monsters 10(6 minutes ago, 1 file, 4+ 4-) 13https://github.com/crawl/crawl/commit/ca6e4f395a44 00:38:12 ugh whats the command to make the bot tell me where a specific function is? 00:38:12 henzell does that? 00:38:20 ebering: removing wand of clouds seems to have caused some warnings in mon-cast.cc, see for instance this job (which failed for other reasons but shows the errors): https://github.com/crawl/crawl/runs/952221586 00:38:27 ebering: mon-cast.cc:105:14: warning: no previous declaration for ‘ai_action::goodness ai_action::impossible()’ [-Wmissing-declarations] 00:38:43 !source init_pandemonium_lord 00:38:43 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/ghost.cc#L254 00:38:45 Naruni: ^ 00:38:56 danke 00:39:14 !source feat_is_reachable 00:39:14 Can't find feat_is_reachable. 00:39:28 if you have vscode, you can cmd-click on function names anywhere in code to jump to the definition. Or open the project-wide search pane with cmd-shift-f 00:40:18 !source feat_is_reachable_past 00:40:19 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/terrain.cc#L641 01:16:55 !source_feat_is_wall 01:21:31 !source _feat_is_wall 01:21:32 Can't find _feat_is_wall. 01:22:27 !source feat_is_wall 01:22:27 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/terrain.cc#L74 01:27:47 03Alex Jurkiewicz02 07https://github.com/crawl/crawl/pull/1489 * 0.26-a0-518-ga84a757: fixup! fixup! fixup! Add surround_mons_with_cloud helper function 10(5 minutes ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/a84a7571c573 01:27:47 03Alex Jurkiewicz02 07https://github.com/crawl/crawl/pull/1489 * 0.26-a0-519-g686410c: fixup! Fully remove Ring of Flames/Thunder monster spells 10(5 minutes ago, 1 file, 0+ 10-) 13https://github.com/crawl/crawl/commit/686410cc57ca 01:34:00 looking into https://crawl.develz.org/mantis/view.php?id=12330 I see that tornado checking if wind goes through a feature by calling feat_is_reachable_past. That function returns based on opaque, wall, or grate. looking further DNGN_RUNED_CLEAR_DOOR (used in ebering_ghost_disaster_area) will allow tornado to blow through and even blow a mob to the other side of a closed translucent sealed rune door 01:35:43 my initial thought was to add a check to feat_is_reachable_past see if the feature is a DNGN_RUNED_CLEAR_DOOR but then i wondered why is DNGN_RUNED_CLEAR_DOOR not flagged as FFT_WALL 01:36:05 it is only defined as FFT_SOLID 01:37:12 which makes me wonder why DNGN_RUNED_CLEAR_DOOR can be seen through if it doesn't have FFT_OPAQUE 02:59:02 -!- amalloy is now known as amalloy_ 03:12:00 Unstable branch on crawl.beRotato.org updated to: 0.26-a0-498-g0fdccc9 (34) 03:30:49 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-3526-ge83b935abd 03:31:35 Fork (bcadrencrawl) on crawl.kelbi.org updated to: 0.22.1-2921-g66763371e7 09:15:54 03ebering02 07* 0.26-a0-499-gc405a18: Move the ai_action namespace to its own header 10(6 minutes ago, 2 files, 54+ 49-) 13https://github.com/crawl/crawl/commit/c405a18ee9c7 09:32:13 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-499-gc405a18ee9 (34) 10:16:38 Stashed scrolls of enchant weapon disappear 13https://crawl.develz.org/mantis/view.php?id=12337 by Sar 10:23:07 oof that's a save compat bug on my part 10:24:02 Aha, and that's why I couldn't see items disappearing when watching ttyrecs 10:24:42 03ebering02 07* 0.26-a0-500-g60e829e: Fix an unmarshalling bug (12337) 10(65 seconds ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/60e829e2c0c6 10:32:15 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-500-g60e829e2c0 (34) 10:59:08 oh lol that also explains the report of large rocks disappearing 11:02:40 yep 11:02:47 ebering: hm, I don't think ai_action not being in a header is the cause of those warnings 11:02:51 (which don't happen on clang) 11:03:11 advil: gcc gets mad if they're not static nor forward declared 11:03:48 clang gets mad if you static them all since they're not all currently used 11:03:48 yes, but moving them into a header didn't result in them being declared :-) 11:04:27 argh 11:04:28 gcc 11:06:36 it's possible that if they are constexpr or inline it won't do that 11:15:01 lol I hope that save compat bug didn't delete runes 11:15:06 it would have been tomb I think? 11:15:35 assuming that runes are implemented how I expect 11:17:40 so if I've gotten it right, it will have deleted: enchant weapon, large rock, CPA, slaying, staff of death, paralysis wands, maybe the golden rune 11:17:45 and a few already deleted enum values 11:22:49 it will have reduced their stack size to 1 11:22:55 so 11:23:11 good morning 11:23:14 oh heh I didn't actually read the body of the if clause 11:24:08 ok you have escaped epicness this time :-P 11:24:59 indeed 11:36:19 while trying to figure out if c++ would ever have anything approximating dependent types I ran across this thread, which is a fascinating window into c++ standardization: https://www.reddit.com/r/cpp/comments/cmk7ek/what_happened_to_c20_contracts/ 11:37:08 also has a fun unreliable narrator twist 11:56:23 heh 12:13:13 https://crawl.develz.org/mantis/view.php?id=12330 took a look at this last night, found something funky with the translucent runed door def, anyone have ideas as to why the player can see through them or why the tornado blows through it? 12:24:55 probably players can see past it (intended) because it's not opaque 12:25:16 I think your diagnosis looks right though, feature_is_reachable_past needs to be special cased for translucent doors 12:25:28 since they are not walls 12:36:36 argh stupid git. I was trying to figure this out last night. So I created a branch 'tornado_door_block' then made the change and git format-patch -1 but the patch file that came up was 0001-Update-monster-creation-documentation.patch 12:41:11 cool got it 12:43:59 https://crawl.develz.org/mantis/view.php?id=12330 added a patch file there, does that look like the correct format? 13:06:33 Unstable branch on crawl.akrasiac.org updated to: 0.26-a0-500-g60e829e (34) 13:20:24 yes, that looks good 13:20:36 any reason not to use a PR? 13:23:52 pr? 13:24:00 an alternative idea might be to use `feat_is_door` -- that wasn't used previously (I would assume) because all doors were opaque, but it's a little more robust 13:24:03 github pull request 13:25:07 because it's been very hard for me to grasp the github concept and I don't want to be a help vampire 13:25:30 feat_is_door would have the advantage of ensuring that this code catches DNGN_SEALED_CLEAR_DOOR as well 13:25:39 last night I made a fork and cloned into it but I wasn't able to get the stuff off my local machine onto the github fork 13:26:41 well, it's something we are usually willing to help with because it does in the long run make merging patches easier 13:26:42 advil: i had thought about that, if tornado was actually going through a door but I can't think of any way to actually test that 13:27:34 yeah, it's tricky to test, but from reading the code I would definitely assume it can happen 13:27:45 if features DNGN_SEALED_CLEAR_DOOR and DNGN_RUNED_CLEAR_DOOR would be seen by feat_is_door then that would absolutely be better 13:27:57 if they aren't, then that's a bug too 13:29:16 but they are, I guess there's also DNGN_CLOSED_CLEAR_DOOR to worry about 13:32:34 !source feat_is_door 13:33:05 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/terrain.cc#L406 13:34:09 feat_is_reachable_past logic doesn't really seem to get the entire idea 13:36:00 maybe instead of checking feat DNGN_RUNED_CLEAR_DOOR or a whole bunch of other cases it should check feat_is_open_door then add the DNGN_RUNED_CLEAR_DOOR? 13:36:30 i mean DNGN_OPEN_CLEAR_DOOR 13:42:41 given the way it's already set up, how about && !feat_is_closed_door 13:44:09 yeah there you go 13:44:37 if you have time, can you guide me through the github pull request thing? I figure a very small patch like this would be a good starting point 13:49:03 so I setup my fork on github under Naruni-Crawl/crawl, got my ssh key into github and was able to do a git clone on the Naruni-Crawl/crawl project 13:49:41 via ssh key 13:49:48 now do I create a new branch on the local machine, make the change to code, then do a git push? 13:50:53 https://duckduckgo.com/?q=git+create+new+branch+and+track+remote 13:51:14 yeah, that's pretty much it 13:51:17 then https://duckduckgo.com/?q=git+push+to+remote+branch 13:51:47 when you do the push it won't work, but modern git should give you a command to run that will 13:52:19 the other pitfall is simply forgetting to switch to the branch after you make it (if you use `git branch` to make it) 13:53:12 if you browse your repository on github after making the changes, there'll be a sort of "suggestion" at the top of the page, that you can click on to open a PR. or there's a number of tools that let you make the PR from the command line, but all by itself git can't (AFAIK) do that 13:53:52 this is the github-specific guide: https://docs.github.com/en/github/getting-started-with-github/fork-a-repo 13:53:58 Murumi (L12 FoFi) Crash caused by signal #6: Aborted (Lair:2) 13:55:59 commit local changes then push? 13:58:37 yes, to the branch 13:59:59 ok I believe I made a pull request 14:00:32 New branch created: pull/1511 (1 commit) 13https://github.com/crawl/crawl/pull/1511 14:00:32 03Naruni02 07https://github.com/crawl/crawl/pull/1511 * 0.26-a0-499-gf8ae82d: Door reachable fix 10(in the future, 1 file, 4+ 1-) 13https://github.com/crawl/crawl/commit/f8ae82d5be51 14:04:01 right on, thanks 14:39:31 hm we need to update some of our dev documentation to be more PR-focused 14:53:41 Naruni re commit messages/titles, we more or less use everything in this guide except rule 2: https://chris.beams.io/posts/git-commit/ 15:18:51 advil: assuming you sent me that email, thanks! This is where my git knowledge really falls apart 15:19:19 I tried rebasing and modifying the commit message but something just isnt working 15:19:22 well, it was a github comment, but those turn into emails by default 15:20:02 -!- Tiobot is now known as Guest1624 15:20:32 is there an error msg? 15:23:42 no, I had switched back from my branch to master. then I did git checkout Door_reachable_fix, and git rebase -i HEAD^^ which gave a successful rebase and update 15:24:26 then I tried git commit -a and it said nothing to commit. There was never the option to 'r' option to reword commit message 15:24:55 so now I don't understand where the commit exists or what stage my current snapshot is at. 15:25:05 when you do `git rebase -i HEAD^^` it should pop you into an editor, and you can edit the text there to decide what to do with commits 15:25:48 rebasing doesn't queue up changes to commit, but rather replaces existing commits 15:25:57 ok, now my editor comes up with 'Update monster creation documentation' and 'Door reachable fix' 15:26:15 why is that pick 0fdccc9209 present in my branch? 15:26:37 what that is asking you to do is to change "pick" to something else 15:27:09 so if you change it to "r" and save+exit, it'll give you the chance to edit that commit message 15:27:39 change 'pick' to 'r' on only MY door_reachable_fix line? 15:27:42 (btw HEAD^^ was overinclusive, for this case I should have just said HEAD^) 15:28:41 yeah 15:38:43 does this commit message look acceptable? https://hastebin.com/raw/ivadoyeqid 15:39:17 the message looks good, I would add the mantis bug # somewhere 15:39:38 oh right 15:40:16 maybe s/reachable/reachability (with that title) 15:42:07 git push 15:42:07 To github.com:Naruni-Crawl/crawl.git 15:42:07 ! [rejected] Door_reachable_fix -> Door_reachable_fix (non-fast-forward) 15:42:07 error: failed to push some refs to 'github.com:Naruni-Crawl/crawl.git' 15:42:22 you will need to use `git push --force` 15:44:10 did that automagically update the pull request? I don't see any open ones on the github fork page 15:44:17 yes, it does 15:44:26 https://github.com/crawl/crawl/pull/1511 15:44:34 hm, I see a merge commit there 15:44:49 not sure where that came from 15:45:36 03Naruni02 07https://github.com/crawl/crawl/pull/1511 * 0.26-a0-499-g5267476: Door reachability fine tuning 10(2 hours ago, 1 file, 4+ 1-) 13https://github.com/crawl/crawl/commit/526747642e1a 15:45:36 03Naruni02 07https://github.com/crawl/crawl/pull/1511 * 0.26-a0-501-g3d50d21: Merge branch 'Door_reachable_fix' of github.com:Naruni-Crawl/crawl into Door_reachable_fix 10(in the future, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/3d50d216325b 15:45:48 any changes to your branch will automatically update the pull request page 15:45:49 https://github.com/crawl/crawl/commit/526747642e1a685cd0c8cbce74f222bf1887500d 15:47:14 oh, you pulled then pushed 15:47:21 instead of force pushing 15:47:25 which created the merge commit 15:55:03 but of course it did (i have no idea what that all means) 15:55:39 in the future, if I make a pull request and need to edit it, i should only do a force push with edited comment? 15:55:55 yes 15:56:02 copy that, thanks for the help :) 16:07:43 New branch created: pull/1512 (4 commits) 13https://github.com/crawl/crawl/pull/1512 16:07:43 03wjchen02 07https://github.com/crawl/crawl/pull/1512 * 0.26-a0-501-g9bec817: Align health status in webtiles glyph mode 10(2 days ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/9bec81727733 16:07:43 03wjchen02 07https://github.com/crawl/crawl/pull/1512 * 0.26-a0-502-g31f4fd8: Handle glyph scaling in monster list (glyph mode) 10(2 days ago, 1 file, 9+ 3-) 13https://github.com/crawl/crawl/commit/31f4fd814c00 16:07:43 03wjchen02 07https://github.com/crawl/crawl/pull/1512 * 0.26-a0-503-ge464867: Aesthetic enhancement of webtiles glyph mode 10(35 hours ago, 2 files, 68+ 11-) 13https://github.com/crawl/crawl/commit/e464867117b8 16:07:43 03wjchen02 07https://github.com/crawl/crawl/pull/1512 * 0.26-a0-504-ged832dd: Add glyph mode customization options for webtiles 10(2 hours ago, 5 files, 47+ 14-) 13https://github.com/crawl/crawl/commit/ed832dddaa70 16:09:56 interesting 16:10:14 I have actually been thinking of trying to improve glyphs mode, maybe this will do it for me 16:10:29 Naruni this is fixable in the PR with more rebasing but at this point I might just pull in that one commit 16:13:27 because of bad github ui that shows the PR as closed, but you still get credit on the commit 16:13:39 03Naruni02 {advil} 07* 0.26-a0-501-g5717042: Door reachability fine tuning 10(2 hours ago, 1 file, 4+ 1-) 13https://github.com/crawl/crawl/commit/57170428f203 16:17:04 Unstable branch on crawl.kelbi.org updated to: 0.26-a0-501-g57170428f2 (34) 16:18:02 oh thanks I'm not interested in credit but just want to make sure it's getting you guys the help correctly and easily 16:25:51 well, thanks for the fix! 16:29:21 I'm writing a PR document too. It's almost done and not 100% complete but I figure it's a good start 16:42:17 Ok let's see if I did this correctly. 16:47:01 New branch created: pull/1513 (1 commit) 13https://github.com/crawl/crawl/pull/1513 16:47:01 03Naruni02 07https://github.com/crawl/crawl/pull/1513 * 0.26-a0-499-g6a65512: Add pull request guide 10(3 minutes ago, 1 file, 70+ 0-) 13https://github.com/crawl/crawl/commit/6a65512ed6f6 16:56:47 that's good, looks like the pull request got acknowledged 17:02:32 Naruni: in the Other Things at the end, might need to move step 4 up to step 2? unless by "change the code", you mean something like "make any changes you want, then commit those changes" 17:04:52 spicycat: yes, exactly. I'll clear that up a bit and see if I can follow my own suggestion to update the pull request. 17:07:04 good guide. but you should write it in markdown :D 17:09:08 03Naruni02 07https://github.com/crawl/crawl/pull/1513 * 0.26-a0-499-g2bf29e1: Add pull request guide 10(25 minutes ago, 1 file, 70+ 0-) 13https://github.com/crawl/crawl/commit/2bf29e16e137 17:09:08 03Naruni02 07https://github.com/crawl/crawl/pull/1513 * 0.26-a0-500-g2d14cda: Add pull request guide 10(in the future, 1 file, 2+ 1-) 13https://github.com/crawl/crawl/commit/2d14cda42e4a 17:12:25 hm, now you have two commits with the same commit title. try a rebase, but use (s)quash instead of (r)eword 17:12:52 in `git rebase -i` it summarizes your options at the bottom 17:25:56 git rebase -i HEAD^ 17:25:56 error: cannot 'squash' without a previous commit 17:27:13 maybe m for merge 17:31:44 HEAD^ specifies the parent commit of the commit that is currently HEAD. When doing an interactive rebase, your best target is master 17:31:57 which will apply your new changes to the current state of the branch master 17:32:04 instead of using various HEAD^~@# modifiers 17:35:33 i enjoy the potential recursion that this exercise has 18:04:04 git rebase -i master^ 18:04:06 like that? 18:23:51 Unstable branch on underhound.eu updated to: 0.26-a0-501-g57170428f2 (34) 18:26:00 Naruni: just git rebase -i master 18:26:46 git has a fairly sophisticated and concise syntax for specifing references 18:26:46 ^ has meaning in this syntax 18:27:39 for fuck's sake 18:28:53 my whole tree has gotten out of hand now. Should I just delete the damn thing and start it over? Can the pull request be deleted? 18:29:38 here, i'll fix it and push a branch you can use 18:29:50 this is deep magic you don't need to learn right away 18:32:18 Naruni: you can reset your branch to this one in my fork, if you can figure out how to in the GUI: https://github.com/alexjurkiewicz/crawl-ref/tree/Add_PR_guide 18:32:53 Naruni: I wouldn't worry too much about it. I appreciate your effort at starting a guide like that, but I think we'd do better to revise the existing contribution guide to point out the github PR workflow 18:34:03 indeed! https://github.com/crawl/crawl/blob/master/crawl-ref/docs/develop/contribution-process.md already has a typical example of the process 18:34:13 just without the specific git commands for how to do the various things 18:35:29 a quick summary of the most used commands and a link to the git quickstart 18:35:32 https://github.com/crawl/crawl/blob/master/crawl-ref/docs/develop/git/quickstart.txt 18:35:39 would be much better 18:35:46 plus an update pass on the quickstart 18:35:54 and I should probably be typing this as a message onn the PR but 18:38:52 I wasn't aware that stuff was in contribution-process.md 18:48:19 thanks for all the help today, at least I got a little bit of progress done 18:54:25 ebering: I will write some justification into the cloud ring commits today, would you like to finalise your review before I rebase everything? 19:00:01 alexjurkiewicz: I think I've input everything I worry about. presumably your rebase will adjust the cloud weights to address gammafunk's concerns 19:02:39 yup. I liked his idea of the "super cold" cloud variants too. I had been looking into adding a "cloud power" to scale damage, but it was a little opaque for the player 19:06:03 (I would only rebase against master if you are actually trying to rebase against master) 19:07:24 (definitely do *not* agree that the best target for an interactive rebase is master :-) 19:41:13 advil: yes, in this particular case they were, I think? really just trying to dissuade cargo cult git command running 20:12:55 !source setup_fire_storm 20:12:55 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/spl-damage.cc#L60 20:19:30 -!- cjm_ is now known as cjm 21:53:43 http://crawl.kelbi.org/saves/Lightli-crawl-git-57170428f2-200807-0152.tar.bz2 can someone explain what happened here? 21:58:27 -!- amalloy_ is now known as amalloy