[Scummvm-devel] Merger with ResidualVM

[Eugene Sandulenko]

The correct repo URL is
https://github.com/aquadran/scummvm/tree/merge-review1


Eugene

On Thu, 8 Oct 2020 at 23:45, Eugene Sandulenko <sev at scummvm.org> wrote:

> Hi Team,
>
> Just as I recently mentioned on Discord, we are merging with ResidualVM
> project.
>
> 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.
>
> When: Tomorrow, 09.10.2020 in the evening. There will be an R/O access to
> our repo for a couple of hours.
>
> 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.
>
> Technically, we are adding a graphics3d modular backend (and temporary
> android3d, pending for a deeper merger), and "opengl_shaders" engine
> dependency. The configure script is modified to check for an OpenGL
> presence and enables relevant backends. Alternatively, there is a software
> renderer.
>
> Also, we are getting math/, graphics/opengl and graphics/tinygl and some
> individual files here and there to various common directories.
>
> The projects were running in a tight sync, with ResidualVM team regularly
> pulling all of our OSystem changes, thus, the differences are relatively
> small.
>
> 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.
>
> You may take a look at the test repo here:
> https://github.com/aquadran/scummvm/merge-review1/
>
> 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.
>
> Of course, both teams merge, though the few of ResidualVM team members
> were in both teams anyway.
>
>
> Yay,
> Eugene & Pawel
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20201008/1272ae4f/attachment.htm>