Release/3.10 to master #1772
Merged
Release/3.10 to master #1772
Conversation
This file contains hidden or 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
… Unity Native File Picker Plugin instead of StandaloneFileBrowser.
…ction since other plugin is for android ios only.
… from PowerShell build script.
Android Zip Import, Build Pipeline Improvements & Website Optimization
Added additional error handling for SaveManager
# Conflicts: # .gitignore # unity/Assets/StreamingAssets/text/Localization.Chinese.txt # unity/Assets/StreamingAssets/text/Localization.Czech.txt # unity/Assets/StreamingAssets/text/Localization.English.txt # unity/Assets/StreamingAssets/text/Localization.French.txt # unity/Assets/StreamingAssets/text/Localization.German.txt # unity/Assets/StreamingAssets/text/Localization.Italian.txt # unity/Assets/StreamingAssets/text/Localization.Japanese.txt # unity/Assets/StreamingAssets/text/Localization.Korean.txt # unity/Assets/StreamingAssets/text/Localization.Polish.txt # unity/Assets/StreamingAssets/text/Localization.Portuguese.txt # unity/Assets/StreamingAssets/text/Localization.Russian.txt # unity/Assets/StreamingAssets/text/Localization.Spanish.txt
Feature/1759 change resolution
Replaced `Start-Process -Wait` with `$Process.WaitForExit()` in [build.ps1](cci:7://file:///e:/Eigene%20Dokumente/Max/Programmierung/Projekte/valkyrie/build.ps1:0:0-0:0). The previous method waited for the entire process tree, causing the build to hang for 10 minutes due to lingering `VBCSCompiler.exe` processes spawned by Unity.
The [QuestGetTranslations](cci:1://file:///e:/Eigene%20Dokumente/Max/Programmierung/Projekte/valkyrie/unity/Assets/Scripts/UI/Screens/QuestSelectionScreen.cs:1023:8-1055:9) method had a logic error where the result of `TryGetValue` for the synopsis was negated (`!`). This caused the code to believe the translation was NOT found when it actually WAS found, ensuring the fallback to the default language always executed. This commit removes the incorrect negation, allowing local translations to be used when available.
…d issues in czech translation.
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.
No description provided.