Auroriax / PuzzleScriptPlus

Puzzlescript Plus: Open Source HTML5 Puzzle Game Engine (with lots of extra functionality)
https://auroriax.github.io/PuzzleScript/
34 stars 4 forks source link

Attempt to catch up to vanilla Puzzlescript #7

Closed Auroriax closed 2 years ago

Auroriax commented 3 years ago

I am not going to update PS+ to have all the latest vanilla Puzzlescript changes (vanilla puzzlescript is at v1.7 while PS+ is at v1.6). The reason for this is that I simply expect a lot of merge conflicts and resulting bugs in the engine, as most forks PS+ uses also fork from version 1.6. The update is certainly possible, but it will take a significant amount of effort to pull it off, which is why I'm considering it out of scope for now.

However, there have been a couple of nice changes made there that I actually want to have in PS+:

I should make sure to cherry pick these. I should probably also document these in case it ever becomes relevant.

Auroriax commented 3 years ago

To add:

And at the very least create a pull request that attempts to merge the new vanilla puzzlescript changes so I can get an idea of how much work merging it all is going to be. (Because I hope I'm overestimating how much work it's gonna be.)

Auroriax commented 3 years ago

I have attempted to do the entire merge using https://github.com/mhagger/git-imerge, however I've done a lot of merges and it resulted in actually very little progress.

So for now I'll probably pick commits from increpare that have important features I want to have, then slowly merge my way up until I've caught up. As a first experiment I've taken the improved font into the better-font branch. I kinda like this approach and it doesn't break Puzzlescript too much, so it seems likely that I'll continue doing this until I'm caught up or it becomes unworkable. Getting the new font into the live version of PS+ is my first priority!

(Note to self: figure out how to compile puzzlescript & what the new way it to produce the standalone file before pushing the new font live!)

Auroriax commented 3 years ago

Managed to get it merged up to fee84ae9856b376f6584680063e10868b2838aeb which is nice (integrating the improved GIF recorder & better font, only 137 commits behind now!). But I ran into problems when putting the changes live on the repository, causing it to be down for ~20 minutes before I restored the old version.

Issues and thoughts:

It doesn't seem that I'll be able to update the version hosted on https://auroriax.github.io/Puzzlescript until most of these issues are resolved. (And in general, I need to do more QA on the merges I've done so far.) If you'd like to check out the changes in the meanwhile, consider doing a checkout on master and hosting the website locally on your computer.

Auroriax commented 3 years ago

I set up a repo for the compiled version of PS+, so my current progress for this new version is currently up at https://auroriax.github.io/PuzzlescriptCompiled/ if you'd like to try it, do note it hasn't been tested extensively yet. (Probably temporarily, my idea is once the merging is completely finished, to rename this repositiory PuzzlescriptPlus and the compiled repo Puzzlescript to "redirect" the links to the compiled repo, then disable hosting on this repo.)

Auroriax commented 3 years ago

Merged in unfocus-pause, now only 87 commits behind! It's now up to commit 95b7086 that fixed the unfocus pause bug. Updated the compiled version at https://auroriax.github.io/PuzzlescriptCompiled/.

Probably the next goal is to get the visual debugger in (seems to be added in bb71236460280a61dca0a9b15f268b6fd4184124 ?), after that I'll need to do some extra QA (and attempt to get the test suite working because it would be really handy!)

Also, small note to self: Double check if all my fixes for old things are still in, and weren't overwritten by merges (such as 1f75adf471f6e72e3b4cef4aee0dd53e8d7d3681 etc).

Auroriax commented 2 years ago

Finally making some progress again with this—visual debugger (increpare#78) is in and works, but I'm pretty sure there are still a couple of commits after it that fix some of the functionality broken in that update (e.g. increpare#733). So I'll probably get around to merging in most (if not all) of the commits & catch up to vanilla Puzzlescript. (I'm probably going to do this before fixing PS+ bugs or adding new functionality, though.)

I'll also need to update the live versions of PS+ though, preferably as soon as the engine is stable again so people can test. (I set up the repo https://github.com/Auroriax/PuzzlescriptCompiled to host the compiled/bin version on Github Pages. It's not in use yet, but the idea is to name that repository PuzzleScript and this repository PuzzlescriptPlus to prevent any game links from breaking.)

Auroriax commented 2 years ago

Finally DONE!