Import features from PS and PS+

[david-pfx]

Just a tagline to open a topic for discussion. Obviously needs careful thought and selection, but mouse has got to be up there.

Is merging from PS now beyond possible, or is all manual imports?

[ClementSparrow]

I moved the files in a different directory, so that alone would break merging. We could still use diff/merge tools but the commands would have to be issued manually or through a script, and considering the amount of changes that I have done in the code it's probably not worth it, and faster to manually merge the files.

But to be honest, the biggest part of the work seems to me to be the selection of the commits/PR that should be merged. A lot of the recent commits in PS concern things that do not need to be merged in P:S, either because they concern a feature that has been discontinued in P:S like the games gallery, or because they are fixes of bugs that do not exist in P:S.

Maybe we can start with a list of features/commits that we want to see merged in P:S ?

[david-pfx]

You did a bit more than that I think! You've put a lot of work into this.

My aim is to to reach a position where users see exactly two versions of PS, Starter and Next (serious game writer). Starter is PS, which is unlikely to change much. Next is a strict superset of Starter; passes the PS tests and looks familiar but better.

If Next is based on P:S then the merge is of features, not necessarily code, from both PS and PS+. Your code is in better shape, but PS+ has more features. It needs to run games and tests from both, with no or minimal changes.

This discussion might work better on Discord?