[Back to Index]

[00:02] <criezy> rsn8887: I made some minor changes to the wiki page.
[00:02] <criezy> Also I am wondering about the 'Building from source' sectiondicating to get the ScummVM sources from https://github.com/Cpasjuste/scummvm
[00:03] <criezy> I am guessing this is no longer necessary and we should get the source from the official ScummVM repo now?
[00:04] <snover> oh, that reminds me, the DM engine page is pointing to a personal fork. is that up-to-date in scummvm repo now too?
[00:05] <criezy> Yes, I think it is.
[00:07] <rsn8887> criezy: True! I will make the change
[00:08] --> Strangerke joined #scummvm.
[00:08] #scummvm: mode change '+o Strangerke' by ChanServ!ChanServ@services.
[00:08] <Strangerke> hi guys
[00:09] <criezy> Hi strangerke
[00:10] <rsn8887> criezy: Can we have a forum started for the Vita port? I see it should have a number, like PSP has number 3???
[00:11] <criezy> I guess we can. But I am not familiar with how the forum admin works.
[00:12] <criezy> strangerke or _sev could help you with that I think
[00:13] <rsn8887> Strangerke: Can you help me really quick to start a subforum for the Vita port? I would like to link to it from the new platform page here http://wiki.scummvm.org/index.php/Playstation_Vita by adding "forum=xx|" , where xx is the forum number, to the template
[00:14] <rsn8887> I don't have forum admin rights.
[00:14] <rsn8887> for the PSP it is forum=3|
[00:16] <Strangerke> just came back from work, I'm slightly fizzy. Let me check.
[00:16] <Strangerke> s/fizzy/dizzy
[00:16] <Lightkey> duzzie?
[00:16] <criezy> s/work/pub/ ?
[00:17] <Strangerke> criezy: no, I was working. Not my day work, just another :P
[00:18] <Strangerke> The joy of being freelance, you can work a lot more... DOH!
[00:19] <Strangerke> rsn8887: done
[00:21] <Strangerke> rsn8887: hum. Oups. I just added the link I didn't create the sub-forum. wait a bit more.
[00:24] <criezy> Hmm, aren't those two the same game? http://wiki.scummvm.org/index.php/Hoyle_Card_Games and http://wiki.scummvm.org/index.php/Hoyle_Classic_Games
[00:29] --> Uhfgood joined #scummvm.
[00:29] <-- exmensa left irc: Read error: Connection reset by peer
[00:29] --> exmensa joined #scummvm.
[00:32] <Deledrius> I could be wrong, but I think they released separate ones, where some were only card games and the other was more broad (including board games)?
[00:33] <Deledrius> The wiki's description seems to contradict my fuzzy recollection though.
[00:33] <Deledrius> It seems like both of those entries are meant to be for the same game though (Hoyle 5).
[00:36] <criezy> Yes, the two descriptions indeed seem to be for the same game.
[00:36] <criezy> But I was wondering if there are indeed two different games and the description on one of the page is wrong, or if there is only one game.
[00:37] <criezy> I would tend to think there is only one game and we just didn't notice there was already a page for it when adding the second one.
[00:39] <Lightkey> where 'we' is omer_mor_ who chose the wrong title
[00:43] <Lightkey> there is a whole Hoyle Card Games series but that's definitely not what he meant
[00:45] <Lightkey> I would prefer his write-up over MetaFox's though
[00:46] <criezy> I agree. I will move omer_mor's content to the Hoyle_Classic_Games page (but keep the screenshot).
[00:49] <criezy> Except there is no screenshot on either page... Some hallucinations probably.
[00:51] <Deledrius> O.o
[00:58] <-- SylvainTV left irc: Read error: Connection reset by peer
[00:59] <snover> there are so many different releases of hoyle games it is crazy
[01:36] --> GitHub83 joined #scummvm.
[01:36] <GitHub83> [scummvm] bluegr pushed 1 new commit to master: https://git.io/vyPi0
[01:36] <GitHub83> scummvm/master 9ba330c Filippos Karapetis: CHEWY: More work on scene hotspots
[01:36] GitHub83 (GitHub83@192.30.252.34) left #scummvm.
[01:37] <-- Joefish left irc: Ping timeout: 260 seconds
[01:43] --> GitHub77 joined #scummvm.
[01:43] <GitHub77> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vyPiQ
[01:43] <GitHub77> scummvm/master 2edbc73 Paul Gilbert: TITANIC: Implemented CStarControlSub2 class
[01:43] GitHub77 (GitHub77@192.30.252.34) left #scummvm.
[01:58] --> GitHub128 joined #scummvm.
[01:58] <GitHub128> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vyPPK
[01:58] <GitHub128> scummvm/master 527b814 Paul Gilbert: TITANIC: Rename CStarControlSub4 class to FRange
[01:58] GitHub128 (GitHub128@192.30.252.45) left #scummvm.
[02:17] --> GitHub14 joined #scummvm.
[02:17] <GitHub14> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vyP1W
[02:17] <GitHub14> scummvm/master 0267faf Paul Gilbert: TITANIC: Fix some starfield startup crashes and initialization
[02:17] GitHub14 (GitHub14@192.30.252.40) left #scummvm.
[02:21] --> DominusExult joined #scummvm.
[02:21] <-- DominusExult left irc: Changing host
[02:21] --> DominusExult joined #scummvm.
[02:22] <-- TMM left irc: Ping timeout: 240 seconds
[02:22] <-- Dominus left irc: Ping timeout: 240 seconds
[02:22] Nick change: DominusExult -> Dominus
[02:34] <-- dreammaster left irc:

[03:28] <-- Harekiet left irc: Ping timeout: 256 seconds
[03:35] --> Vampire0_ joined #scummvm.
[03:37] <-- Vampire0 left irc: Ping timeout: 240 seconds
[03:40] --> Harekiet joined #scummvm.
[03:42] --> HoloIRCUser3 joined #scummvm.
[03:42] Nick change: HoloIRCUser3 -> maxyodedara5
[03:46] <-- Harekiet left irc: Read error: Connection reset by peer
[04:00] <-- maxyodedara5 left irc: Read error: Connection reset by peer
[04:01] --> Harekiet joined #scummvm.
[04:03] <-- Uhfgood left irc: Quit: Leaving
[04:44] --> GitHub19 joined #scummvm.
[04:44] <GitHub19> [scummvm] rsn8887 pushed 1 new commit to master: https://git.io/vyP7M
[04:44] <GitHub19> scummvm/master db7f5c4 rsn8887: PSP2: Update readme-psp2.md
[04:44] GitHub19 (GitHub19@192.30.252.40) left #scummvm.
[04:59] --> Tkachov_ joined #scummvm.
[05:50] <-- Harekiet left irc: Ping timeout: 258 seconds
[05:50] --> Harekiet joined #scummvm.
[06:21] <-- LittleToonCat left irc: Remote host closed the connection
[06:42] --> waltervn2 joined #scummvm.
[06:42] --> waltervn joined #scummvm.
[06:42] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[06:42] <waltervn> morning
[07:06] <-- Tomaz^W left irc: Ping timeout: 256 seconds
[07:16] <-- Strangerke left irc: Ping timeout: 240 seconds
[07:24] --> NuSuey joined #scummvm.
[07:24] --> t0by joined #scummvm.
[07:24] <-- t0by left irc: Changing host
[07:24] --> t0by joined #scummvm.
[07:24] #scummvm: mode change '+v t0by' by ChanServ!ChanServ@services.
[07:53] --> _sev|work joined #scummvm.
[07:53] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[07:55] <-- Lightkey left irc: Ping timeout: 260 seconds
[08:04] --> vinayakvivek joined #scummvm.
[08:07] --> Lightkey joined #scummvm.
[08:07] --> HoloIRCUser joined #scummvm.
[08:08] Nick change: HoloIRCUser -> maxyodedara5
[08:22] <-- t0by left irc: Ping timeout: 240 seconds
[08:26] <-- _sev|work left irc: Quit: This computer has gone to sleep
[08:26] --> GitHub129 joined #scummvm.
[08:26] <GitHub129> [scummvm] sev- pushed 2 new commits to master: https://git.io/vyXvt
[08:26] <GitHub129> scummvm/master f981e22 Eugene Sandulenko: DIRECTOR: Detect immediate Lingo actions
[08:26] <GitHub129> scummvm/master 6ce4f58 Eugene Sandulenko: DIRECTOR: Execute immediate scripts on frame load
[08:26] GitHub129 (GitHub129@192.30.252.40) left #scummvm.
[08:37] Nick change: Vampire0_ -> Vampire0
[08:40] <-- maxyodedara5 left irc: Read error: Connection reset by peer
[08:42] --> _sev|work joined #scummvm.
[08:42] <-- _sev|work left irc: Changing host
[08:42] --> _sev|work joined #scummvm.
[08:42] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[08:47] --> HoloIRCUser joined #scummvm.
[08:47] Nick change: HoloIRCUser -> maxyodedara5
[08:49] <-- maxyodedara5 left irc: Client Quit
[08:50] --> maxyodedara5 joined #scummvm.
[08:51] <-- maxyodedara5 left irc: Remote host closed the connection
[08:57] --> maxyodedara5 joined #scummvm.
[09:00] --> m_kiewitz joined #scummvm.
[09:00] <-- m_kiewitz left irc: Changing host
[09:00] --> m_kiewitz joined #scummvm.
[09:00] #scummvm: mode change '+o m_kiewitz' by ChanServ!ChanServ@services.
[09:02] --> TMM joined #scummvm.
[09:02] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services.
[09:25] <-- Tkachov_ left irc: Read error: No route to host
[09:26] --> Tkachov_ joined #scummvm.
[09:53] --> salty-horse joined #scummvm.
[09:53] #scummvm: mode change '+o salty-horse' by ChanServ!ChanServ@services.
[09:57] --> Joefish joined #scummvm.
[10:41] <-- Cheeseness left irc: Quit: Leaving.
[11:14] <-- vinayakvivek left irc: Quit: Connection closed for inactivity
[11:40] --> Cheeseness joined #scummvm.
[12:33] --> mr-easy joined #scummvm.
[12:33] <mr-easy> hi
[12:33] <-- Axy left irc: Ping timeout: 260 seconds
[12:33] <-- Mia left irc: Ping timeout: 268 seconds
[12:35] <mr-easy> I am new to open source. I got to know about Scummvm from GSoC. I have been doing programming from a long time, but mostly competitive coding.
[12:35] --> Mia joined #scummvm.
[12:35] <-- Mia left irc: Changing host
[12:35] --> Mia joined #scummvm.
[12:35] --> Axy joined #scummvm.
[12:35] <-- Axy left irc: Changing host
[12:35] --> Axy joined #scummvm.
[12:35] <mr-easy> I am also intersted in game development.
[12:36] <mr-easy> Can anyone help me in getting started? I mean from where to start reading code?
[12:41] [vEX] <-- (~vex@217-210-113-95-no42.tbcn.telia.com) left irc: Ping timeout: 240 seconds
[12:42] [vEX] --> (~vex@213-65-94-75-no42.tbcn.telia.com) joined #scummvm.
[12:44] <-- Axy left irc: Ping timeout: 240 seconds
[12:44] <-- Mia left irc: Ping timeout: 240 seconds
[12:46] --> Mia joined #scummvm.
[12:46] <-- Mia left irc: Changing host
[12:46] --> Mia joined #scummvm.
[12:46] --> Axy joined #scummvm.
[12:46] <-- Axy left irc: Changing host
[12:46] --> Axy joined #scummvm.
[12:50] --> salty_horse joined #scummvm.
[12:53] <-- mr-easy left irc: Ping timeout: 260 seconds
[12:53] <-- salty-horse left irc: Ping timeout: 268 seconds
[12:55] Nick change: salty_horse -> salty-horse
[12:55] <-- salty-horse left irc: Changing host
[12:55] --> salty-horse joined #scummvm.
[12:55] #scummvm: mode change '+o salty-horse' by ChanServ!ChanServ@services.
[12:57] --> jamm joined #scummvm.
[13:19] --> Strangerke|work joined #scummvm.
[13:19] <Strangerke|work> hi guys
[13:20] --> dreammaster_work joined #scummvm.
[13:25] <Joefish> hey
[13:41] <-- salty-horse left irc: Quit: Leaving
[13:43] --> salty-horse joined #scummvm.
[13:43] #scummvm: mode change '+o salty-horse' by ChanServ!ChanServ@services.
[13:49] <-- salty-horse left irc: Quit: Leaving
[13:51] --> salty-horse joined #scummvm.
[13:51] #scummvm: mode change '+o salty-horse' by ChanServ!ChanServ@services.
[13:54] <-- chadj left irc: Quit: Out!
[14:03] <dreammaster_work> JoeFish: g'day
[14:07] <-- salty-horse left irc: Quit: Leaving
[14:16] <-- Joefish left irc: Ping timeout: 256 seconds
[14:22] #scummvm: mode change '+o [vEX]' by ChanServ!ChanServ@services.
[14:31] --> Uhfgood joined #scummvm.
[14:32] --> vinayakvivek joined #scummvm.
[14:32] <-- _sev|work left irc: Quit: This computer has gone to sleep
[14:38] --> ajax16384 joined #scummvm.
[14:38] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services.
[14:42] <Uhfgood> hello
[14:42] <dreammaster_work> G'day
[14:42] <Uhfgood> What's new?
[14:43] <dreammaster_work> Meh. Working at home right now due to a major blizzard. So a lot easier to have the IRC channel open then it would in the office :)
[14:43] <Uhfgood> i see
[14:43] <Uhfgood> Where do you live that's blizzarding?
[14:44] <dreammaster_work> Boston. We've got a big covering the entire New York tri-state area.
[14:44] <dreammaster_work> Hence also I'm frequently online during those times our European fellowship is in bed asleep.
[14:45] <Uhfgood> ahh
[14:45] <Uhfgood> I'm down here in Florida - so no such luck ;-)
[14:45] <Uhfgood> actually it has been fairly cool these past few days
[14:45] <Uhfgood> I guess that's the equivalent of a blizzard down here :-P
[14:46] <dreammaster_work> Ah. I've visited there twice; both times it was very humid, and rained like hell for one of the days.
[14:46] <Uhfgood> yeah, one of the things i don't like about being down here
[14:46] <Uhfgood> but can't really move anywhere else
[14:48] <dreammaster_work> I'm from Australia originally; only been here a few years. So blizzards right in the cities are still a novelty for me. Though I could do without all the coldness.
[14:52] <Uhfgood> dreammaster_work - hence the "G'Day"
[14:52] <dreammaster_work> Indeed. Force of habit :)
[14:52] <Uhfgood> No worries ;-)
[14:54] <dreammaster_work> She'll be right
[14:58] <Uhfgood> So, I'm going to work on my big adventure game here soon... I don't guess it will use scummvm (I was planning on sci companion but I'm leaning toward wme now)
[14:58] <Uhfgood> although scummvm can play some wme games
[14:59] <Uhfgood> so who knows :-)
[15:13] <dreammaster_work> Good luck with that. I experimented with AGS some years back.. I didn't have the creative spark and patience for writing a whole game from scratch, though
[15:14] <Uhfgood> yeah
[15:15] <Uhfgood> thanks
[15:15] <Uhfgood> I don't like ags that much
[15:15] <Uhfgood> plus my game might be using high-res graphics
[15:16] <Uhfgood> I'm going to take off for a while
[15:16] <Uhfgood> so take it easy
[15:16] <dreammaster_work> Okay, later
[15:17] <-- Uhfgood left irc: Quit: Leaving
[15:40] --> _sev|work joined #scummvm.
[15:40] <-- _sev|work left irc: Changing host
[15:40] --> _sev|work joined #scummvm.
[15:40] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[15:44] --> LittleToonCat joined #scummvm.
[15:44] <-- _sev|work left irc: Client Quit
[15:54] <dreammaster_work> GOG has just added the pre-order for Full Throttle Remastered. Preorder discounts 20% for US$12 instead of US$15
[15:55] <rsn8887> I am in need of some help on the forums to create a sub-forum for the vita port. It should be similar to "PSP Port" but for Vita, e.g. name "Vita Port" description "Subforum for discussion and help with ScummVM's PSP (PlayStation Portable) port" The Moderator should be set to ScummVM Team.
[15:55] <rsn8887> Sorry description should say: Subforum for discussion and help with ScummVM's Playstation Vita port
[15:56] <dreammaster_work> Well, as from yesterday, we don't yet have an official build for Vita
[15:56] --> chadj joined #scummvm.
[15:59] <Strangerke|work> rsn8887: I'm waiting for _sev to be available, I'll do that right after we talk about it. Or at home (I'm not sure I have the credentials at work)
[15:59] <rsn8887> Strangerke|work: Awesome, thanks :)
[15:59] <dreammaster_work> Hey Strangerke. Seems like our work times are overlapping :)
[16:04] <Strangerke|work> yep. And it seems you're not reading your PMs :D
[16:10] <dreammaster_work> Whoopsy :)
[16:16] <-- ajax16384 left irc: Read error: Connection reset by peer
[16:26] --> skiff2 joined #scummvm.
[16:28] <-- skiff2 left irc: Client Quit
[16:30] <enthusi> https://www.youtube.com/watch?v=nWSIYlIag6w
[16:30] <enthusi> oops
[16:30] <enthusi> unintended paste
[16:32] <Strangerke|work> enthusi: I wonder how it tastes...
[16:36] --> Joefish joined #scummvm.
[16:38] --> WooShell joined #scummvm.
[16:38] <m_kiewitz> enthusi: burn it
[16:38] --> ajax16384 joined #scummvm.
[16:38] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services.
[16:39] <WooShell> meow =^.^=
[16:39] --> ny00123 joined #scummvm.
[16:44] <enthusi> it's not my pet :)
[16:44] <enthusi> and while it is a bit embarassing to admit: it _is_ somewhat creepy
[16:46] --> Tkachov joined #scummvm.
[16:50] <-- jamm left irc: Ping timeout: 256 seconds
[16:51] <_sev> rsn8887: done
[16:58] <rsn8887> _sev: Thanks I updated the wiki platform page to link to it :) I would prefer it called by its correct name "Playstation Vita" in the description and "Vita Port" as the short title to distinguish it from the PSP
[16:59] <_sev> rsn8887: fixed
[17:12] <-- cpasjuste left irc: Quit: ZNC 1.6.3+deb1 - http://znc.in
[17:18] --> Littleboy joined #scummvm.
[17:18] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services.
[17:21] --> _sev|work joined #scummvm.
[17:21] <-- _sev|work left irc: Changing host
[17:21] --> _sev|work joined #scummvm.
[17:21] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[17:27] <-- _sev|work left irc: Quit: This computer has gone to sleep
[17:28] --> shivamg202 joined #scummvm.
[17:29] --> Farmboy0 joined #scummvm.
[17:29] <-- Farmboy0 left irc: Changing host
[17:29] --> Farmboy0 joined #scummvm.
[17:29] <-- _sev left irc: Quit: This computer has gone to sleep
[17:32] <-- Tkachov_ left irc: Quit: Leaving
[17:35] <shivamg202> Hi, I am shivam gupta, an undergrad student. As a part of GSoC '17, I would like to contribute to ScummVM's project of Adding text-to-speech support in Mortville Manor. Can I get a little more information about the project and what is expected from the student to undertake this project?
[17:39] <-- shivamg202 left irc: Quit: Page closed
[17:39] --> shivamg202 joined #scummvm.
[17:44] <m_kiewitz> wjp: ^^^
[17:45] <Strangerke|work> shivamg202: The idea is to select a reasonably text to speech library, with some languages supported (let's say at least English, French and German for the specific needs of Mortville Manor), make sure it's an optional library because all the users won't use it, then use it to generate speech in the game. The sentences are all there in plain French/German/English
[17:46] <Strangerke|work> shivamg202: the library will have to be as portable as possible, because ScummVM is highly portable. So windows-only or mac-only solutions won't be accepted
[17:47] <Strangerke|work> I have to leave now, but I should be back in a couple of hours
[17:47] <Strangerke|work> my mail is strangerke<at>scummvm<dot>org
[17:47] <-- Strangerke|work left irc: Quit: Bbl
[17:47] <shivamg202> ok. thanks
[18:05] <-- shivamg202 left irc: Quit: Page closed
[18:49] <-- waltervn2 left irc: Ping timeout: 240 seconds
[18:51] --> Strangerke joined #scummvm.
[19:00] --> Vampire0_ joined #scummvm.
[19:01] <-- Vampire0 left irc: Ping timeout: 260 seconds
[19:02] <-- dreammaster_work left irc:
[19:04] Nick change: Vampire0_ -> Vampire0
[19:32] --> Mellified_Man_ joined #scummvm.
[19:33] <-- Mellified_Man left irc: Read error: Connection reset by peer
[19:34] <-- Mellified_Man_ left irc: Read error: Connection reset by peer
[19:34] --> Mellified_Man joined #scummvm.
[19:36] <-- ajax16384 left irc: Quit: Leaving
[19:43] --> ajax16384 joined #scummvm.
[19:43] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services.
[19:44] --> girafe joined #scummvm.
[19:55] <rsn8887> Where are the ScummVM credits pulled from?
[19:56] <rsn8887> I mean the ones that show in game?
[19:56] <rsn8887> I mean in about menu
[19:58] <criezy> Good evening
[19:58] <criezy> rsn8887: from devtools/credits.pl
[19:59] <rsn8887> criezy: Hello. Has to be real name I gather?
[20:00] <rsn8887> cirezy: Idk Cpasjuste's real name... Will ask him if he wants it in there.
[20:01] <criezy> You can have a look at http://www.scummvm.org/credits/ (it's pulled from the same file). I think there might be a few entries where we dom't have the real name. But usually yes, we use real name and optionaly the nickname.
[20:01] --> t0by joined #scummvm.
[20:01] <-- t0by left irc: Changing host
[20:01] --> t0by joined #scummvm.
[20:01] #scummvm: mode change '+v t0by' by ChanServ!ChanServ@services.
[20:02] <rsn8887> Criezy: I see it works, it automatically puts ???
[20:02] <rsn8887> Criezy: I would like to create a Vita Port credit and put Cpasjuste and rsn8887 both under there (for now without real name)
[20:04] <criezy> Edit the file and then you can run 'make credits' to generate the various credits files (for the about dialog, AUTHORS file and the web site).
[20:05] <criezy> You will want to add it under the "Backend Teams" section.
[20:06] <rsn8887> Criezy: Ok will do.
[20:08] <rsn8887> Criezy: Shall I just push or make a PR?
[20:11] <-- bgK left irc: Ping timeout: 240 seconds
[20:13] <criezy> Unless you have a doubt you can push directly.
[20:14] <criezy> There should be three modified files in the scummvm repo (AUTHORS, gui/credits.h and devtools/credits.pl)
[20:14] <criezy> And one file in the scummvm-web repo but I can update that one after you have pushed the credits.pl update if needed.
[20:15] --> GitHub197 joined #scummvm.
[20:15] <GitHub197> [scummvm] rsn8887 opened pull request #922: PSP2: Add credits for Vita port (master...vita_credit) https://git.io/vy1yV
[20:15] GitHub197 (GitHub197@192.30.252.42) left #scummvm.
[20:16] <rsn8887> Criezy: I made a PR to make sure Travis build succeeds. Then I will merge it. Remind me again how to correctly merge my "single commit" PR? "Create Merge Commit", "Squash and Merge" or "Rebase and Merge"?
[20:17] <wjp> again, "single commit" has very little to do with how to merge it
[20:17] <joostp> PlayStation should have a capital 'S'
[20:18] <criezy> Rebase and merge. To use sparingly (and yes, not related to single commit vs. multiple commits). But in this case it should be fine.
[20:20] <rsn8887> joostp: Fixed.
[20:20] <rsn8887> joostp: Will need to fix that on wiki and everywhere else too
[20:21] --> bgK joined #scummvm.
[20:21] #scummvm: mode change '+o bgK' by ChanServ!ChanServ@services.
[20:24] <rsn8887> joostp: fixed PlayStation spelling on wiki. I cannot change the spelling on sub-forum. Maybe someone else can quickly go in and fix that? Thanks?
[20:24] <rsn8887> Thanks!
[20:26] <rsn8887> criezy: I am afraid of rebase and merge. But I will do it then.
[20:26] <logix> joostp: haha, I actually was wondering about that myself earlier but didn't bother to look up and verify
[20:28] <rsn8887> I will wait for the Travis checks and then do "rebase and merge"
[20:28] <rsn8887> I am running out of Vita related things to do. That's probably a good thing :)
[20:30] <rsn8887> criezy: I have seen rebase create "unpredictable" results, e.g. wrong code with duplicated sections etc. I think it is an artefact of automated merge trying to "guess" what I want, but now I don't trust it anymore.
[20:31] <criezy> You can push directly from your local repo instead of using the PR to push. That way you have more control on what happens.
[20:39] <snover> the only time i have ever seen a rebase problem is when conflicts are incorrectly manually changed
[20:41] <rsn8887> I might have made a manual mistake, but I was very certain that an automatic merge resulted in "incorrect" code, where a few lines of code suddenly appeared duplicated, causing a crash. I was quite surprised to see it myself.
[20:41] <rsn8887> At the time. Now I can not exclude manual error, because there were quite a few merge conflicts I had to resolve manually...
[20:45] <rsn8887> Anyways, I think I got the hang of git and github now. But now without trial-by-fire via "Did I lose everything?" reflog gymnastics. Git certainly does NOT save everything and does NOT let you undo all changes.
[20:45] <rsn8887> now->not
[20:46] <rsn8887> If it wasn't for reflog I would have probably smashed my laptop a few months ago.
[20:51] --> GitHub163 joined #scummvm.
[20:51] <GitHub163> [scummvm] bluegr pushed 2 new commits to master: https://git.io/vy15Y
[20:51] <GitHub163> scummvm/master 7ccc55d Filippos Karapetis: CHEWY: Properly clip drawn text
[20:51] <GitHub163> scummvm/master 87cac81 Filippos Karapetis: CHEWY: More work on room-specific animations. Some cleanup
[20:51] GitHub163 (GitHub163@192.30.252.45) left #scummvm.
[20:53] <rsn8887> Now I have gotten used to the basics: Always "git branch backupxxx" before doing anything suspicious, only rebase a few commits around seven or so max, read each command twice before executing (especially if it is a reset --hard)
[20:54] <rsn8887> and most important always use git status to check which branch I am working on. Easy mistake to do a whole bunch of work on the wrong branch
[21:04] <t0by> rsn8887, you know about git reflog, right?
[21:04] <t0by> (not that backupxxx is a bad idea, but if you forget to do it...)
[21:07] --> GitHub137 joined #scummvm.
[21:07] <GitHub137> [scummvm] bluegr pushed 1 new commit to master: https://git.io/vy1Fh
[21:07] <GitHub137> scummvm/master 3b962c9 Filippos Karapetis: CHEWY: Read automove scene data
[21:07] GitHub137 (GitHub137@192.30.252.34) left #scummvm.
[21:09] <rsn8887> I do, but there was a time I didn't.
[21:13] --> SylvainTV joined #scummvm.
[21:13] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[21:14] <-- vinayakvivek left irc: Quit: Connection closed for inactivity
[21:29] <-- ajax16384 left irc: Read error: Connection reset by peer
[21:31] <-- WooShell 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:33] --> dreammaster joined #scummvm.
[21:33] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[21:37] <rsn8887> BTW should one be worried about all the compiler warnings on the buildbot such as shifting negative values etc?
[21:40] --> WooShell joined #scummvm.
[21:45] <-- ny00123 left irc: Quit: Leaving
[21:51] <-- TMM left irc: Quit: Ex-Chat
[21:56] --> TMM joined #scummvm.
[21:56] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services.
[22:05] <snover> rsn8887: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh will show you what the current git branch is on your command line
[22:05] <snover> among other things
[22:05] <snover> its very helpful to avoid accidentally working in the wrong branch
[22:11] --> _sev|work joined #scummvm.
[22:11] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[22:16] <-- waltervn left irc: Quit: Leaving
[22:17] <-- _sev|work left irc: Ping timeout: 240 seconds
[22:18] <rsn8887> snover: Nice I will try it out. It has become better since I started using atom.io because it shows the branch in the editor
[22:18] <rsn8887> I *really* like atom although never thought I would dig a >200 MB text editor written in JS :)
[22:20] <snover> i hope its better than it used to be.
[22:21] <logix> it's just 20000 times larger than e3, no problem
[22:34] <m_kiewitz> true devs use edlin (7k) :P
[22:36] <dreammaster> Bah. True devs use a magnetized needle and a steady hand to directly modify the hard disk platters
[22:36] <dreammaster> Ah, yes.. https://xkcd.com/378/
[22:39] <logix> m_kiewitz: edlin... that's a name I've not heard in a long time
[22:41] <Deledrius> That's a name I wished I would never hear again.
[22:47] <rsn8887> After ditching emacs (thank god), I used Notepad++ in Windows for a while, then Textwrangler on OSX, now Atom. Definitely atom is the best of the bunch IMO
[22:52] <-- ced117 left irc: Quit: leaving
[22:55] <-- Farmboy0 left irc: Remote host closed the connection
[22:59] --> ced117 joined #scummvm.
[23:01] <-- dreammaster left irc:

[23:17] <-- t0by left irc: Ping timeout: 240 seconds
[23:21] <-- WooShell 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.
[00:00] --- Wed Mar 15 2017