ScummVM IRC Log - 22 Apr 2018

[Back to Index]

[00:07] <-- Stormkeeper left irc: Ping timeout: 248 seconds
[00:08] --> Stormkeeper joined #scummvm.
[00:23] --> noobineer joined #scummvm.
[00:23] <-- noobineer left irc: Remote host closed the connection
[00:34] <-- t0bbyyyy left irc: Ping timeout: 248 seconds
[00:50] --> noobineer joined #scummvm.
[00:50] <-- noobineer left irc: Max SendQ exceeded
[01:06] <-- balrog left irc: Quit: Bye
[01:10] --> balrog joined #scummvm.
[01:39] --> DominusExult joined #scummvm.
[01:40] <-- SylvainTV left irc: Read error: Connection reset by peer
[01:43] <-- Dominus left irc: Ping timeout: 260 seconds
[01:43] Nick change: DominusExult -> Dominus
[01:47] <Deledrius> Any comas are extra comas. Most people don't want any at all!
[01:48] <Lightkey> let's eat grandpa
[01:52] <-- Joefish left irc: Ping timeout: 265 seconds
[01:52] --> Joefish joined #scummvm.
[01:52] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[02:06] <-- moralrecordings left irc: Ping timeout: 260 seconds
[02:11] --> noobineer joined #scummvm.
[02:13] --> moralrecordings joined #scummvm.
[02:23] <-- noobineer left irc: Ping timeout: 240 seconds
[02:49] <-- dreammaster left irc:
[03:37] <-- balrog left irc: Ping timeout: 264 seconds
[03:56] --> balrog joined #scummvm.
[04:19] --> Yuv422 joined #scummvm.
[05:06] <-- Yuv422 left irc: Quit: Yuv422
[05:12] --> stroggoff joined #scummvm.
[06:20] --> GitHub119 joined #scummvm.
[06:20] <GitHub119> [scummvm] bgK pushed 2 new commits to master: https://git.io/vpOTv
[06:20] <GitHub119> scummvm/master 0ebf045 Bastien Bouclet: MOHAWK: MYST: Fix the sound effect not playing in opcode 41...
[06:20] <GitHub119> scummvm/master a992dcc Bastien Bouclet: MOHAWK: LB: Mark some switch fall-throughs as intentional...
[06:20] GitHub119 (GitHub119@gateway/service/github.com/x-leralctgoknsjuwr) left #scummvm.
[06:25] --> GitHub95 joined #scummvm.
[06:25] <GitHub95> [scummvm] bgK pushed 1 new commit to master: https://git.io/vpOTI
[06:25] <GitHub95> scummvm/master 818117b Bastien Bouclet: BASE: Allow options to come after command on the command line
[06:25] GitHub95 (GitHub95@gateway/service/github.com/x-leenejwxabtvlhqn) left #scummvm.
[06:26] --> GitHub187 joined #scummvm.
[06:26] <GitHub187> [scummvm] bgK closed pull request #1162: BASE: Allow options to come after the command on the command line (master...cmdline-order) https://git.io/vptaK
[06:26] GitHub187 (GitHub187@gateway/service/github.com/x-wygqvgvhqtzxdbpt) left #scummvm.
[06:32] --> GitHub179 joined #scummvm.
[06:32] <GitHub179> [scummvm] bgK pushed 1 new commit to master: https://git.io/vpOTZ
[06:32] <GitHub179> scummvm/master 086ab44 Bastien Bouclet: MOHAWK: LB: Mark a switch fall-trough as intentional...
[06:32] GitHub179 (GitHub179@gateway/service/github.com/x-sfmtaktgpnribkzn) left #scummvm.
[06:40] --> jamm joined #scummvm.
[06:40] <-- jamm left irc: Changing host
[06:40] --> jamm joined #scummvm.
[06:45] --> _sev joined #scummvm.
[06:45] <-- _sev left irc: Changing host
[06:45] --> _sev joined #scummvm.
[06:45] #scummvm: mode change '+o _sev' by ChanServ!ChanServ@services.
[07:02] <-- jamm left irc: Ping timeout: 248 seconds
[07:28] --> GitHub182 joined #scummvm.
[07:28] <GitHub182> [scummvm] bgK pushed 1 new commit to master: https://git.io/vpOk8
[07:28] <GitHub182> scummvm/master 04c321d Bastien Bouclet: CREATE_PROJECT: CMAKE: Fix importing SDL2 when it was built using CMake...
[07:28] GitHub182 (GitHub182@gateway/service/github.com/x-fwammwxmfehqzcnl) left #scummvm.
[08:03] <-- Drenn left irc: Ping timeout: 248 seconds

[08:40] <-- Lightkey left irc: Ping timeout: 265 seconds
[08:45] --> t0bbyyyy joined #scummvm.
[08:45] #scummvm: mode change '+o t0bbyyyy' by ChanServ!ChanServ@services.
[08:52] --> Lightkey joined #scummvm.
[08:58] --> jamm joined #scummvm.
[08:59] <-- jamm left irc: Changing host
[08:59] --> jamm joined #scummvm.
[09:04] --> ajax16384 joined #scummvm.
[09:04] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services.
[09:11] <-- LittleToonCat left irc: Remote host closed the connection
[09:16] --> whiterandrek joined #scummvm.
[09:33] <-- t0bbyyyy left irc: Quit: Leaving
[09:33] --> t0by joined #scummvm.
[09:33] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[09:37] --> Farmboy0 joined #scummvm.
[09:37] <-- Farmboy0 left irc: Changing host
[09:37] --> Farmboy0 joined #scummvm.
[10:37] --> roofather joined #scummvm.
[10:37] <-- rootfather left irc: Ping timeout: 240 seconds
[11:06] --> GitHub70 joined #scummvm.
[11:06] <GitHub70> [scummvm] criezy opened pull request #1164: Improve command line --list-saves command (master...cmd-list-saves) https://git.io/vpOmQ
[11:06] GitHub70 (GitHub70@gateway/service/github.com/x-qlqketdttrhbcvzw) left #scummvm.
[11:30] <-- _sev left irc: Ping timeout: 240 seconds
[11:49] <-- bonki left irc: Remote host closed the connection
[11:50] --> bonki joined #scummvm.
[11:50] #scummvm: mode change '+o bonki' by ChanServ!ChanServ@services.
[11:50] <-- whiterandrek left irc: Remote host closed the connection
[12:01] --> Begasus joined #scummvm.
[12:01] <-- jamm left irc: Ping timeout: 264 seconds
[12:03] --> Begas_VBox joined #scummvm.
[12:25] --> SylvainTV joined #scummvm.
[12:25] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[13:57] --> jamm joined #scummvm.
[13:59] Nick change: roofather -> rootfather
[13:59] <-- rootfather left irc: Changing host
[13:59] --> rootfather joined #scummvm.
[13:59] #scummvm: mode change '+o rootfather' by ChanServ!ChanServ@services.
[14:19] <-- t0by left irc: Remote host closed the connection
[14:20] --> t0by joined #scummvm.
[14:20] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[14:40] --> waltervn joined #scummvm.
[14:40] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[15:00] --> ccawley2011 joined #scummvm.
[15:08] <-- Begas_VBox left irc: Ping timeout: 240 seconds
[15:09] <-- Begasus left irc: Ping timeout: 246 seconds
[15:11] <-- bonki left irc: Remote host closed the connection
[15:11] --> bonki joined #scummvm.
[15:11] #scummvm: mode change '+o bonki' by ChanServ!ChanServ@services.
[15:22] <-- t0by left irc: Ping timeout: 240 seconds
[15:29] --> t0by joined #scummvm.
[15:29] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[15:30] <-- waltervn left irc: Ping timeout: 265 seconds
[15:31] --> Begasus joined #scummvm.
[15:34] <-- jamm left irc: Ping timeout: 248 seconds
[15:44] --> dreammaster joined #scummvm.
[15:44] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[15:45] --> GitHub106 joined #scummvm.
[15:45] <GitHub106> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vpO8l
[15:45] <GitHub106> scummvm/master ab3f397 Paul Gilbert: TITANIC: Fix memory leak due to save thumbnail changes
[15:45] GitHub106 (GitHub106@gateway/service/github.com/x-vxubimspttbrmvug) left #scummvm.
[15:55] <-- dreammaster left irc:
[15:55] --> ny00123 joined #scummvm.
[16:00] mal (~mal@dsl-hkibng42-5673df-25.dhcp.inet.fi) got netsplit.
[16:02] <-- tsoliman left irc: Ping timeout: 240 seconds
[16:04] --> tsoliman joined #scummvm.
[16:04] #scummvm: mode change '+o tsoliman' by ChanServ!ChanServ@services.
[16:11] mal (~mal@dsl-hkibng42-5673df-25.dhcp.inet.fi) got lost in the net-split.
[16:25] <rootfather> ping criezy
[16:26] --> mal joined #scummvm.
[16:28] <-- t0by left irc: Remote host closed the connection
[16:28] --> t0by joined #scummvm.
[16:28] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[16:29] yashgandhe[m] <-- (yashgandhe@gateway/shell/matrix.org/x-wmyxfiysryocwiha) left irc: Ping timeout: 246 seconds
[16:30] <-- flesk_ left irc: Ping timeout: 260 seconds
[16:34] --> _sev joined #scummvm.
[16:34] <-- _sev left irc: Changing host
[16:34] --> _sev joined #scummvm.
[16:34] #scummvm: mode change '+o _sev' by ChanServ!ChanServ@services.
[16:40] --> Guest33950 joined #scummvm.
[16:41] <-- Tomaz^ left irc: Ping timeout: 240 seconds
[16:44] --> Strangerke_ joined #scummvm.
[16:47] <-- Strangerke left irc: Ping timeout: 240 seconds
[16:47] Nick change: Strangerke_ -> Strangerke
[16:53] --> Drenn joined #scummvm.
[16:54] --> waltervn joined #scummvm.
[16:54] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[16:58] <-- Guest33950 left irc:
[16:59] --> Tomaz^ joined #scummvm.
[16:59] <-- Tomaz^ left irc: Excess Flood
[16:59] --> Tomaz^ joined #scummvm.
[16:59] <-- Tomaz^ left irc: Excess Flood
[17:00] --> Tomaz^ joined #scummvm.
[17:00] <-- Tomaz^ left irc: Excess Flood
[17:00] --> Tomaz^ joined #scummvm.
[17:00] <-- Tomaz^ left irc: Excess Flood
[17:01] <rootfather> shit, I screwed up my PR branch by accidentally merging in "master" ;/
[17:04] --> Tomaz^ joined #scummvm.
[17:05] <rootfather> does someone know how to get rid of all those accidential commits?
[17:05] <rootfather> https://github.com/scummvm/scummvm/pull/1160/commits
[17:09] --> LittleToonCat joined #scummvm.
[17:12] <Joefish> rootfather, If I see it correctly you merged master on top of your PR branch so 16bc15b is the latest 'correct' commit?
[17:13] <Joefish> + ea7441a you commited at the end after messing up your branch
[17:14] <rootfather> 16bc15b9195e621d6cc062ddd8260b083aad3a92 is the last one before the merge, yes
[17:14] <rootfather> and then there's ea7441afd53ddd442c17aba6efd6955524a7de62 after the merge because I noticed it too late
[17:14] <rootfather> so yes you are right
[17:15] <Joefish> you could `git branch -f <PR-name> 16bc15b; git checkout <PR-name>; git cherry-pick ea7441a` and then force push
[17:16] <Joefish> this moves your PR branch pointer to the commit, then applies your latest commit on top of it
[17:17] <Joefish> the checkout is needed because you cannot move a branch that is currently checkedout
[17:19] <bonki> why not just git reset --hard 16bc15b && git cherry-pick ea7441a ?
[17:21] <Joefish> sure that's also a possibility :P I recently had to move branches after messing up some rebases so it felt natural doing it that way
[17:24] <bonki> TMTOWTDI :)
[17:25] <Joefish> that's especially true for git :)
[17:26] <rootfather> thanks bonki, that did the trick
[17:27] <bonki> cheers
[17:28] <Joefish> out of curiosity, did my way not work (should be identical to bonki's version) or was his copy-paste solution just more convenient? :)
[17:28] <rootfather> more convenient :P
[17:28] <bonki> :D
[17:28] <Joefish> I see :D
[17:28] <rootfather> now all what's still left is how to tell the new dialog not to appear if we do a Mass Add
[17:28] <rootfather> :/
[17:29] <bonki> git rebase -i 16bc15b9195e621d6cc062ddd8260b083aad3a92^ and deleting all commits inbetween would also have worked
[17:29] <bonki> if there had been one, would dropping just the merge commit also have worked?
[17:30] <-- Begasus left irc: Ping timeout: 246 seconds
[17:31] <rootfather> bonki, since I have pull.rebase true in my global config, nope, that wouldn't have worked because there's no merge commit
[17:31] <bonki> that's why I said _if_ there had been one ;-)
[17:31] <rootfather> ah okay :D
[17:32] <Joefish> but in general the solution would be the same just instead of removing all commits you would remove the squash commit (aka merge commit) of them
[17:43] <-- ccawley2011 left irc: Ping timeout: 260 seconds
[17:45] --> dreammaster joined #scummvm.
[17:45] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[17:45] --> ccawley2011 joined #scummvm.
[17:53] <-- rootfather left irc: Ping timeout: 264 seconds
[18:13] --> rootfather joined #scummvm.
[18:13] #scummvm: mode change '+o rootfather' by ChanServ!ChanServ@services.
[18:17] <rootfather> _sev, regarding the addition bool that has to be added in order to check if the unknown game dialog was launched from Add Game and not Mass Add
[18:17] <rootfather> where in https://github.com/scummvm/scummvm/blob/master/gui/launcher.cpp#L576 do you recommend adding it?
[18:37] <criezy> rootfather: I think the idea here is to add it as a parameter to the detectGame() function and to the reportUnknown() function.
[18:37] <criezy> On the line you linked to you would pass true to the detectGame(), where in turn it would be passed to reportUnknown().
[18:42] <criezy> Hint: you can specify a default value for a parameter when you declare a function so that you do not need to specify a value everwhere where the function is used.
[18:42] <criezy> So for example: virtual GameList detectGames(const Common::FSList &fslist, bool use_unknown_dialog = false) const;
[18:51] <-- ajax16384 left irc: Read error: Connection reset by peer
[19:06] <rootfather> thanks criezy, probably looking at it tomorrow
[19:08] <_sev> exactly
[19:17] <_sev> rootfather: the call is here: https://github.com/scummvm/scummvm/blob/master/gui/launcher.cpp#L576
[19:37] yashgandhe[m] --> (yashgandhe@gateway/shell/matrix.org/x-nfualnsujzkiuhkn) joined #scummvm.
[19:51] #scummvm: mode change '+o Strangerke' by ChanServ!ChanServ@services.
[19:53] <-- Deledrius left irc: Read error: Connection reset by peer
[19:54] --> Deledrius joined #scummvm.
[20:03] <-- t0by left irc: Remote host closed the connection
[20:04] --> t0by joined #scummvm.
[20:04] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[20:05] <-- _sev left irc: Ping timeout: 256 seconds
[20:14] --> Littleboy joined #scummvm.
[20:14] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services.
[20:15] --> flesk_ joined #scummvm.
[20:19] --> _sev joined #scummvm.
[20:19] #scummvm: mode change '+o _sev' by ChanServ!ChanServ@services.
[20:23] <-- t0by left irc: Quit: Leaving
[20:48] --> GitHub82 joined #scummvm.
[20:48] <GitHub82> [scummvm] bonki pushed 2 new commits to master: https://git.io/vpOrc

[20:48] GitHub82 (GitHub82@gateway/service/github.com/x-xwaylnxbjjffhcrr) left #scummvm.
[20:55] --> GitHub51 joined #scummvm.
[20:55] <GitHub51> [scummvm] bonki closed pull request #1075: SCI: Change workaround for PalVary / Animate race condition (master...sci_palvary_race) https://git.io/vbIvn
[20:55] GitHub51 (GitHub51@gateway/service/github.com/x-kirueqbofrnwuvux) left #scummvm.
[20:55] --> GitHub94 joined #scummvm.
[20:55] <GitHub94> [scummvm] bonki pushed 1 new commit to master: https://git.io/vpOra
[20:55] <GitHub94> scummvm/master 65861bb Willem Jan Palenstijn: SCI: Change workaround for PalVary / Animate race condition...
[20:55] GitHub94 (GitHub94@gateway/service/github.com/x-ohojpjohgthnvmag) left #scummvm.
[21:02] <bonki> hm
[21:03] <bonki> I'm looking at https://github.com/scummvm/scummvm/pull/984 right now. I touched some of these myself last week but https://github.com/scummvm/scummvm/compare/master...8BitPimp:aidan/cleanup does not show them, this is not current master
[21:03] <bonki> what am I doing wrong?
[21:34] <-- ny00123 left irc: Quit: Leaving
[22:00] --> Yuv422 joined #scummvm.
[22:03] <-- Yuv422 left irc: Client Quit
[22:06] <-- Deledrius left irc: Read error: Connection reset by peer
[22:06] --> Deledrius joined #scummvm.
[22:14] --> girafe joined #scummvm.
[22:39] <-- criezy left irc: Quit: criezy
[22:42] <-- Farmboy0 left irc: Remote host closed the connection
[22:55] <-- girafe left irc: Read error: Connection reset by peer
[23:02] <-- Joefish left irc: Ping timeout: 265 seconds
[23:46] --> Joefish joined #scummvm.
[23:46] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[00:00] --- Mon Apr 23 2018