Rolling Dev/2.6 into master #1646
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
…nly includes MoM BASE items.
…d on AssetStudio code.
…d by AssetStudio.
…rdcoding the year
* Added asset importing from Mansions of Madness App version 1.9.3 based on AssetStudio code. * Fix for a handful of textures being missed during import. * Fixed localisation text problem with new importing code. * Removed Unity_Studio as its functionality has been completely replaced by AssetStudio. * Changing UnityEngine.dll path back to windows default * Changing UnityEngine.dll path back to windows default * Remove accidental < * Update build script to point to newer msbuild * Updating build script so it can find visual studio install without hardcoding the year * Adding comment on finding the path to visual studio in the build script * Automatically install nuget external dependencies for libraries in the build script.
…mport was broken due to the installation paths having changed.
Stopped importing assets multiple times.
…com/seinsinnes/valkyrie into dev/FixImportFromMoM_1.9.3onAndroid
…com/seinsinnes/valkyrie into dev/FixImportFromMoM_1.9.3onAndroid
Fix problem permission request sometimes doesn't get registered properly.
…com/seinsinnes/valkyrie into dev/FixImportFromMoM_1.9.3onAndroid
…Android Fixed import from MoM 1.9.3 on android.
Feature/item icons as tokens
Update Localization.Russian.txt
Hopefully removes the "No such file or directory" failures when during the data copy so that the underlying problem can be logged.
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.
Merging the changes for v2.6.0 in the master branch.
Change list
New
#1602 Work around for security restrictions in Android 11+ (and particularly Android 13) when importing assets (from MoM official app and Descent official app).
Bugfix
#1597 Item icons for Mansions of Madness content has been included for HJ, SOA, SOT, BTT and POTS expansions.
#1597 Fixed an issue localization for spanish language for some token icon filters.
#1585 Localization for russian language has been improved.
#1514, #1620, #1619, #1611, #1605, #1602, #1588 Fixed importing assets from MoM official app version 1.9+.