<div dir="ltr">The correct repo URL is <a href="https://github.com/aquadran/scummvm/tree/merge-review1">https://github.com/aquadran/scummvm/tree/merge-review1</a><div><br></div><div><br></div><div>Eugene</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, 8 Oct 2020 at 23:45, Eugene Sandulenko <<a href="mailto:sev@scummvm.org">sev@scummvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hi Team,<div><br></div><div>Just as I recently mentioned on Discord, we are merging with ResidualVM project.</div><div><br></div><div>Pawel Kolodziejski aka aquadran, was working for the last month on the technical parts of the merger, and now we are fully prepared to do it.</div><div><br></div><div>When: Tomorrow, 09.10.2020 in the evening. There will be an R/O access to our repo for a couple of hours.</div><div><br></div><div>The merge will bring 4.5 engines to ScummVM: GrimE (Grim Fandango and Moneky4), In Cold Blood, Myst3, Stark engine for The Longest Journey, and .5 engine is Wintermute3D, this year GSoC project.</div><div><br></div><div>Technically, we are adding a graphics3d modular backend (and temporary android3d, pending for a deeper merger), and "<span style="color:rgb(36,41,46);font-family:SFMono-Regular,Consolas,"Liberation Mono",Menlo,monospace;font-size:12px;white-space:pre-wrap">opengl_shaders</span>" engine dependency. The configure script is modified to check for an OpenGL presence and enables relevant backends. Alternatively, there is a software renderer.</div><div><br></div><div>Also, we are getting math/, graphics/opengl and graphics/tinygl and some individual files here and there to various common directories.</div><div><br></div><div>The projects were running in a tight sync, with ResidualVM team regularly pulling all of our OSystem changes, thus, the differences are relatively small.</div><div><br></div><div>We are also bringing ALL GIT HISTORY of ResidualVM to our repo, so we will have 2 roots. This will allow for easy bisecting for both teams, as there will be only a single commit to merge two histories.</div><div><br></div><div>You may take a look at the test repo here: <a href="https://github.com/aquadran/scummvm/merge-review1/" target="_blank">https://github.com/aquadran/scummvm/merge-review1/</a></div><div><br></div><div>There will be some more work on the merger after it lands in our repo, for instance, cleaning up some comments, the above mentioned Android port and perhaps something else we do not see yet.<br></div><div><br></div><div>Of course, both teams merge, though the few of ResidualVM team members were in both teams anyway.</div><div><br></div><div><br></div><div>Yay,</div><div>Eugene & Pawel</div><div><br></div></div>
</blockquote></div>