Commit Graph
2375 Commits
Author SHA1 Message Date
chrisgarrity a3392bcb8d Export new GUI
scratch-gui exports `index.js` instead of just GUI container.
2018-05-21 16:54:19 -04:00
chrisgarrity 5e51235ffa Remove unneeded code
Since compatibility-testing got switched to use the player mode, it doesn’t need any of the stage/controls components.
2018-05-21 16:54:19 -04:00
chrisgarrity 44c76e5774 Combine GUI reducers
* Export initial states for each reducer
* combine all gui reducers (excludes scratchPaint and intl)
* combine all initial states to create default guiState for preloading in www
* expect all of the gui state to be accessible at `state.scratchGui`
2018-05-21 16:54:19 -04:00
chrisgarrity c182c75c6e Move creating the store into playground examples
GUI will export a reducer to be included in the enclosing component’s redux when GUI is used as a library. The app-state-hoc is moved into the playground examples to provide a store when GUI is being used stand-alone.
2018-05-21 16:51:38 -04:00
DD Liu 59e6e1d15e Merge pull request #2117 from fsih/updateDeps
Pull in optional quirks mode changes
2018-05-21 16:48:28 -04:00
DD 43a2972622 Pull in optional quirks mode chnages' 2018-05-21 16:32:27 -04:00
DD Liu bd48a3754f Merge pull request #2111 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180521172423
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-05-21 14:05:27 -04:00
greenkeeper[bot] 33175cb2b2 chore(package): update scratch-paint to version 0.2.0-prerelease.20180521172423
Closes #1949
2018-05-21 17:24:44 +00:00
Paul Kaplan 4b10ec3d2e Merge pull request #2102 from paulkaplan/monitor-flicker
Fix several minor monitor issues from recent testing
2018-05-21 12:08:04 -04:00
Paul Kaplan 6dfc10e9e1 Merge pull request #2107 from paulkaplan/fix-field-showing
Hide field editors when a modal is shown
2018-05-21 11:23:27 -04:00
Paul Kaplan 200332be96 Do not set transforms at scale: 1, fixing the context menu. 2018-05-21 11:17:11 -04:00
Paul Kaplan 0d399e3887 Disable context menu for monitors in fullscreen mode 2018-05-21 11:16:52 -04:00
Ray Schamp 7912c9a4ee Merge pull request #2104 from LLK/smoke
Smoke test branch -> Develop
2018-05-21 10:25:41 -04:00
Paul Kaplan 4ab312a10b Hide field editors when a modal is shown 2018-05-21 10:25:09 -04:00
Ray Schamp d41ad0d98e Merge pull request #2103 from LLK/hide-paint-font
Update scratch-paint to hide font dropdown
2018-05-21 10:05:32 -04:00
Ray Schamp 9ff80d7d77 Update scratch-paint to hide font dropdown
This is temporary for the release to master
2018-05-21 10:05:02 -04:00
Paul Kaplan be076e0f82 Disable double click to change monitor mode in fullscreen mode 2018-05-21 09:45:59 -04:00
Paul Kaplan 6697002bab Fix slider monitor flickering on safari 2018-05-21 09:43:56 -04:00
Paul Kaplan 24ffa168c6 Remove old todo comment 2018-05-21 09:31:34 -04:00
Paul Kaplan dc5037a4bd Make list monitor remove button reachable and fix overlapping 2018-05-21 09:31:22 -04:00
Paul Kaplan 28e1a4ae05 Make list monitor input full width 2018-05-21 09:29:27 -04:00
Paul Kaplan f3598669fa Make slider monitor full width 2018-05-21 09:29:03 -04:00
Ray Schamp 00c8b6f901 Merge pull request #1987 from rschamp/npm-develop
Publish develop builds to NPM
2018-05-18 11:20:08 -04:00
DD Liu 775d7cc9aa Merge pull request #2093 from fsih/updateFontTool
Update scratch paint
2018-05-17 16:53:40 -04:00
DD 6514844c3f Merge branch 'develop' into updateFontTool 2018-05-17 16:43:29 -04:00
DD 9965d0e1d0 Update scratch paint 2018-05-17 16:37:52 -04:00
Andrew Sliwinski 3642c2b827 Merge pull request #2081 from thisandagain/bugfix/1423
Add missing vector sprites and costumes to libraries
2018-05-17 16:23:40 -04:00
Andrew Sliwinski 0d78411d05 Additional changes from feedback 2018-05-17 16:15:03 -04:00
Andrew Sliwinski f1259db598 Additional changes from feedback 2018-05-17 16:12:57 -04:00
Eric Rosenbaum 3824aaa925 Merge pull request #2084 from LLK/ericrosenbaum-patch-1
Update scratch-blocks (flyout bottom padding)
2018-05-17 11:01:45 -04:00
Eric Rosenbaum b8271ac87f update scratch-blocks (flyout bottom padding) 2018-05-17 09:45:19 -04:00
Ray Schamp ed8b996498 Merge pull request #2082 from paulkaplan/fix-monitor-scaling
Fix monitor scaling, positioning and draggability in fullscreen mode
2018-05-17 09:13:39 -04:00
Paul Kaplan 88d36d3f5c Make monitors not draggable in fullscreen or player mode.
Specifically in 2.0:
- Monitors cannot be dragged in fullscreen/player
- List monitors cannot be resized, have items added using the button or have their values edited.
- Slider monitors still work.
2018-05-16 13:55:13 -04:00
Paul Kaplan 5d0fe72f8b Make monitors position correctly in fullscreen 2018-05-16 13:55:13 -04:00
Paul Kaplan f62e426641 Wrap the monitor list in a CSS scale transform 2018-05-16 13:55:13 -04:00
Andrew Sliwinski dd9924a11d Add missing vector sprites and costumes to libraries. Resolves GH-1423 2018-05-16 11:29:19 -04:00
chrisgarrity d7430001b1 Merge pull request #2077 from chrisgarrity/fix-null-projectid
Don’t load null project id
2018-05-15 14:09:59 -04:00
Andrew Sliwinski b2766c108f Merge pull request #2075 from thisandagain/bugfix/2074
Replace white rectangle bitmap with empty svg for default backdrop
2018-05-15 12:53:00 -04:00
chrisgarrity b7bea40170 Don’t load null project id
Only call updateProject to load the project if there is a project id, or it’s the default project id.
2018-05-15 11:34:51 -04:00
Andrew Sliwinski 342edf2b20 Replace white rectangle bitmap with empty svg for default backdrop. Resolves GH-2074 2018-05-15 10:35:47 -04:00
chrisgarrity a5d310606e Merge pull request #2020 from chrisgarrity/feature/project-loader-refactor
Project loader refactor
2018-05-15 06:58:17 -04:00
chrisgarrity 37f98f6099 Fix up comments
- better split of hash-parser/project-loader unit tests.
2018-05-14 17:17:39 -04:00
Eric Rosenbaum ec06b7d8fe Merge pull request #2041 from ericrosenbaum/feature/scroll-by-id
Interact with blocks categories by id instead of by name
2018-05-14 17:17:34 -04:00
Eric Rosenbaum bdfd35e89d Merge branch 'develop' into feature/scroll-by-id 2018-05-14 16:51:47 -04:00
Eric Rosenbaum 787a0f830c Update blocks and vm versions 2018-05-14 16:47:58 -04:00
Paul Kaplan 989cb70b46 Merge pull request #2064 from paulkaplan/update-svg-renderer-dep
Update scratch-svg-renderer to fix IE11
2018-05-14 15:37:18 -04:00
Paul Kaplan 77e5d8c0ab Update scratch-svg-renderer to fix IE11 2018-05-14 15:36:47 -04:00
Paul Kaplan d8ab7a6fbb Merge pull request #2057 from mzgoddard/fix-babelrc
Add missing quotes to .babelrc configuration
2018-05-14 15:21:15 -04:00
Paul Kaplan 3248cc0596 Merge pull request #2062 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180514184134
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-05-14 15:10:07 -04:00
greenkeeper[bot] 278d837b8f chore(package): update scratch-paint to version 0.2.0-prerelease.20180514184134
Closes #1949
2018-05-14 18:41:55 +00:00