ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
405 Commits 3 Branches 499 Tags
f0c519debe7212e00795af142a22011ef0a787d7
Commit Graph
247 Commits
Author SHA1 Message Date
DD Liu 127d009d60 Merge branch 'develop' into monitors 2017-05-18 17:09:27 -04:00
DD Liu 0c42c1fc8e fix squashed blocks in flyout when adding a sprite while on another tab 2017-05-17 11:50:02 -04:00
DD Liu f385070f6d remove unused functions 2017-05-15 16:41:08 -04:00
DD Liu 1ea257b536 fix merge 2017-05-15 10:44:49 -04:00
DD Liu 98bc44ab05 Merge branch 'develop' into monitors 2017-05-15 10:24:33 -04:00
Ray Schamp f5ee7a4f23 Fix argument order for Object.assign 
Thanks @paulkaplan
 2017-05-12 17:42:37 -04:00
Ray Schamp ae529ea20d Only listen to targets update 
This reduces the complexity of the reducer, as well as how frequently it's run. The VM will emit a targets update after a step if any target info has changed.
 2017-05-12 11:45:06 -04:00
Ray Schamp 685066089b Merge pull request #342 from rschamp/feature/save-load 
Add Save and Load buttons
 2017-05-11 16:17:36 -04:00
Ray Schamp ca73379a09 Add button role to button component 
/ht @paulkaplan
 2017-05-11 15:41:10 -04:00
Ray Schamp 64891259b1 Merge pull request #339 from rschamp/feature/serialization 
Integrate VM serialization changes
 2017-05-11 15:40:34 -04:00
DD Liu 0e442aae3e Revert 2017-05-11 15:16:09 -04:00
DD Liu 08f5b6c786 add add monitors event 2017-05-10 17:01:20 -04:00
DD Liu 96af9d0040 fix lint and reduce throttle 2017-05-10 15:44:44 -04:00
DD Liu 164ab90420 Merge branch 'develop' into removeMonitors 2017-05-10 15:15:35 -04:00
DD Liu 7329942e0b GUI accepts remove monitors actions 2017-05-10 15:14:34 -04:00
DD Liu f2da91c591 throttle requests and fix code for merging new and old state 2017-05-10 14:10:17 -04:00
DD Liu 386c3968c7 add to monitors instead of replacing them. We will have a separate action for removing monitors. 2017-05-09 17:34:48 -04:00
DD Liu 2e6c37a9ba add the monitor block listener 2017-05-09 16:48:43 -04:00
DD Liu 2c2a8a3faa make monitors update method 2017-05-09 12:07:27 -04:00
Paul Kaplan 62f6887ec4 Allow pointer events to fall through the overlay 2017-05-05 16:45:51 -04:00
Ray Schamp 520e11c0cf Add Save and Load buttons 
Use the de/serialization features of the VM to allow downloading and loading project JSON
 2017-05-04 17:41:35 -04:00
Ray Schamp 32f4355455 Fix sound tab images 2017-05-04 15:44:03 -04:00
Ray Schamp 45a52b7787 Remove shouldComponentUpdate from TargetPane 
It doesn't help anything. Doing a deep compare is unnecessary because the underlying components will do the necessary comparison themselves. Simply seeing if the sprite list has changed at all is enough.
 2017-05-04 15:44:02 -04:00
Ray Schamp 84901ebb98 Use storage to retrieve costume data urls 2017-05-04 15:44:02 -04:00
Ray Schamp d7d1ad9ea1 Move VM into a reducer 
Otherwise it's very annoying to get access to the storage engine to load asset data.
 2017-05-04 15:44:02 -04:00
Paul Kaplan a73efe8634 Merge pull request #337 from paulkaplan/monitors-redux 
Add reducer, components and containers for monitors
 2017-05-04 14:55:14 -04:00
Paul Kaplan d01a5f5bd0 Make a copy of monitor data 2017-05-04 10:36:53 -04:00
Paul Kaplan 125d8ebd06 Reduce nesting by just using an array 2017-05-04 09:45:39 -04:00
Paul Kaplan 9244cb8c2f Move positioning out of monitor list 2017-05-04 09:40:38 -04:00
Paul Kaplan bb50d49c52 Add name for unused event variable 2017-05-04 09:03:56 -04:00
Paul Kaplan 8ea7e7d8b5 dd reducer, components and containers for monitors 2017-05-03 11:45:52 -04:00
DD b681e630b8 toggle turbo mode on shift click the green flag 2017-05-01 16:56:00 -04:00
Paul Kaplan 22f54696f4 Update to new proptypes style 2017-04-26 10:16:36 -04:00
Paul Kaplan b2c507be45 Split prompt into container and component 2017-04-26 10:14:02 -04:00
Paul Kaplan 992eb209c3 Add prompt for variable creation 2017-04-26 10:14:02 -04:00
Ray Schamp 00b4f87ebe Merge pull request #327 from rschamp/bugfix/project-clobbering 
Stringify project data
 2017-04-24 15:08:46 -04:00
Ray Schamp cade94abde Stringify project data 
Otherwise the VM can't JSON.load it.
 2017-04-24 15:03:48 -04:00
Ray Schamp c58727b24c Merge pull request #325 from rschamp/bugfix/project-clobbering 
Stop clobbering loading projects with default data
 2017-04-24 14:36:59 -04:00
Paul Kaplan 60830fe917 Merge pull request #324 from paulkaplan/fix-whitespace-canvas 
Fix whitespace canvas
 2017-04-24 14:14:29 -04:00
Paul Kaplan c7d0a85a38 Merge pull request #323 from paulkaplan/rotation-degrees 
Replace draggable with direction input
 2017-04-24 14:13:33 -04:00
Chris Willis-Ford 1a8b2f66a3 Merge pull request #321 from cwillisf/storage-internal-constants 
Get `Asset` and `AssetType` from storage instance
 2017-04-24 09:50:51 -07:00
Ray Schamp e9d33f8388 Stop clobbering loading projects with default data 
If the app is loading with an initial project id, don't try to load the default project. Previously, this data would load on top of the project being loaded.

Does not fix the issue of blocks not loading in the blocks pane, which appears to be separate.
 2017-04-24 12:06:24 -04:00
Paul Kaplan 5f2dffb39a Use 4x3 ratio for backdrop thumbnail to prevent blank space 2017-04-24 10:55:46 -04:00
Paul Kaplan afcdc6a1c4 Use overflow to clip border radius 2017-04-24 10:54:52 -04:00
Paul Kaplan d036a51e48 Remove placeholder 2017-04-24 10:30:08 -04:00
Paul Kaplan ae1f699c1d Replace draggable with direction input 2017-04-24 09:43:17 -04:00
Christopher Willis-Ford a0f7d75fdc Get Asset and AssetType from storage instance 2017-04-20 16:15:43 -07:00
Ray Schamp 58d482d102 Move to PropTypes for React 15.5 
With jscodeshift thank God
 2017-04-20 19:02:59 -04:00
Paul Kaplan bb93a0e969 Handle stage selection properly 2017-04-19 11:33:20 -04:00
Paul Kaplan 0ba94c45ff Use sprite info for costumes and sounds 2017-04-19 11:31:07 -04:00