00:03:47 -!- Guest67 is now known as twelwe 01:34:34 Unstable branch on crawl.develz.org updated to: 0.28-a0-422-gd71735cc25 (34) 01:55:56 Windows builds of master branch on crawl.develz.org updated to: 0.28-a0-422-gd71735cc25 02:44:19 Unstable branch on cbro.berotato.org updated to: 0.28-a0-422-gd71735cc25 (34) 02:53:48 Monster database of master branch on crawl.develz.org updated to: 0.28-a0-422-gd71735cc25 03:32:07 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4369-gf34790d913 03:54:14 Fork (bcadrencrawl) on crawl.kelbi.org updated to: 0.03-652-gcadb39e6c2 04:17:48 -!- allbery_b is now known as geekosaur 05:37:51 <13Sastreii> manifold assault 05:37:51 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/885096588484165652/Schermata_2021-09-08_alle_11.37.15.png 05:39:54 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/885097104345804800/manifold_assault.png 06:08:25 <13Sastreii> and summon cactus giant 06:08:25 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/885104277880729630/summon_cactus_giant.png 06:23:02 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-4369-gf34790d913 06:51:41 -!- TAS-2012v is now known as TAS_2012v 09:03:19 I have a workflow/branches question. 09:03:36 I am working on one edit, but I can't get the C syntax right, crawl gives an error when I try to compile. This is on one local branch. 09:04:02 So I went to work on something else I felt more confident in syntax-wise, and made a new branch, 09:04:34 When I tried to compile this, the error from the other branch I'd checked out of was still in the code. 09:05:04 Do I need to revert the commit with the error in one branch, before I try to compile the edit in the second branch? 09:05:50 It doesn't make sense that I'd need to clone a separate repository for each concurrent edit. Isn't that what branches are for? 09:06:32 But while there are several branches, there is just one crawl-ref/source directory that is compiled each time I test an edit 09:06:55 So I feel I'm missing something about branches 09:09:33 The temple maps I made a PR for yesterday were another branch, and as expected those edits are not in my local temple.des now that I've checked out a different local branch 09:11:06 It sounds as though you made the second branch from your first one. If you'd switched to master first, it would have been based on that instead. 09:13:26 That sounds reasonable. How can I tell which branch a given branch is based on? 09:17:05 Yes that was it, I think. After $ git checkout master it compiles fine. So I think I need to copy my edits into a text editor, kill the bad second branch, then make a new second branch from master. 09:36:23 Yay, it worked! $ git checkout master before $ git branch [newbranch] was the missing piece: when you make a new branch, it starts as a copy of the checked out branch. 09:37:28 <13Sastreii> the cactus giant itself 09:37:28 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/885156888042418197/cactus_giant.png 09:40:16 mainiacjoe, you can make git do that for you, check out git stash 09:44:23 yes I remember reading about git stash at one point. Thanks! 10:31:02 New branch created: pull/2125 (3 commits) 13https://github.com/crawl/crawl/pull/2125 10:31:02 03MainiacJoe02 07https://github.com/crawl/crawl/pull/2125 * 0.28-a0-423-g2e5a6a2853: Take note when player prays at an ecumenical altar In the morgue, it will be referred to as, "the altar of an unknown god," since I've discovered that some players think the term, "ecumenical altar" refers to an altar in the Ecumenical Temple. 10(62 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/2e5a6a2853da 10:31:02 03MainiacJoe02 07https://github.com/crawl/crawl/pull/2125 * 0.28-a0-424-g25673ddf37: Take note when a DD has an MP point drained This facilitates a DD player keeping track of how well HP has been managed between games. 10(40 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/25673ddf3786 10:31:02 03MainiacJoe02 07https://github.com/crawl/crawl/pull/2125 * 0.28-a0-425-g4c52f0e096: Take note when a Ds is revealed as monstrous Perhaps I didn't know how to look this up, but when I've played Ds if I happen to overlook whether "you feel mosntrous" appears when I get my first body facet, before the second body facet appears I don't know whether I am monstrous or not. This is mainly relevant to know whether I can expect claws and might want to train UC. 10(18 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/4c52f0e09623 10:38:50 03PleasingFungus02 07* 0.28-a0-423-gaf36da5c11: New Cactus & Manifold tiles (Sastreii) 10(40 seconds ago, 5 files, 2+ 1-) 13https://github.com/crawl/crawl/commit/af36da5c11ce 10:42:22 <10PleasingFungus> thanks! what a fun guy 🙂 10:45:20 <13Sastreii> It’s more like a giant cactus then a cactus giant, but i couldn’t resist making him like that 10:48:23 cactuar? 10:51:24 <13Sastreii> His father 10:58:27 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-423-gaf36da5c11 (34) 11:03:52 <09gammafunk> killing a hostile one should grant a full level up, like that one FF6 cactus 11:28:35 <08nicolae> cactus player species 13:01:31 <13Sastreii> i did it. my nemesis, the goddamn dragons. all cleaned up. i hope those are more readable. 13:01:32 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/885208242588909588/Schermata_2021-09-08_alle_18.51.48.png 13:02:14 <13Sastreii> sorry for the continuous updates of my own tiles but i'm learning 13:02:14 <13Sastreii> https://cdn.discordapp.com/attachments/747522859361894521/885208421283008682/Dragonscleanup.zip 13:13:43 TurtleBee (L6 DEFE) ASSERT(!spells.empty()) in 'randbook.cc' at line 493 failed. (D:4) 13:16:11 TurtleBee (L6 DEFE) ASSERT(!spells.empty()) in 'randbook.cc' at line 493 failed. (D:4) 13:16:35 <06advil> !crashlog 13:16:40 <04Cerebot> 24011. TurtleBee, XL6 DEFE, T:3579 (milestone): http://crawl.akrasiac.org/rawdata/TurtleBee/crash-TurtleBee-20210908-171610.txt 13:16:44 <06advil> %git 13:16:44 <04Cerebot> PleasingFungus * 0.28-a0-423-gaf36da5c11: New Cactus & Manifold tiles (Sastreii) (3 hours ago, 5 files, 2+ 1-) https://github.com/crawl/crawl/commit/af36da5c11ce 13:16:48 Unstable branch on crawl.akrasiac.org updated to: 0.28-a0-423-gaf36da5 (34) 13:18:03 <06advil> good timing 13:21:08 <09gammafunk> @advil I'm currently running the "Botessa" bridge on CDO; there's a ~bin/botessa_start script to start it, and currently you'd have to screen -R or just kill the process to stop it. I did a trial run of having our various bots run on CDO using the conda install of python3.7 and they all seem to work ok, but I'm only running botessa there for now. Figured it would be good to have these set up were other people could administer them 13:21:09 since they've become somewhat critical to keeping things running 13:21:50 <09gammafunk> Not going to fully run Cerebot/beem there until I clean some things up documentation-wise and also get a go-ahead from napkin. 13:21:53 <06advil> ah sounds like a good idea, thanks for the update 13:22:29 <09gammafunk> yeah, screen -R should let you check on it/restart it, if there's a problem. 13:23:03 <09gammafunk> prefer tmux myself, but napkin has our local mysqld install set up to run through screen, so seemed reasonable to re-use that 14:05:08 TurtleBee (L6 DEFE) ASSERT(!spells.empty()) in 'randbook.cc' at line 493 failed. (D:4) 14:07:06 <06advil> !crashlog 14:07:07 <04Cerebot> 24012. TurtleBee, XL6 DEFE, T:3582 (milestone): http://crawl.akrasiac.org/rawdata/TurtleBee/crash-TurtleBee-20210908-180507.txt 14:07:20 <06advil> hm that shouldn't crash in that version 14:16:36 <06advil> lol ok it should 14:18:30 03advil02 07* 0.28-a0-424-gb4fee303d0: fix: remove a book that required a lvl 1 hex 10(79 seconds ago, 1 file, 1+ 2-) 13https://github.com/crawl/crawl/commit/b4fee303d055 14:24:23 Unstable branch on crawl.akrasiac.org updated to: 0.28-a0-424-gb4fee30 (34) 14:33:21 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-424-gb4fee303d0 (34) 14:45:32 03PleasingFungus02 07* 0.28-a0-425-gd0eccab798: Dragon cleanup (Sastreii) 10(6 minutes ago, 5 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/d0eccab798f2 15:04:04 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-425-gd0eccab798 (34) 15:31:52 <08nicolae> damn, these are some good dragons 15:32:37 <08nicolae> also some of the new hell monsters are using either old tiles (searing wretch, nargun) or recolors of existing tiles (stoker, creeping inferno) 15:33:16 <09gammafunk> yeah, great job on the dragons 15:36:58 <10PleasingFungus> did you see the big list i made? 15:40:09 <08nicolae> i probably missed it 15:40:17 <08nicolae> i would like to see the list 15:42:12 <10PleasingFungus> https://discord.com/channels/735056636644687913/747522859361894521/884933833143779329 15:59:55 when you clone the repo, does it clone all the historical versions of the tiles? 16:00:18 depends onwhether it's a shallow or deep clone 16:00:44 usually you want the deep clone, which will 16:00:59 ah, at some point i always end up running git fetch --all 16:01:18 that's slightly different, it alos gets all the tags and branches 16:01:40 as well as turning a shallow clone into a deep one 16:54:36 <06advil> a somewhat deep clone is necessary for generating version info 16:54:48 <06advil> yes, it has the changes for tiles, for better or worse 18:00:11 I want hug cactus giant 18:22:44 Unstable branch on underhound.eu updated to: 0.28-a0-425-gd0eccab798 (34) 18:23:21 sounds like a prickly proposition to me 22:17:31 -!- Discord|1 is now known as Discord| 23:06:22 -!- Discord|2 is now known as Discord|