No commit history from upstream

[sigboe]

Could you maybe rebase on upstream and apply your commits again so we get full commit history? I think if you made a new branch, rebased the branch on upstream, and cherry picked your commits. Then force pushed it into master, you would have done it successfully, restoring lost history, for the benefit of mankind.

Benefits:

• Due credit to the 35+ developers that spent a combined 6000+ hours to make this port possible.
• It's easier to maintain your port, rebasing on upstream, or cherrypicking commits later
• It's easier to fork your port, lets say by someone who wants to port it to another console.
• It's easier to study your source to learn from it.
• Quite sad to delete history, even if it was by accident.
• Easier to upstream your changes while fully attributing your contribution to in the commit history.

[AJenbo]

Also:

• Restore credit to the 35+ developers that spent a combined 6000+ hours to make this port possible.

It's the little things that count :)

P.s. regarding upstreaming the code, on the Diasurgical Discord channel, we have been talking about how to coordinate upstreaming the controller code and eventually the port. Some of it will be in the form of code clean up in this repo as far as getting the code more cross-platform and solving issues that affect the switch port as is. Once that is done we will see what is left and how best to proceed.

[AJenbo]

It appears that the branching point was https://github.com/diasurgical/devilutionX/commit/e6f4e216319a7f9b867092d777691a79550c9e22, some this commit there are only 62+/702- lines of difference to f21751373d43afb542dc4580e882c123cdbe5715 (the original commit in this repo). Most of the changes consist of stripping the code from the network layer. This can be done less invasively by referencing this commit instead: https://github.com/diasurgical/devilutionX/commit/c998dfdbfb4aff6dd221b5b0838d019605982747 (from the nonet branch)

[AJenbo]

I have now rebased the devilution-nx fork on upstream master the PR can be found here: https://github.com/diasurgical/devilutionX/pull/181 Note that several outstanding issues still have to be addressed before the code is ready for merge upstream, but at least it is now clear what has been changed, and this brings some fixes to the Nintendo Switch code if you build from that branch.

[AJenbo]

The port has now been fully upstreamed, here are some of the fixes that has been made:

• All code now matches the original Diablo (fixing a few in game bugs)
• Fix save game compatibility
• All builds are now automatically compiled for the switch via CircleCI
• Fix zooming in the minimap for some keyboards
• Correct directional sounds
• Fix multiplayer bug
• Fix crash in town with some compilers
• Correct crash when exiting menu
• Error messages implemented in GUI
• Much lower CPU usage
• Unlocked FPS (vsync instead of 20)
• Many bug fixes in the controller implementation
• More responsive controller
• Highlight both primary and secondary target
• Improved spell targeting when using a controller

@lantus please change this repo into a propper GitHub fork so that we can get credit and easily merge future improments.

(Automatic widescreen support is just around the corner)

[AJenbo]

We have enow release 1.1.0 upstream, this includes widescreen support which looks pretty great on the Switch I'm told :) https://github.com/diasurgical/devilutionX/releases