This repository has been archived by the owner on Dec 20, 2021. It is now read-only.
Backmerge master into ecs #1023
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
code-cleanup: rgbaColor & terminal
HelpOverlay's text
Update Ebiten to v2.0.2
readme update: screen shots and status
Add-skill buttons
… highlighted, when animation is playing & fixed highlight bug
Fiddling with actions names
Fix yaml errors
Yet another yaml fix
Removed improper ebiten dependency in d2interface.
…ory Panel). This is to avoid Entity Labels to be renderd above the Inventory Panel. Fixes OpenDiablo2#936
TBH there some to be some other overcomplicated things going on in DCCAnimation but too tired to use brain right now.
…ventory_fix Render HUD before Panels
This DCC frame size calculation seems useless
bugfix: file_handle_resolver
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: M. Sz <mszeptuch@protonmail.com> Co-authored-by: gravestench <dknuth0101@gmail.com>
…enDiablo2#997) Co-authored-by: M. Sz <mszeptuch@protonmail.com> Co-authored-by: gravestench <dknuth0101@gmail.com>
* d2ui.Frame refactor * removed unneccessery d2asset.AssetManager argument from d2ui.NewUIFrame * d2ui.Frame refactor * removed unneccessery d2asset.AssetManager argument from d2ui.NewUIFrame Co-authored-by: M. Sz <mszeptuch@protonmail.com> Co-authored-by: Tim Sarbin <tim.sarbin@gmail.com> Co-authored-by: gravestench <dknuth0101@gmail.com>
* d2mpq refactor * d2mpq refactor last standing lint error * d2mpq refactor: less linter noise * d2mpq refactor: more linter issues
|
we'll see how this goes... |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backmerging master into ecs to get recent changes from master into the ecs branch, e.g. the MPQ refactor
In addition to getting the git log from the master branch into the ecs branch, this fixes some merge conflicts between the two, or in other words, resolves some issues that arose from the master branch diverging so far from the ecs branch.
(feel free to close if a better solution for this is found) (do not squash!)