Merge recent changes from master into the 4.0-dev branch #730
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
This demo intends to showcase what Godot can do in terms of supporting multiple resolutions and aspect ratios.
This makes for easier visual grepping after importing all demos in the project manager.
Tweak Multiplayer Pong demo icons to be different from singleplayer
Add a demo on supporting multiple resolutions and aspect ratios
There is a problem with the automatically exported HTML5 demos. When they use json files for dialogue by example, as in the JRPG demo, the game gets errors as it can't load those specific *.json files. Update export_presets.cfg
Including *.json files to fix #725
Calinou
approved these changes
May 2, 2022
|
I'll probably look into porting Multiple Resolutions to Edit: Done in #733. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There have been a few changes on master since 4.0-dev split off, most notably the addition of the multiple resolutions demo. Thankfully none of these changes cause conflicts, so we can merge them into the 4.0-dev branch. The actual porting of the multiple resolutions demo to Godot 4.0 isn't included in this PR (hopefully that's obvious).