Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: [UEPR-165] Merged native branch in scratch gui #216

Closed
wants to merge 103 commits into from
+5,336 −4,553
Closed

Feat: [UEPR-165] Merged native branch in scratch gui #216

Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
10f688e
Allow GUI consumer to receive a function for triggering saves.
paulkaplan Apr 19, 2019
76561b6
Remove file menu
paulkaplan Apr 19, 2019
1b9aefe
Add home to scratch logo
paulkaplan Apr 19, 2019
7cbea8a
Bring back the library loading through storage.
paulkaplan Apr 22, 2019
1de993d
WIP for library perf
paulkaplan May 7, 2019
a663182
add vm init fn
paulkaplan Jun 3, 2019
ea04d0c
Show spinner before loading library content
paulkaplan Jun 4, 2019
75602cf
Update scratch-vm to get scratch link config updates
paulkaplan Jun 6, 2019
5b19e60
Fix proptype sorting
paulkaplan Jun 7, 2019
928854c
Fixup spinner
paulkaplan Jun 7, 2019
0351d0f
Merge branch 'develop' into native
paulkaplan Jun 10, 2019
9ce5be1
Merge branch 'develop' into native
paulkaplan Jul 17, 2019
19d0a69
Merge from develop
paulkaplan Aug 1, 2019
054349e
Add onNewSpriteClick override
paulkaplan Aug 7, 2019
98e7747
Provide overrides for triggering costume and backdrop libraries
paulkaplan Aug 7, 2019
6d683d0
Merge branch 'develop' into native
paulkaplan Aug 14, 2019
3d9c2ef
Merge branch 'develop' into native
paulkaplan Aug 19, 2019
a12c358
Remove spanish gifs for now
paulkaplan Aug 21, 2019
a189324
Fix perf by avoiding defaultsDeep in mergeProps
paulkaplan Sep 5, 2019
678aa01
Emit projectDidSave for server saves, not just file exports
paulkaplan Sep 12, 2019
8b07431
Use a larger buffer size for recording to prevent glitching
paulkaplan Sep 13, 2019
3107da7
Force meter and waveform to separate paint layer
paulkaplan Sep 13, 2019
72b480a
Use single setState call instead of two
paulkaplan Sep 13, 2019
9832cf0
Merge branch 'develop' into native
paulkaplan Sep 17, 2019
19481c7
Merge branch 'develop' into native
paulkaplan Sep 26, 2019
ce6cce2
Allow Android to request a thumbnail generated on load
chrisgarrity Oct 2, 2019
b64cf80
Merge branch 'develop' into native
paulkaplan Oct 15, 2019
2d6ca11
Merge remote-tracking branch 'upstream/native' into native
paulkaplan Oct 15, 2019
6b556df
store project thumbnail after project loaded with id for android
chrisgarrity Nov 4, 2019
b33ed44
Merge branch 'native' of github.com:LLK/scratch-gui into native
paulkaplan Nov 4, 2019
05d6624
Merge branch 'develop' into native
paulkaplan Nov 4, 2019
26dd868
Merge branch 'develop' into native
paulkaplan Nov 20, 2019
a9a7f5c
Do not include src in npmignore
paulkaplan Dec 19, 2019
0f5dc4e
Merge branch 'native' into 0.1.0-prerelease.20200109172023
paulkaplan Jan 13, 2020
c2b0c10
Merge pull request #5383 from LLK/0.1.0-prerelease.20200109172023
paulkaplan Jan 13, 2020
47f9ef8
Merge pull request #5387 from LLK/0.1.0-prerelease.20200113203847
paulkaplan Jan 15, 2020
dc36717
Merge tag '0.1.0-prerelease.20200213175628' into native
paulkaplan Feb 26, 2020
2e8d854
Merge tag '0.1.0-prerelease.20200319183521' into native
chrisgarrity Mar 25, 2020
c7cfca8
Fix lint errors
chrisgarrity Mar 25, 2020
398eb57
Merge tag '0.1.0-prerelease.20200423001702' into native
chrisgarrity Apr 28, 2020
859fd31
Merge tag '0.1.0-prerelease.20200527204130' into native
chrisgarrity Jun 1, 2020
ce24356
Pull revert from VM
Jun 18, 2020
68c4c5a
Merge tag '0.1.0-prerelease.20200618175748' into native
chrisgarrity Jun 22, 2020
f481636
Merge tag '0.1.0-prerelease.20200722032238' into native
chrisgarrity Jul 22, 2020
6d66534
Handle user picked peripheral
Oct 15, 2020
eff9a11
Merge branch 'latest' into native
Nov 10, 2020
221abef
Merge branch 'native' into useCdm
Nov 10, 2020
f97c0e5
Merge pull request #6273 from fsih/useCdm
fsih Nov 14, 2020
23486df
Fix merge
Nov 19, 2020
78242f7
Merge branch 'native' of github.com:LLK/scratch-gui into native
Nov 24, 2020
060f472
bump scratch-vm for CDM support
cwillisf Dec 14, 2020
6ff76dc
Merge release 1/7/2021
Jan 8, 2021
caa4b30
Fix lint
Jan 8, 2021
6c7b980
Fix integration tests
Jan 8, 2021
dd3bbd7
Merge pull request #6553 from fsih/mergeDevelop
fsih Jan 8, 2021
837ed10
Fix audio context not starting
paulkaplan Feb 19, 2021
7630a76
Merge tag '0.1.0-prerelease.20210224115226' into native
Mar 3, 2021
7b7cb7f
Merge pull request #6851 from fsih/mergeTag
cwillisf Mar 4, 2021
6ec60aa
Merge branch 'fix-telemetry-dialog-selection' into native
cwillisf Mar 5, 2021
6c184ad
build(deps): bump scratch-paint
dependabot-preview[bot] Mar 19, 2021
b8ef333
Merge tag '0.1.0-prerelease.20210425034539' into native
cwillisf May 6, 2021
c092de2
Merge tag '0.1.0-prerelease.20210526041028' into native
cwillisf Jun 2, 2021
c3f7a8b
Merge tag '0.1.0-prerelease.20210621040041' into native
cwillisf Jun 27, 2021
ecf262a
fix lint error introduced by merging 8a774a2aa10c9209d852549d70f50ebd…
cwillisf Jun 27, 2021
00ffb1b
Merge tag '0.1.0-prerelease.20210727132145' into native
cwillisf Aug 2, 2021
17bb21d
fix BOOST & CDM combo
cwillisf Aug 25, 2021
3fb6833
explain USER_PICKED_PERIPHERAL and remove bad bind
cwillisf Sep 7, 2021
0ba1cc7
Merge pull request #7565 from cwillisf/fix-boost-cdm
cwillisf Sep 7, 2021
ac8e04e
Merge tag '0.1.0-prerelease.20210908105639' into native
cwillisf Sep 16, 2021
48bb276
add flag to enable 'CDM mode', force autoscan
cwillisf Oct 21, 2021
c93a035
allow extension to override prescan & pressbutton messages
cwillisf Oct 21, 2021
97901d9
add prescanMessage and scanMeginMessage for WeDo 2.0 and BOOST
cwillisf Oct 22, 2021
4b97ddb
Merge pull request #7745 from cwillisf/cdm-connection-flow-updates
cwillisf Oct 25, 2021
ab513b9
Merge tag '0.1.0-prerelease.20211103150403' into native
cwillisf Nov 4, 2021
3e52a4c
Merge tag '0.1.0-prerelease.20220118124756' into native
cwillisf Jan 27, 2022
4379dbb
Merge tag '0.1.0-prerelease.20220303152318' into native
cwillisf Mar 3, 2022
e7d6d9e
Merge tag 'v1.8.6' into native
cwillisf Apr 7, 2023
bc08006
ci: configure commitlint for native branch
cwillisf Apr 10, 2023
b076ef4
Merge branch 'develop' into tmp/native
Jul 10, 2023
06549c5
Merge branch 'develop' into native
Jul 27, 2023
ff31e32
Merge branch 'develop' into native
Aug 10, 2023
d149860
chore: update native branch with monorepo-integration branch
MiroslavDionisiev Jul 23, 2024
1dfd99a
chore: updated scratch-webpack-configuration and setup-node versions
MiroslavDionisiev Jul 31, 2024
dd61879
Merge pull request #9624 from MiroslavDionisiev/native-develop-merge
MiroslavDionisiev Jul 31, 2024
d6df22a
Revert "chore: updated scratch-webpack-configuration and setup-node v…
MiroslavDionisiev Jul 31, 2024
f42dbae
Revert "chore: update native branch with monorepo-integration branch"
MiroslavDionisiev Jul 31, 2024
e4eaf70
chore: merge develop in native
MiroslavDionisiev Aug 1, 2024
e0d8448
Revert "ci: reduce package size"
MiroslavDionisiev Aug 1, 2024
4285521
chore: resolve conflicts
MiroslavDionisiev Aug 1, 2024
4e35630
Merge pull request #9633 from MiroslavDionisiev/native-develop-merge
MiroslavDionisiev Aug 1, 2024
29f13d5
chore(deps): add scratch-gui#native as packages/scratch-gui
MiroslavDionisiev Aug 31, 2024
3c72884
chore(deps): add scratch-render#develop as packages/scratch-render
MiroslavDionisiev Aug 31, 2024
bf99f01
chore(deps): add scratch-svg-renderer#develop as packages/scratch-svg…
MiroslavDionisiev Aug 31, 2024
8de3aff
chore(deps): add scratch-vm#develop as packages/scratch-vm
MiroslavDionisiev Aug 31, 2024
0a369c2
chore: remove repo-level configuration and deps from packages/*
MiroslavDionisiev Aug 31, 2024
fe7c3e1
chore(deps): use workspace versions of all local packages
MiroslavDionisiev Aug 31, 2024
a46d0b3
refactor: fixed paths to work with new project structure
MiroslavDionisiev Aug 31, 2024
c2acb60
Merge pull request #14 from MiroslavDionisiev/scratch-android
MiroslavDionisiev Sep 5, 2024
f818fa8
Merge branch 'develop' into feat/uepr-165-merging-native
Bogomil-Stoyanov Mar 10, 2025
2ed8b64
fix: return inclusion of /src files
Bogomil-Stoyanov Mar 10, 2025
e90a5ca
feat: [UEPR-165] WIP fixing tutorial icons
Bogomil-Stoyanov Mar 11, 2025
5a86b0e
feat: [UEPR-165] Images in android work, broke browser images
Bogomil-Stoyanov Mar 12, 2025
ef66390
feat: [UEPR-165] Added check if android -> shows file from assets in …
Bogomil-Stoyanov Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into native
Andy O'Neill committed Aug 10, 2023
commit ff31e329a34e8e6c42c2dfd354f2d91a3bec1fa2

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.