ScummVM IRC Log - 23 Apr 2018

[Back to Index]

[00:05] <-- ccawley2011 left irc: Quit: Page closed

[00:24] <-- waltervn left irc: Quit: Leaving
[00:33] <-- Joefish left irc: Ping timeout: 265 seconds
[01:08] <-- SylvainTV left irc: Read error: Connection reset by peer
[01:12] --> klusark joined #scummvm.
[01:37] --> DominusExult joined #scummvm.
[01:41] <-- Dominus left irc: Ping timeout: 260 seconds
[01:41] Nick change: DominusExult -> Dominus
[02:58] <-- dreammaster left irc:
[03:06] --> GitHub32 joined #scummvm.
[03:06] <GitHub32> [scummvm] criezy pushed 1 new commit to master: https://git.io/vpOHE
[03:06] <GitHub32> scummvm/master 0015d51 Thierry Crozat: I18N: Regenerate translations data file
[03:06] GitHub32 (GitHub32@gateway/service/github.com/x-osydotaahmtjfblg) left #scummvm.
[04:27] <-- Drenn left irc: Ping timeout: 245 seconds
[04:40] --> Drenn joined #scummvm.
[04:44] <-- klusark left irc: Ping timeout: 248 seconds
[04:50] --> klusark joined #scummvm.
[05:12] --> waltervn joined #scummvm.
[05:12] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[06:01] <-- Drenn left irc: Ping timeout: 240 seconds
[07:13] --> Strangerke|work joined #scummvm.
[07:14] <Strangerke|work> hi guys
[07:32] <bonki> hi Strangerke|work
[07:32] <bonki> :)
[07:34] <Strangerke|work> hey bonki :)
[07:38] --> Joefish joined #scummvm.
[07:38] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[07:41] --> _sev|work joined #scummvm.
[07:41] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[07:56] <-- _sev|work left irc: Quit: This computer has gone to sleep
[07:57] --> _sev|work joined #scummvm.
[07:57] <-- _sev|work left irc: Changing host
[07:57] --> _sev|work joined #scummvm.
[07:57] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[08:15] <-- _sev|work left irc: Quit: This computer has gone to sleep
[08:15] --> _sev|work joined #scummvm.
[08:15] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[08:17] <-- _sev|work left irc: Client Quit
[08:18] --> morganw joined #scummvm.
[08:18] Nick change: morganw -> mwillcock
[08:21] --> _sev|work joined #scummvm.
[08:21] <-- _sev|work left irc: Changing host
[08:21] --> _sev|work joined #scummvm.
[08:21] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[08:37] <-- Lightkey left irc: Ping timeout: 256 seconds
[08:40] <-- mwillcock left irc: Ping timeout: 276 seconds
[08:45] <-- LittleToonCat left irc: Remote host closed the connection
[08:46] --> mwillcock joined #scummvm.
[08:50] --> Lightkey joined #scummvm.
[08:56] <-- _sev|work left irc: Quit: This computer has gone to sleep
[09:03] --> _sev|work joined #scummvm.
[09:03] <-- _sev|work left irc: Changing host
[09:03] --> _sev|work joined #scummvm.
[09:03] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[09:03] --> criezy|Work joined #scummvm.
[09:03] #scummvm: mode change '+o criezy|Work' by ChanServ!ChanServ@services.
[09:05] --> TMM joined #scummvm.
[09:05] <-- TMM left irc: Changing host
[09:05] --> TMM joined #scummvm.
[09:05] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services.
[10:04] <-- _sev|work left irc: Quit: This computer has gone to sleep
[10:06] <-- klusark left irc: Ping timeout: 240 seconds
[11:06] --> GitHub26 joined #scummvm.
[11:06] <GitHub26> [scummvm] bgK pushed 1 new commit to master: https://git.io/vp3ng
[11:06] <GitHub26> scummvm/master 366fbf5 Bastien Bouclet: MOHAWK: MYST: Clip one coordinate at a time in o_copyImageToBackBuffer...
[11:06] GitHub26 (GitHub26@gateway/service/github.com/x-jelxbwwrhmnqwpws) left #scummvm.
[11:24] <Joefish> urgh.. over the last few days I have been refactoring code just to realize that the improvement it would bring does not justify the effort. But I found a few bugs along the way, so it hasn't been for nothing.
[11:28] <bonki> Joefish: been there, done that :)
[11:29] <Joefish> hey bonki :) were you able to resolve the diff issue from yesterday?
[11:29] <bonki> Joefish: since you know how to github...could you shed some light on the question I had yesterday?
[11:29] <bonki> haha, timing
[11:29] <Joefish> :D
[11:29] <bonki> no...I'm puzzled as to why it doesn't seem to diff against current master
[11:31] <bonki> I assume that it's not a bug and does exactly what it's supposed to do and that I just don't understand it
[11:35] <Joefish> bonki, you said that you 'touched' some of the files yourself last week, but I just checked the history of all files in question and the last time they were changed was 2017-08-08 according to github.
[11:35] <bonki> what
[11:35] <Joefish> What in particular made you think that the diffs are incorrect?
[11:36] <bonki> give me a second :)
[11:38] <bonki> base/commandLine.cpp
[11:39] <bonki> https://github.com/scummvm/scummvm/commit/3747d852eecb9e510a0b5cf0d03674f657f1b9e0#diff-ad2287733d7e5cb5fda2b2dd2d5a66ab
[11:39] <bonki> this is my commit from the 15th
[11:39] <bonki> "s+2" -> "s + 2" amongst others
[11:40] <Joefish> oh.. yea didn't realize it switched to 8bitpimp's fork and loaded its history..
[11:40] <Joefish> sorry :P
[11:40] <bonki> these are not showing up in the diff against 8BitPimp's fork
[11:40] <bonki> haha
[11:42] <-- ced117 left irc: Ping timeout: 265 seconds
[11:44] <Joefish> I'm not sure but to me it seems your changes are in the diff..
[11:45] <bonki> in https://github.com/scummvm/scummvm/compare/master...8BitPimp:aidan/cleanup ?
[11:45] <Joefish> yes
[11:46] <bonki> what the fudge
[11:46] <bonki> screenshot please
[11:49] --> ced117 joined #scummvm.
[11:50] <Joefish> https://photos.google.com/search/_tra_/photo/AF1QipMQRhLvwE8sSktfkDJPTEOnsM0YrDt0iOUq7RTN (s + 1)
[11:50] <Joefish> https://photos.google.com/search/_tra_/photo/AF1QipNTLsIZGVK7tM_r-mUTWyjHAE3ZQN71o3-Z6rYK (indent)
[11:50] <Joefish> https://photos.google.com/search/_tra_/photo/AF1QipM9rwr6u2BypELnyBtY_WUCzmYlUzZDZxpG0ygK (s + 2)
[11:51] <bonki> Sign in with your Google Account
[11:51] <Joefish> ...
[11:51] <Joefish> sec
[11:53] <Joefish> https://tinyurl.com/yckoe9nt https://tinyurl.com/y8ugpfgl https://tinyurl.com/yd72qusp
[11:53] <bonki> left is scummvm/master, right?
[11:53] <bonki> so those should show my updated changes
[11:54] <bonki> which it doesn't
[11:54] <-- ced117 left irc: Ping timeout: 256 seconds
[11:54] <bonki> i.e.
[11:54] <bonki> https://github.com/scummvm/scummvm/compare/master...8BitPimp:aidan/cleanup#diff-ad2287733d7e5cb5fda2b2dd2d5a66abL303
[11:54] <bonki> should be
[11:54] <bonki> https://github.com/scummvm/scummvm/blob/master/base/commandLine.cpp#L314
[11:54] <Joefish> no it's a diff. left is what was removed and right is what was added
[11:54] <bonki> for example
[11:55] --> ced117 joined #scummvm.
[11:55] <bonki> yes, against the chosen branch
[11:55] <bonki> which is scummvm/master
[11:56] <Joefish> yes, so if you ignore the -/+ signs, then left is 8bits fork and right master
[11:57] <Joefish> if I'm not mistaken
[11:57] <bonki> no it's not
[11:57] <bonki> look closely
[11:57] <bonki> he added a line break there
[11:57] <bonki> that's his HEAD
[11:57] <bonki> and left is apparently his HEAD^
[11:57] <bonki> not scummvm/master HEAD
[11:58] <bonki> there have been more recent changes so the line number isn't even the same anymore
[11:58] <Joefish> that's what I thought I was saying. "<bonki> left is scummvm/master, right?" is exatcly the opposite isn't it?
[11:58] <bonki> neither left nor right is scummvm/master
[11:59] <bonki> https://github.com/scummvm/scummvm/blob/master/base/commandLine.cpp#L314 this is scummvm/master
[11:59] <bonki> or what do you mean?
[12:01] <Joefish> what I mean is the right looks like scummvm/master to me. Even the link you just posted for DO_OPTION_OPT I don't see any problems :/
[12:01] <Joefish> sec
[12:01] <bonki> as I said, it's not
[12:01] <bonki> there is a linebreak breaking apart the ternary
[12:01] <bonki> the : is on a new line
[12:01] <bonki> that is 8bits change
[12:01] <bonki> it's not in master
[12:01] <bonki> I only added spaces around the +
[12:02] <bonki> and left hand side is old scummvm/master
[12:02] <bonki> all the other changes on the right hand side are not in master either, because I didn't change those
[12:02] <bonki> those are clearly 8bits changes
[12:02] <bonki> 8bits'
[12:03] <Joefish> huh.. indeed. That's harder than one of those 3D pictures you have to squnit at really hard :P
[12:04] <bonki> those never worked for me, heh
[12:04] <bonki> so you agree that this is weird?
[12:04] --> Drenn joined #scummvm.
[12:04] <Joefish> yea definitely.. That's quite mind blowing actually
[12:07] <bonki> hm
[12:09] <Joefish> look at it in unified mode. the linebreak is not in the source file itself but just indentation for the right side
[12:09] <bonki> I guess it doesn't update some diff cache once there are conflicts
[12:09] <Joefish> but the diff itself seems to be backwards doesn't it?
[12:09] <bonki> let me check
[12:10] <bonki> unified mode shows exactly the same code for me
[12:12] <bonki> I think it just doesn't update the diff once it can't automatically merge anymore
[12:13] <criezy|Work> I always understood that GitHub compare mode as being a diff between teh common ancestor of the two branches and the second branch.
[12:13] <bonki> that's what it looks like
[12:13] <bonki> but that's not what I would expect
[12:13] <criezy|Work> I don't think is is supposed to show you the diff between current master and the second branch.
[12:13] <Joefish> that's confusing as fuck
[12:14] <criezy|Work> It basically shows you the diff for the commits included in the PR.
[12:14] <bonki> there's probably a really good reason for that but right now this seems really stupid
[12:14] <criezy|Work> And you need to rebase those commits if you want to see the diff with the current master.
[12:16] <bonki> if I need to do that I can just resort to using the CLI, then the whole feature is useless
[12:16] <Joefish> sorry for causing more confusion bonki :P But I guess criezy's explanation is the most reasonable one
[12:17] <bonki> heh, no worries Joefish :)
[12:21] --> jamm joined #scummvm.
[12:22] <bonki> if it's supposed to work like that it should at least say so :/
[12:31] <bonki> "The diff shows a comparison between the tip of the head branch and the commit at which the head was last synced with the base branch."
[12:32] <bonki> so criezy|Work is right and it says so in GitHub Help
[12:32] <bonki> the wording could be a bit better, though
[12:55] <Joefish> yea just found it as well in the compare for PRs. Considering the use case it makes sense but I'm sure many before us were just as confused
[12:57] --> Littleboy joined #scummvm.
[12:57] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services.
[12:57] <-- Littleboy left irc: Client Quit
[13:04] <-- ced117 left irc: Ping timeout: 268 seconds
[13:06] --> ced117 joined #scummvm.
[13:24] --> _sev|work joined #scummvm.
[13:24] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[13:32] --> GitHub112 joined #scummvm.
[13:32] <GitHub112> [scummvm] dafioram opened pull request #1165: MOHAWK: MYST: Turn held page state into an enum (master...mystPageEnum) https://git.io/vp36s
[13:32] GitHub112 (GitHub112@gateway/service/github.com/x-eamvpczckfflholn) left #scummvm.
[13:38] <-- _sev|work left irc: Quit: This computer has gone to sleep
[13:38] --> _sev|work joined #scummvm.
[13:38] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[13:39] <-- _sev|work left irc: Client Quit
[13:53] --> morganw joined #scummvm.
[13:55] <-- mwillcock left irc: Ping timeout: 264 seconds
[14:30] <-- jamm left irc: Ping timeout: 264 seconds
[14:31] --> jamm joined #scummvm.
[14:31] <-- jamm left irc: Changing host
[14:31] --> jamm joined #scummvm.
[14:36] <-- jamm left irc: Ping timeout: 240 seconds
[14:36] --> jamm joined #scummvm.
[14:36] <-- jamm left irc: Changing host
[14:36] --> jamm joined #scummvm.
[14:46] <-- jamm left irc: Ping timeout: 248 seconds
[14:47] --> jamm joined #scummvm.
[14:51] <-- jamm left irc: Ping timeout: 240 seconds
[14:51] --> jamm joined #scummvm.
[14:51] <-- jamm left irc: Changing host
[14:51] --> jamm joined #scummvm.
[15:00] --> _sev|work joined #scummvm.
[15:00] <-- _sev|work left irc: Changing host
[15:00] --> _sev|work joined #scummvm.
[15:00] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[15:27] --> Polynomial-C joined #scummvm.
[15:32] --> ajax16384 joined #scummvm.
[15:32] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services.
[15:52] <-- _sev|work left irc: Quit: This computer has gone to sleep
[15:55] <-- TMM left irc: Quit: Ex-Chat
[15:56] --> _sev|work joined #scummvm.
[15:56] <-- _sev|work left irc: Changing host
[15:56] --> _sev|work joined #scummvm.
[15:56] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[15:57] --> ny00123 joined #scummvm.
[16:00] <-- _sev|work left irc: Client Quit
[16:02] <Joefish> :)
[16:08] <Drenn> mrw I get into gsoc https://www.youtube.com/watch?v=btCKtQmN49w
[16:09] <Joefish> congrats Drenn. same here :)
[16:09] <bonki> congrats Drenn and Joefish! :)
[16:09] <Joefish> thanks bonki :)
[16:09] <bonki> :)
[16:09] <Drenn> thanks :)
[16:10] <Joefish> Drenn, are you working on the stark engine?
[16:10] <Strangerke|work> Congrats guys :)
[16:10] <Drenn> stark, star trek, close enough =P
[16:10] <Joefish> hey Strangerke|work. thanks :)
[16:10] <Strangerke|work> I have to go back home now, ttyl :)
[16:11] <Joefish> ah okay. on the project page are the nicks not mentioned so I took a guess :P
[16:11] <Joefish> alright later Strangerke|work
[16:11] <bonki> you had a 50% chance of being right
[16:11] <Drenn> seeya strangerke :)
[16:11] <bonki> later Strangerke|work :)
[16:12] <Drenn> yeah they didn't use my nickname for some reason, maybe it was some setting I forgot about
[16:12] <Joefish> yea htere was a checkbox if you want your real name or nick as your 'identifier'
[16:13] <bonki> or they didn't know what a Drenn was ;-)
[16:13] <Drenn> if there was such a checkbox I probably set it to be my real name =P
[16:13] <bonki> btw, have you had a chance to talk to m-kiewitz about your PR?
[16:14] <Drenn> I haven't, but from what I've heard it just needs to be redone by someone with expertise in agi to make sure it's accurate.
[16:17] <bonki> exactly, I was just wondering if you maybe know more than we do as he wanted to look into it during his time off but hasn't commented further on the PR yet
[16:17] <-- jamm left irc: Ping timeout: 248 seconds
[16:18] <bonki> let's hope you haven't pushed him down a rabbit hole there :)
[16:18] <Drenn> haha, well I don't know any more than you do
[16:18] <bonki> shame
[16:20] --> whiterandrek joined #scummvm.
[16:21] <whiterandrek> Congratulations to all who are in GSOC.
[16:21] <bonki> congrats whiterandrek
[16:23] --> _sev|work joined #scummvm.
[16:23] <-- _sev|work left irc: Changing host
[16:23] --> _sev|work joined #scummvm.
[16:23] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[16:24] <whiterandrek> Thanks
[16:26] <Joefish> to you as well whiterandrek :)
[16:38] <criezy|Work> Joefish, whiterandrek, Drenn: congratulations!
[16:38] <Joefish> thanks criezy|Work :)
[16:38] <Drenn> :)
[16:38] <-- morganw left irc: Quit: morganw
[16:50] <-- whiterandrek left irc: Quit: Page closed
[16:52] <-- _sev|work left irc: Quit: This computer has gone to sleep
[17:20] --> _sev|work joined #scummvm.
[17:20] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[17:22] <-- criezy|Work left irc: Ping timeout: 260 seconds
[17:23] --> Farmboy0 joined #scummvm.
[17:23] <-- Farmboy0 left irc: Changing host
[17:23] --> Farmboy0 joined #scummvm.
[17:27] --> LittleToonCat joined #scummvm.
[17:40] --> DJWillis joined #scummvm.
[17:40] #scummvm: mode change '+o DJWillis' by ChanServ!ChanServ@services.
[17:58] <-- _sev|work left irc: Quit: This computer has gone to sleep
[18:09] <_sev> we got 4 students!
[18:10] <_sev> Joefish: welcome back
[18:16] <bonki> _sev: you're late to the party :)
[18:17] <Joefish> _sev, thanks. glad to be back :)
[18:23] --> SylvainTV joined #scummvm.
[18:23] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[18:26] --> _sev|work joined #scummvm.
[18:26] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[18:26] <-- _sev|work left irc: Client Quit
[18:30] --> ccawley2011 joined #scummvm.
[18:37] --> girafe joined #scummvm.
[18:51] <-- Stormkeeper left irc: Ping timeout: 240 seconds
[18:55] --> TMM joined #scummvm.
[18:55] <-- TMM left irc: Changing host
[18:55] --> TMM joined #scummvm.
[18:55] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services.
[19:06] <-- Farmboy0 left irc: Read error: No route to host
[19:13] --> Stormkeeper joined #scummvm.
[19:49] --> criezy joined #scummvm.
[19:49] #scummvm: mode change '+o criezy' by ChanServ!ChanServ@services.
[19:51] --> Farmboy0 joined #scummvm.
[19:51] <-- Farmboy0 left irc: Changing host
[19:51] --> Farmboy0 joined #scummvm.
[20:05] <-- bonki left irc: Ping timeout: 268 seconds
[20:07] --> bonki joined #scummvm.
[20:07] #scummvm: mode change '+o bonki' by ChanServ!ChanServ@services.
[20:38] <-- ajax16384 left irc: Read error: Connection reset by peer
[21:20] <-- girafe left irc: Quit: Leaving
[21:21] <-- ST1 left irc: Ping timeout: 264 seconds
[21:24] --> ST joined #scummvm.
[21:24] #scummvm: mode change '+o ST' by ChanServ!ChanServ@services.
[21:43] <-- _sev left irc: Ping timeout: 256 seconds
[22:05] --> GitHub198 joined #scummvm.
[22:05] <GitHub198> [scummvm] Strangerke pushed 1 new commit to master: https://git.io/vps6x
[22:05] <GitHub198> scummvm/master dd15251 Strangerke: LILLIPUT: Remove some unused variables, initialize some others
[22:05] GitHub198 (GitHub198@gateway/service/github.com/x-mwvureusecociqgt) left #scummvm.
[22:09] <-- ST left irc: Ping timeout: 255 seconds
[22:10] <-- ny00123 left irc: Quit: Leaving
[22:12] --> ST joined #scummvm.
[22:12] #scummvm: mode change '+o ST' by ChanServ!ChanServ@services.
[22:15] <-- bonki left irc: Ping timeout: 268 seconds
[22:18] --> bonki joined #scummvm.
[22:18] #scummvm: mode change '+o bonki' by ChanServ!ChanServ@services.
[22:18] --> noobineer joined #scummvm.
[22:21] <-- ccawley2011 left irc: Ping timeout: 260 seconds
[22:24] <-- noobineer left irc: Read error: Connection reset by peer
[22:25] --> ccawley2011 joined #scummvm.
[22:32] --> dreammaster joined #scummvm.
[22:32] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[22:35] <-- TMM left irc: Read error: Connection reset by peer
[22:43] <-- dreammaster left irc: Read error: Connection timed out
[22:43] --> dreammaster joined #scummvm.
[22:43] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[22:53] <-- Farmboy0 left irc: Remote host closed the connection
[23:01] --> GitHub111 joined #scummvm.
[23:01] <GitHub111> [scummvm-web] criezy pushed 1 new commit to master: https://git.io/vpsMF
[23:01] <GitHub111> scummvm-web/master 04cadb8 Thierry Crozat: WEB: Add accepted GSoC projects news
[23:01] GitHub111 (GitHub111@gateway/service/github.com/x-ofshcacpjjotuktu) left #scummvm.
[23:01] <-- Drenn left irc: Read error: Connection reset by peer
[23:01] --> Drenn joined #scummvm.
[23:12] --> Strangerke_ joined #scummvm.
[23:14] <-- Strangerke left irc: Ping timeout: 256 seconds
[23:14] Nick change: Strangerke_ -> Strangerke
[23:21] <-- criezy left irc: Quit: criezy
[23:27] <-- stroggoff left irc: Quit: Leaving
[23:37] <-- waltervn left irc: Quit: Leaving
[23:44] <-- ccawley2011 left irc: Quit: Page closed
[23:49] --> GitHub130 joined #scummvm.
[23:49] <GitHub130> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vpsSX
[23:49] <GitHub130> scummvm/master db8f9bc Paul Gilbert: XEEN: FIxes for Dark Side & Swords spell listing
[23:49] GitHub130 (GitHub130@gateway/service/github.com/x-ockiwozgbywruecn) left #scummvm.
[00:00] --- Tue Apr 24 2018