ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,304 Commits 3 Branches 499 Tags
9a5dfb11f52216039afd3f75b12e9409c1935762
Commit Graph
4304 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Rosenbaum 9a5dfb11f5 Add Makey Makey extension (#3908) 2018-11-29 14:02:46 -05:00
Paul Kaplan 05ffd09754 Merge pull request #3907 from paulkaplan/fix-block-changing 
Remove setTimeout for reattaching workspace block listener.
 2018-11-29 13:13:31 -05:00
Paul Kaplan b32ca253d4 Remove setTimeout for reattaching workspace block listener. 
It was causing a bug where switching tabs and adding a sprite would make the workspace blocks not work. Needs investigation.
 2018-11-29 13:12:02 -05:00
Paul Kaplan 0c938235c8 Merge pull request #3905 from paulkaplan/project-thumbnails 
Send snapshots from the renderer to be saved as project thumbnails
 2018-11-29 10:53:23 -05:00
Paul Kaplan 62b4aa9a6e Fix returning response 2018-11-29 10:39:51 -05:00
Paul Kaplan 09725f587a Send snapshots from the renderer to be saved as project thumbnails 2018-11-29 10:04:43 -05:00
Benjamin Wheeler bcca5bf1e8 Merge pull request #3856 from benjiwheeler/autosave-draft 
autosave periodically when project is dirty
 2018-11-28 19:28:09 -08:00
Ben Wheeler 5d36b584d0 make project saver tests pass; correct misnamed action 2018-11-28 19:08:58 -08:00
Karishma Chadha ede6d2feab Merge pull request #3890 from kchadha/editor-cloud-disconnect 
Disconnect from cloud when entering editor mode on someone else's project
 2018-11-28 21:14:55 -05:00
Ben Wheeler 966053b882 added timeout reducer 2018-11-28 17:12:18 -08:00
Ben Wheeler c326e3f073 made tests for autosaving on a schedule 2018-11-28 16:08:39 -08:00
Karishma Chadha 2ca51904b4 Clean up merge conflict resolution. 2018-11-28 18:37:55 -05:00
Karishma Chadha 9fc6d85ce6 Merge branch 'develop' into editor-cloud-disconnect 2018-11-28 18:27:32 -05:00
Ben Wheeler acdebc65da fixed test for auto saving 2018-11-28 15:14:33 -08:00
Karishma Chadha c27a328c60 Merge pull request #3904 from kchadha/cloud-connect-when-has-cloud-data 
Connect to cloud based on hasCloudData
 2018-11-28 18:11:56 -05:00
Karishma Chadha 34212a6335 Update scratch-vm 2018-11-28 17:50:53 -05:00
Karishma Chadha db57175a90 Connect to cloud if project has cloud data. Disconnect if it doesn't. 
Queue up messages to send ot the cloud server which accumulate before 
the connection is ready. Add tests for new/updated functionality.
 2018-11-28 17:07:34 -05:00
Ben Wheeler 57701a64a3 use projectChanged reducer to detect project dirty state 2018-11-28 13:51:01 -08:00
Ben Wheeler 782e86a38a simplified autosave code per rschamp's comments; made isShowingSaveable and autosaveIntervalSecs props 2018-11-28 13:17:51 -08:00
Ben Wheeler d9c670745f redid autosave logic to auto save 2 mins after project made dirty 2018-11-28 13:17:50 -08:00
Ben Wheeler 6b4d1a14e9 general proposal for first take on autosave 2018-11-28 13:17:50 -08:00
Ray Schamp afd713f8a9 Merge pull request #3896 from rschamp/remove-fun 
Remove color rotation while saving
 2018-11-28 15:55:24 -05:00
Paul Kaplan f880aec201 Merge pull request #3898 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20181128182047 
Update scratch-paint to the latest version 🚀
 2018-11-28 15:07:24 -05:00
Paul Kaplan 82c31ca3bb Merge branch 'develop' into greenkeeper/scratch-paint-0.2.0-prerelease.20181128182047 2018-11-28 15:07:16 -05:00
Paul Kaplan ef492c0f2f Merge pull request #3900 from paulkaplan/download-on-error 
Add download and retry saving to saving error alert.
 2018-11-28 15:06:49 -05:00
Paul Kaplan ff234347e9 Put all buttons in a group and use flex to position message and groups. 
Instead of setting 100% width on the message, causing inappropriate wrapping of the button text. Removed the nbsp in the Try Again text
 2018-11-28 14:55:59 -05:00
Ray Schamp 863f313801 Merge pull request #3879 from rschamp/project-changed-state 
Track "project changed" state in Redux
 2018-11-28 14:46:10 -05:00
Paul Kaplan bd6c65997d Add download and retry saving to saving error alert. 
I do not like how the alert component is hyper specialized for two distinct use cases. It would be much better to refactor the alerts so that the alerter can just fill the alert with whatever they want. But I do not feel comfortable making that refactor because I know ben and evelyn have gone back and forth about these alerts.
 2018-11-28 14:05:47 -05:00
Eric Rosenbaum 75a1abd19a Add three awesome tutorials (#3897) 2018-11-28 14:01:20 -05:00
Benjamin Wheeler d8e239536f Merge pull request #3859 from benjiwheeler/translations 
updated scratch-l10n in package.json
 2018-11-28 10:40:17 -08:00
greenkeeper[bot] 524b339d18 chore(package): update scratch-paint to version 0.2.0-prerelease.20181128182047 2018-11-28 18:22:10 +00:00
Ray Schamp 6f523dab35 Remove color rotation while saving 
We have alerts for this now.
Resolves #3893
 2018-11-28 11:57:39 -05:00
Ray Schamp f6d419ae04 Keep projects unchanged after loading 2018-11-28 11:24:43 -05:00
Paul Kaplan 12289b8d7e Merge pull request #3895 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181128141527 
Update scratch-vm to the latest version 🚀
 2018-11-28 10:39:32 -05:00
greenkeeper[bot] c1a91e027c chore(package): update scratch-vm to version 0.2.0-prerelease.20181128141527 2018-11-28 14:18:07 +00:00
chrisgarrity a8f7c6b0fe Fix tests 2018-11-28 09:04:12 -05:00
Ray Schamp 095924256a Track "project changed" state in Redux 
Listen to the new project changed event from the VM and keep track of the state in Redux.  Update it as appropriate.

Known issue is that the project is marked as "changed" immediately after it's loaded. This is due to asynchronous event emitting while the project data is loaded, and needs an update to the VM to fix.
 2018-11-28 09:01:30 -05:00
Paul Kaplan a3431a9930 Merge pull request #3880 from paulkaplan/prevent-space-scroll 
Prevent arrow/space from scrolling the page
 2018-11-28 08:52:43 -05:00
Evelyn Eastmond a06fad33ea Merge pull request #3873 from evhan55/rtl/alerts 
Adding RTL padding to reconnect button on alerts.
 2018-11-28 05:39:55 -08:00
Benjamin Wheeler f887485100 Merge pull request #3830 from benjiwheeler/modal-padding 
better padding, margin in device connection modal
 2018-11-27 20:28:23 -08:00
Ben Wheeler da7186374e updated scratch-l10n in package.json 2018-11-27 16:29:52 -08:00
Karishma Chadha 143dd5e106 Add unit tests for disconnecting from cloud when viewing a project in editor mode without the ability to save. 2018-11-27 18:08:38 -05:00
Paul Kaplan 17e671868a Merge pull request #3888 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181127220421 
Update scratch-vm to the latest version 🚀
 2018-11-27 17:57:09 -05:00
Karishma Chadha e752ffdf8a Disconnect from cloud when viewing someone else's project in editor mode 2018-11-27 17:54:50 -05:00
greenkeeper[bot] 83fb2d572d chore(package): update scratch-vm to version 0.2.0-prerelease.20181127220421 2018-11-27 22:24:27 +00:00
Paul Kaplan 28c22d738f Merge pull request #3885 from paulkaplan/fix-start-frame 
Hide entire frame unless the VM has not started
 2018-11-27 16:55:32 -05:00
Paul Kaplan 6840e510a5 Merge pull request #3874 from paulkaplan/fix-keyboard-issues 
Stop action menu focus stealing keyboard events from the VM
 2018-11-27 16:51:14 -05:00
Paul Kaplan d1172bfa9d Hide entire frame unless vm has not started 2018-11-27 16:44:32 -05:00
Paul Kaplan 616d4fa11b Merge pull request #3882 from paulkaplan/selective-auto-start 
Green flag overlay to start in player mode
 2018-11-27 15:49:54 -05:00
Paul Kaplan fba1241857 Merge pull request #3883 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20181127194508 
Update scratch-render to the latest version 🚀
 2018-11-27 15:49:37 -05:00