Feat/uepr 164 merge scratch desktop into develop #238
Conversation
At some point these things will be changed / disabled / removed in master or develop; at that point this change should be replaced with the more official approach.
…ages-through-storage" This brings "Load library images through storage" back into the `scratch-desktop` branch since it's necessary here. We need to figure out some performance details before trying to merge it into `develop` though.
Go back to `scratch-storage` version 1.3.1 in the `scratch-desktop` branch so that we have the performance improvements from scratchfoundation/scratch-storage#83 If I understand correctly we reverted from 1.3.1 to 1.2.2 because of problems affecting HTTP saves, which are not available in Scratch Desktop. This reverts commit b5a9c18, reversing changes made to e91c32a.
[hotfix] Add Marian sprite and costumes
This is necessary for the current scratch-desktop build process but when we merge this branch into develop we should revert this change.
`getItemIcons` (formerly `getItemImageSource`) now handles the current library formats as well as upcoming library changes in which library items will no longer have a `json` property. Or, at least, it should work... As part of that effort, `getItemIcons` now handles library items with single or multiple icons internally, meaning that the caller no longer needs to do extra work to check. Likewise, the `LibraryItem` container now has just one `iconSource` property instead of an `icon` property for the one-icon case and an `icons` property for the multi-icon case. The LibraryItem component (not container) still only takes one icon, and the container is still responsible for managing icon rotation.
Co-Authored-By: apple502j <[email protected]>
Co-authored-by: adroitwhiz <[email protected]>
Includes new people sprites from #5731
fix costume animation in sprite library
feat: [UEPR-176] add logic for triggering feedback from editor
…-affects-editor [IPR-350] Added no-global-reset to modal component
…rge-scratch-desktop-into-develop
KManolov3
changed the base branch from
develop
to
feat/uepr-165-merge-native-into-develop-with-platform
|
I have read the CLA Document and I hereby sign the CLA 3 out of 7 committers have signed the CLA. |
Resolves
https://scratchfoundation.atlassian.net/browse/UEPR-164
Proposed Changes
Merge changes from the branch containing merged native and develop branches. Conditionalize logic where necessary to preserve behaviour on the three platforms.
Reason for Changes
Another step towards the end goal of having a single published package, from which all three platform specific apps - www, scratch-desktop and native - use GUI.