[00:08] I half kind of think they simply plugged in an existing spatial animation package and simply made minor changes as necessary to it. It's the kind of thing that could have been easily done semi-independantly by a single developer [00:09] my milestone today is running into a mystery hung game script [00:12] Oh? Which game? [00:12] lighthouse [00:13] Ah. I should have guessed :) [00:23] am i that transparent ;) [00:24] Nah, given your focus, Lighthouse, being one of the last SCI games, seemed the most likely to be suffering from bizarre issues [00:28] Joefish (~Joefish@p200300C6F3EAB900876F484E32DFC2EB.dip0.t-ipconnect.de) left irc: Ping timeout: 256 seconds [00:28] rama seems like it might be even worse; some vmds are silently skipped, a lot of the screen items seem to be slightly scaled when they shouldnt be, and thats just from the first room [00:30] at least in lighthouse i have been able to play through to what appears to be the third-to-last puzzle [00:31] Well, that's something at least [00:32] lsl7 has one hung script too, though i was able to temporarily bypass it to get through the rest of the game [00:34] Ah. Do you think both games' hangs are due to the same problem and/or deficiency in ScummVM? [00:34] vinayakvivek (uid121616@gateway/web/irccloud.com/x-ptssazmoiemrxnpc) left irc: Quit: Connection closed for inactivity [00:37] i hope so. its very reminiscent of the hang in kq7 where there is a scripted cutscene that doesnt get a signal to proceed, though in that case it was due to the MIDI code, whereas lsl7/lighthouse dont use midi at all for audio [00:40] Fingers crossed for you to be able to figure it out without too much effort & frustration [00:40] thanks, i appreciate that :) [00:51] GitHub160 (~GitHub160@192.30.252.42) joined #scummvm. [00:51] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vSLWm [00:51] scummvm/master aaa2527 Paul Gilbert: TITANIC: Fix loading of CStarPoints2 data [00:51] GitHub160 (GitHub160@192.30.252.42) left #scummvm. [01:03] Uhfgood (~Captain_J@97-96-80-60.res.bhn.net) joined #scummvm. [01:05] GitHub190 (~GitHub190@192.30.252.45) joined #scummvm. [01:05] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vSLW9 [01:05] scummvm/master 765ec88 Paul Gilbert: TITANIC: Fix loading of CStarView class [01:05] GitHub190 (GitHub190@192.30.252.45) left #scummvm. [01:10] Henke37 (~Henrik@81-227-16-59-no133.bredband.skanova.com) left irc: Quit: ERR_SHUTDOWN [01:42] GitHub152 (~GitHub152@192.30.252.40) joined #scummvm. [01:42] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vSL8q [01:42] scummvm/master a925264 Paul Gilbert: TITANIC: Remove redundant static from CStarControlSub6... [01:42] GitHub152 (GitHub152@192.30.252.40) left #scummvm. [01:54] DominusExult (~dominus@178-191-225-184.adsl.highway.telekom.at) joined #scummvm. [01:54] DominusExult (~dominus@178-191-225-184.adsl.highway.telekom.at) left irc: Changing host [01:54] DominusExult (~dominus@unaffiliated/dominus) joined #scummvm. [01:57] Dominus (~dominus@unaffiliated/dominus) left irc: Ping timeout: 260 seconds [01:58] Nick change: DominusExult -> Dominus [04:01] dreammaster (~dreammast@c-73-149-116-247.hsd1.ma.comcast.net) left irc: [04:41] Joefish (~Joefish@p200300C6F3C4D50049405AB325EDB1AC.dip0.t-ipconnect.de) joined #scummvm. [05:17] Affan (~Administr@103.75.56.37) joined #scummvm. [05:17] Hello [05:24] hi [05:31] Dominus (~dominus@unaffiliated/dominus) left irc: Read error: Connection reset by peer [05:32] Dominus (~dominus@178-191-225-184.adsl.highway.telekom.at) joined #scummvm. [05:32] Dominus (~dominus@178-191-225-184.adsl.highway.telekom.at) left irc: Changing host [05:32] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [05:37] maxyodedara5 (uid218271@gateway/web/irccloud.com/x-ulwhkogvxipbyplw) joined #scummvm. [05:39] waltervn (~waltervn@84.27.45.186) joined #scummvm. [05:39] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services. [05:41] morning [05:45] Affan (~Administr@103.75.56.37) left irc: Ping timeout: 260 seconds [05:45] morning [05:56] Uhfgood (~Captain_J@97-96-80-60.res.bhn.net) left irc: Quit: Leaving [06:04] GitHub5 (~GitHub5@192.30.252.42) joined #scummvm. [06:04] [scummvm] sev- pushed 2 new commits to master: https://git.io/vSL2Z [06:04] scummvm/master b8a07d3 Eugene Sandulenko: FULLPIPE: Safer string management [06:04] scummvm/master baf7c83 Eugene Sandulenko: FULLPIPE: Sanity check on data loading [06:04] GitHub5 (GitHub5@192.30.252.42) left #scummvm. [06:06] GitHub145 (~GitHub145@192.30.252.42) joined #scummvm. [06:06] [scummvm] sev- pushed 1 new commit to master: https://git.io/vSL2R [06:06] scummvm/master 1298762 Eugene Sandulenko: TITANIC: Fix copy/paste error [06:06] GitHub145 (GitHub145@192.30.252.42) left #scummvm. [06:37] omer_mor_ (~Omer@46-117-132-33.bb.netvision.net.il) joined #scummvm. [06:40] omer_mor (~Omer@46-117-132-33.bb.netvision.net.il) left irc: Ping timeout: 264 seconds [06:48] omer_mor (~Omer@46-117-132-33.bb.netvision.net.il) joined #scummvm. [06:50] omer_mor_ (~Omer@46-117-132-33.bb.netvision.net.il) left irc: Ping timeout: 260 seconds [06:54] m_kiewitz (~m_kiewitz@scummvm/undead/m-kiewitz) joined #scummvm. [06:54] #scummvm: mode change '+o m_kiewitz' by ChanServ!ChanServ@services. [07:24] LittleToonCat (~littlecat@sydnns0115w-047054148237.dhcp-dynamic.FibreOP.ns.bellaliant.net) left irc: Remote host closed the connection [07:28] Lightkey (~Darklock@p200300764C343C0122CF30FFFE083718.dip0.t-ipconnect.de) left irc: Ping timeout: 258 seconds [07:41] Lightkey (~Darklock@p200300764C343C4822CF30FFFE083718.dip0.t-ipconnect.de) joined #scummvm. [07:55] maxyodedara5 (uid218271@gateway/web/irccloud.com/x-ulwhkogvxipbyplw) left irc: Quit: Connection closed for inactivity [08:10] TMM (~hp@fsf/member/pdpc.professional.tmm) left irc: Ping timeout: 264 seconds [08:16] edheldil (~edheldil@2001:1488:fffe:1:7974:260f:e5cd:5a28) joined #scummvm. [08:44] Affan (~Administr@103.75.56.37) joined #scummvm. [08:51] Dark-Star (~quassel@2a01:238:427f:2f00:3060:fc6b:969e:dcf0) left irc: Ping timeout: 240 seconds [08:52] TMM (~hp@fsf/member/pdpc.professional.tmm) joined #scummvm. [08:52] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services. [08:54] Dark-Star (~quassel@2a01:238:427f:2f00:3060:fc6b:969e:dcf0) joined #scummvm. [08:57] Begasus (~begasus@ptr-4p6jpiotsrmrkx58xpr.18120a2.ip6.access.telenet.be) joined #scummvm. [09:03] Begas_VBox (~Begasus@d54C3C8C2.access.telenet.be) joined #scummvm. [09:09] thesquib (~thesquib@192.241.198.27) joined #scummvm. [09:17] Henke37 (~Henrik@81-227-16-59-no133.bredband.skanova.com) joined #scummvm. [10:22] ajax16384 (~User@109.60.138.138) joined #scummvm. [10:22] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services. [10:25] borosky (~broosky@95.160.153.33) joined #scummvm. [10:28] broosky (~broosky@095160153033.dynamic-ww-10.vectranet.pl) left irc: Ping timeout: 264 seconds [10:44] exmensa (~exmensa@66.43.202.238) left irc: Ping timeout: 260 seconds [10:55] Affan (Administr@103.75.56.37) left #scummvm ("Leaving"). [11:20] exmensa (~exmensa@66.43.202.238) joined #scummvm. [11:42] TAS-2012v (~2012@c-3cfa71d5.024-3-67626724.cust.bredbandsbolaget.se) joined #scummvm. [11:43] TAS_2012v (~2012@c-14fe71d5.024-3-67626724.cust.bredbandsbolaget.se) left irc: Ping timeout: 260 seconds [11:43] Nick change: TAS-2012v -> TAS_2012v [11:47] TAS-2012v (~2012@c-bafa71d5.024-3-67626724.cust.bredbandsbolaget.se) joined #scummvm. [11:47] TAS_2012v (~2012@c-3cfa71d5.024-3-67626724.cust.bredbandsbolaget.se) left irc: Ping timeout: 256 seconds [11:47] Nick change: TAS-2012v -> TAS_2012v [11:56] TAS-2012v (~2012@c-63fb71d5.024-3-67626724.cust.bredbandsbolaget.se) joined #scummvm. [11:57] TAS_2012v (~2012@c-bafa71d5.024-3-67626724.cust.bredbandsbolaget.se) left irc: Ping timeout: 258 seconds [11:57] Nick change: TAS-2012v -> TAS_2012v [12:24] edheldil (~edheldil@2001:1488:fffe:1:7974:260f:e5cd:5a28) left irc: Remote host closed the connection [12:29] uruk-hai (~uruk-hai@89.133.22.244) joined #scummvm. [12:29] #scummvm: mode change '+o uruk-hai' by ChanServ!ChanServ@services. [12:48] Begas_VBox (~Begasus@d54C3C8C2.access.telenet.be) left irc: Read error: No route to host [12:49] Begasus_ (~begasus@ptr-4p6jpip0nb6424hc1vj.18120a2.ip6.access.telenet.be) joined #scummvm. [12:50] Begasus (~begasus@ptr-4p6jpiotsrmrkx58xpr.18120a2.ip6.access.telenet.be) left irc: Ping timeout: 264 seconds [12:51] Begas_VBox (~Begasus@d54c3c8c2.access.telenet.be) joined #scummvm. [13:08] uruk-hai (~uruk-hai@89.133.22.244) left irc: Quit: Leaving [13:12] uruk-hai (~uruk-hai@catv-89-133-22-244.catv.broadband.hu) joined #scummvm. [13:12] #scummvm: mode change '+o uruk-hai' by ChanServ!ChanServ@services. [14:04] Begas_VBox (~Begasus@d54c3c8c2.access.telenet.be) left irc: Quit: Vision[0.9.8]: i've been blurred! [14:05] Begas_VBox (~Begasus@d54c3c8c2.access.telenet.be) joined #scummvm. [14:23] Begas_VBox (~Begasus@d54c3c8c2.access.telenet.be) left irc: Quit: Vision[0.9.8]: i've been blurred! [14:29] vinayakvivek (uid121616@gateway/web/irccloud.com/x-xrsqadoxnffkjlfj) joined #scummvm. [14:32] Strangerke (~Strangerk@cable-85.28.84.13.coditel.net) left irc: Ping timeout: 240 seconds [14:36] Nick change: Begasus_ -> Begas_bbl [14:51] Littleboy (~littleboy@73.186.252.231) joined #scummvm. [14:51] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services. [15:10] serk (9353c962@gateway/web/freenode/ip.147.83.201.98) joined #scummvm. [15:13] Strangerke (~Strangerk@cable-85.28.84.13.coditel.net) joined #scummvm. [15:15] serk (9353c962@gateway/web/freenode/ip.147.83.201.98) left irc: Quit: Page closed [15:15] Uhfgood (~Captain_J@97-96-80-60.res.bhn.net) joined #scummvm. [15:20] Polynomial-C (~Poly-C@gentoo/developer/Polynomial-C) joined #scummvm. [15:31] ny00123 (~ny00123@89-139-222-178.bb.netvision.net.il) joined #scummvm. [15:46] TMM (~hp@fsf/member/pdpc.professional.tmm) left irc: Quit: Ex-Chat [15:58] |Cable| (~cable@33.138.117.91.dynamic.reverse-mundo-r.com) left irc: Ping timeout: 240 seconds [15:58] uruk-hai (~uruk-hai@catv-89-133-22-244.catv.broadband.hu) left irc: Quit: Leaving [15:59] Nick change: Begas_bbl -> Begasus [16:09] maxyodedara5 (uid218271@gateway/web/irccloud.com/x-exahevwhivsowijd) joined #scummvm. [16:11] |Cable| (~cable@33.138.117.91.dynamic.reverse-mundo-r.com) joined #scummvm. [16:11] chadj (~chadj@cpe-72-131-101-95.wi.res.rr.com) left irc: Ping timeout: 240 seconds [16:11] Begas_VBox (~Begasus@d54C3C8C2.access.telenet.be) joined #scummvm. [16:17] Dark-Star (~quassel@2a01:238:427f:2f00:3060:fc6b:969e:dcf0) left irc: Ping timeout: 240 seconds [16:17] WooShell (~Markus@ipbcc07076.dynamic.kabel-deutschland.de) joined #scummvm. [16:22] meow =^.^= [16:23] ajax16384 (~User@109.60.138.138) left irc: Read error: Connection reset by peer [16:25] LittleToonCat (~littlecat@47.54.148.237) joined #scummvm. [16:28] frankyboy_ (~franky@ppp109-252-73-100.pppoe.spdop.ru) joined #scummvm. [16:28] Dark-Star (~quassel@2a01:238:427f:2f00:3060:fc6b:969e:dcf0) joined #scummvm. [16:34] frankyboy_ (~franky@ppp109-252-73-100.pppoe.spdop.ru) left irc: Read error: Connection reset by peer [16:35] frankyboy_ (~franky@ppp109-252-73-100.pppoe.spdop.ru) joined #scummvm. [16:35] frankyboy_ (~franky@ppp109-252-73-100.pppoe.spdop.ru) left irc: Client Quit [16:41] chadj (~chadj@cpe-72-131-101-95.wi.res.rr.com) joined #scummvm. [17:00] criezy: great work on all the reviewing [17:02] TMM (~hp@fsf/member/pdpc.professional.tmm) joined #scummvm. [17:02] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services. [17:02] I happened to have a few days off ;) [17:03] I am back to work tomorrow though, so hopefully others can find the time to do some reviewing as well. [17:12] wjp or other SCI devs: it looks like we are not doing aspect ratio correction for some SCI games that use uncommon resolutions (such as 320x190, 480x300, 320x220 or 640x440 from reading quickly screen.cpp). [17:12] Currently aspect ratio correction is only used for 320x200 and 640x400 games (at least in the SDL OpenGL case). [17:12] I am wondering which others should be handled and to which ratio they should be corrected. [17:12] well the resolutions that those other SCI games use :P [17:12] and yeah at least I knew that already [17:12] See also http://forums.scummvm.org/viewtopic.php?t=14303 [17:13] Farmboy0 (~quassel@p5DD101C2.dip0.t-ipconnect.de) joined #scummvm. [17:13] Farmboy0 (~quassel@p5DD101C2.dip0.t-ipconnect.de) left irc: Changing host [17:13] Farmboy0 (~quassel@xoreos/farmboy0) joined #scummvm. [17:13] yeah, it gets even more difficult because of those Mac versions [17:13] at least some cut off the icon bar [17:13] so they are running at 320x190 [17:13] how did that work on original hardware? [17:14] i think it used Mac system menu or something for that [17:14] and well AGI games were even crazier [17:14] those had all sorts of extra Mac resources, hi res fonts, hi res graphics, but all custom built [17:14] of course apple had to name one of their macOS releases Sierra. goodbye relevant search results :) [17:15] yeah you should tell that the "Switch" made by Nintendo, snover :P [17:15] well at least amazon gets seriously confused when you search for that [17:15] or well, it did [17:15] t0by (~t0by@unaffiliated/t0by) left irc: Quit: Bye! [17:16] i think "nintendo switch" always produced good search results [17:16] yes, nintendo switch [17:16] well, once amazon had the switch/games up for preorder [17:16] but "switch" by itself finds network switches :P [17:16] yes [17:16] yes, that's why it's a stupid name [17:16] anyway, ive only ever seen sci mac games running in emulation and they always seem to not AR correct [17:16] Wii for example was weird, but at least it wasn't an already existing word [17:17] maybe the emulation didn't do it correctly, no idea :P [17:17] i have just bought Shivers for Mac [17:17] so at least I will be able to check SCI2.1 or was it SCI2 games [17:21] Vampire0_ (~Vampire@jEdit/Vampire) joined #scummvm. [17:21] m_kiewitz: yeah, might have helped if somebody at nintendo had read RFC 1178 :) [17:22] Vampire0 (~Vampire@jEdit/Vampire) left irc: Ping timeout: 268 seconds [17:22] logix: heh :) [17:23] I always liked RFC 1149, but still no implementation yet :( [17:24] m_kiewitz: http://www.blug.linux.no/rfc1149/ [17:24] whhhhaaaaatttttt [17:24] PING 10.0.3.1 (10.0.3.1): 56 data bytes [17:24] 64 bytes from 10.0.3.1: icmp_seq=0 ttl=255 time=6165731.1 ms [17:24] lol [17:28] Does this commit make sense: https://github.com/criezy/scummvm/commit/3acad0a79ed92f79e8cdb9af3fe6796846ce5555 ? [17:29] can AR setting be retrieved from the engine instead of hardcoding numbers into the backend? [17:30] is 320x190 the only AR of that kind or are there others, possibly always (common_width)x(common_height - 10) [17:31] ? [17:36] girafe (~girafe@LFbn-1-11729-221.w2-7.abo.wanadoo.fr) joined #scummvm. [17:46] SylvainTV (~SylvainTV@LFbn-1-8392-241.w81-254.abo.wanadoo.fr) joined #scummvm. [17:46] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services. [17:52] logix: I don't think so. but there are a few special ones [17:52] like for exampe 480x300 for SCI0 Mac games [17:53] and those should probably get scaled like 320x200 [18:15] maxyodedara5 (uid218271@gateway/web/irccloud.com/x-exahevwhivsowijd) left irc: Quit: Connection closed for inactivity [18:37] Begas_VBox (~Begasus@d54C3C8C2.access.telenet.be) left irc: Ping timeout: 240 seconds [18:39] peterkohaut: It's beginning to be playable :) [18:41] madmoose: i'm noticing that too:) [18:44] btw, for me, that looping code was smallest commit for biggest decompiling effort yet [18:44] peterkohaut: if you make the mouse pick z-values from zbuffer 2 you can even click on actors [18:46] thx for tip [18:47] but now iam working on something different:) [18:47] That might not be the proper fix :P [18:47] but I wanted to talk to Officer Leary :) [18:48] What are you working on? [18:48] proper walking and gui [18:49] oh, those small things :) [18:50] we will see:) [18:50] Begasus (~begasus@ptr-4p6jpip0nb6424hc1vj.18120a2.ip6.access.telenet.be) left irc: Ping timeout: 264 seconds [18:52] peterkohaut: Which part of the gui? KIA, Spinner, or ui control classes in general? [18:53] mainly uicontrols and kia [18:54] from kia i wants the most clues/suspects db [18:57] afterwards, the spinner, coz we all want to see other places too:) [18:58] ajax16384 (~User@109.60.130.33) joined #scummvm. [18:58] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services. [18:59] the spinner looks fairly simple once you have the ui image picker [19:01] maybe i'll switch priorities because ui image picker is quite easy (i named it "buttons" in idb) [19:10] TMM (~hp@fsf/member/pdpc.professional.tmm) left irc: Read error: Connection reset by peer [19:24] Harekiet (~harekiet@kittens.harekiet.com) left irc: Read error: Connection reset by peer [19:28] Harekiet (~harekiet@kittens.harekiet.com) joined #scummvm. [19:41] TMM (~hp@fsf/member/pdpc.professional.tmm) joined #scummvm. [19:41] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services. [19:44] #scummvm: mode change '+o Strangerke' by ChanServ!ChanServ@services. [19:52] LittleToonCat (~littlecat@47.54.148.237) left irc: Remote host closed the connection [19:54] LittleToonCat (~littlecat@47.54.148.237) joined #scummvm. [19:58] Dominus (~dominus@unaffiliated/dominus) left irc: Quit: Oh no... znc died [19:59] Dominus (~dominus@178-191-225-184.adsl.highway.telekom.at) joined #scummvm. [19:59] Dominus (~dominus@178-191-225-184.adsl.highway.telekom.at) left irc: Changing host [19:59] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [19:59] Dominus (~dominus@unaffiliated/dominus) left irc: Remote host closed the connection [19:59] Guest45474 (~dominus@178-191-225-184.adsl.highway.telekom.at) joined #scummvm. [20:11] Guest45474 (~dominus@178-191-225-184.adsl.highway.telekom.at) left irc: Quit: Oh no... znc died [20:22] https://www.youtube.com/watch?v=sOzM4ClFG1o [20:22] tehe [20:27] ajax16384 (~User@109.60.130.33) left irc: Read error: Connection reset by peer [20:34] Uhfgood (~Captain_J@97-96-80-60.res.bhn.net) left irc: Quit: Leaving [20:44] vinayakvivek (uid121616@gateway/web/irccloud.com/x-xrsqadoxnffkjlfj) left irc: Quit: Connection closed for inactivity [20:45] waltervn (~waltervn@84.27.45.186) left irc: Quit: Leaving [21:00] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [21:03] _sev|work (~sev@scummvm/undead/sev) joined #scummvm. [21:03] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services. [21:08] t0by (~t0by@unaffiliated/t0by) joined #scummvm. [21:08] #scummvm: mode change '+v t0by' by ChanServ!ChanServ@services. [21:10] ny00123 (~ny00123@89-139-222-178.bb.netvision.net.il) left irc: Quit: Leaving [21:11] Dominus (~dominus@unaffiliated/dominus) left irc: Quit: Oh no... znc died [21:14] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [21:19] Dominus (~dominus@unaffiliated/dominus) left irc: Client Quit [21:20] girafe (~girafe@LFbn-1-11729-221.w2-7.abo.wanadoo.fr) left irc: Quit: Leaving [21:32] wjp, m_kiewitz, Ill land this bounds checking PR tonight unless you run into some late-breaking objections. As far as I know, I did change everything that I got feedback on. [21:33] Then after that I will start moving commits from my working branch. Let me know if you want me to do it like a few commits per day or something, so they are spaced out so you dont feel overwhelmed when 100 commits show up suddenly. [21:33] (bbiab) [21:35] bound checking is fine by me [21:35] the rest is indeed a rather imposing amount of work :-) [21:36] I've already taken the occasional glance through it [21:36] but no structured review or anything like that [21:37] 100 commits? o_O [21:38] 108 [21:38] he's not exaggerating :-) [21:38] o_O [21:38] that's what i don't like about git. there should be a way to combine them. [21:38] well maybe there is :P [21:38] ...combine them? [21:39] well in case you work on something and do a pull request and then you fix one issue and another and so on [21:39] i would prefer it in case you could merge all of those together into 1 commit [21:40] Gentle (~tier@quassel/contributors/gentle) left irc: Ping timeout: 256 seconds [21:40] you can combine/split/reorder anything [21:41] but I think snover's commits generally make sense [21:42] ah you can? [21:42] well 108 commits? aren't there plenty of bugfixes/regressions inside it? [21:43] i would understand it in case those were actually commited into main branch already [21:43] well pushed into main branch [21:43] there may be a few things that could be squashed together [21:52] WooShell (~Markus@ipbcc07076.dynamic.kabel-deutschland.de) left irc: Quit: If you understand or if you don't, if you believe or if you doubt - There's a universal justice, and the eyes of truth are always watching you. [21:53] it's not a problem [21:53] well it would be also maybe nice to combine all the commits of a PR into one commit bundle, if you understand what i mean [21:53] Gentle (~tier@quassel/contributors/gentle) joined #scummvm. [21:54] so that you would see "SCI: bounds checks", then you could open that and see all the commits inside of it [21:54] maybe that's also already possible... idk [21:55] the github interface already kind of provides that [22:02] are PRs a github invention? [22:03] not sure who invented it, but it's sometimes they provide above "core" git, yes [22:04] I suppose pull requests may have been the original term for emails to Linus requesting code be pulled into linux [22:05] but the outcome (in the git history) is a merge commit where you can see a set of separate commits being merged into master [22:16] Farmboy0 (~quassel@xoreos/farmboy0) left irc: Remote host closed the connection [22:55] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [23:02] Dominus (~dominus@unaffiliated/dominus) left irc: Quit: Oh no... znc died [23:24] um [23:24] what's wrong with [23:24] git checkout master [23:25] git checkout -b relevant_commits [23:25] git cherry-pick commits [23:25] git diff master? [23:25] (or some permutation thereof) [23:30] t0by (~t0by@unaffiliated/t0by) left irc: Ping timeout: 256 seconds [23:34] well, there is no obvious patch set in that case, you would have to manually figure out the commit range (and then you would not need to cherry-pick anything, just git diff firstcommit..lastcommit) [23:44] if there is some VCS out there that has no crappy user experience when it comes to code merging, i havent seen it [23:45] macdude22 (~macdude22@2604:2d80:4035:8b5a:d405:7eb2:48ae:55a2) left irc: Ping timeout: 246 seconds [23:46] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [23:48] I hear https://www.gitkraken.com/ is pretty good. [23:51] dreammaster (~dreammast@c-73-149-116-247.hsd1.vt.comcast.net) joined #scummvm. [23:51] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services. [23:53] squash and you lose possibly valuable intermediate changes; rebase and you dont have a single clear point where a feature was merged in; merge and get a non-linear branch history and sometimes this happens http://4.bp.blogspot.com/-Y99dcDsHSl8/TXaprrV505I/AAAAAAAABFI/7OjSuPcr2OQ/s1600/gitkstyle.png [23:59] Dominus (~dominus@unaffiliated/dominus) left irc: Quit: Oh no... znc died [00:00] --- Tue Mar 28 2017