Moran
d8e1d42bf2
Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop
2017-03-03 15:23:43 -05:00
Ray Schamp
bf2303f6de
Merge pull request #490 from rschamp/dnd
...
Add methods for dragging and dropping sprites
2017-03-03 09:50:34 -05:00
Ray Schamp
d0cd9cd897
Add methods for dragging and dropping sprites
...
* Add `getTargetIdForDrawableId` to translate between renderer picks and VM targets
* Add `startDrag` to stop sprite motion while dragging
* Add `stopDrag` to return sprite motion after dragging
2017-03-03 09:43:31 -05:00
Ray Schamp
319f27a060
Merge pull request #487 from rschamp/draggability
...
Add draggable property to sprites
2017-03-02 15:56:12 -05:00
Ray Schamp
11e28111c5
Activate click hats on mouse up to match 2.0
2017-03-02 11:32:10 -05:00
Andrew Sliwinski
a4578ba086
Default bitmapResolution to 1 if not provided in costume metadata ( #485 )
...
* Default bitmapResolution to 1 if not provided in costume metadata. Resolves GH-484
2017-03-02 11:21:01 -05:00
Ray Schamp
8dadc42857
Add draggable property to sprites
...
This property should be managed by the VM so that it can be displayed in the sprite info panel in the GUI.
2017-03-01 18:49:17 -05:00
Andrew Sliwinski
7042bdb45c
Merge pull request #472 from griffpatch/bug/escapeFromConditionalBranches
...
Bug - escapeFromConditionalBranches
2017-03-01 16:42:30 -05:00
Ray Schamp
ba00db897f
Merge pull request #486 from rschamp/fix-filter-tests
...
Update tests to account for custom categories
2017-03-01 13:01:12 -05:00
Ray Schamp
0b2d053177
Update tests to account for custom categories
2017-03-01 12:57:46 -05:00
TheBrokenRail
739c5deb63
Show Categories that use custom code to load (variables, procedures) ( #483 )
2017-03-01 09:25:11 -05:00
Ray Schamp
343b5bfe8e
Merge pull request #461 from rschamp/filter-toolbox
...
Provide method for filtering toolbox XML
2017-02-27 14:14:11 -05:00
Ray Schamp
6ea9b54539
Add filterToolbox unit tests
2017-02-27 12:58:18 -05:00
Ray Schamp
390b2373e9
Refactor filter methods into util
2017-02-27 12:57:38 -05:00
Ray Schamp
a9b495fced
Filter the playground toolbox
2017-02-27 12:57:38 -05:00
Ray Schamp
99e1b24285
Add rudimentary toolbox filtering method
2017-02-27 12:57:38 -05:00
Ray Schamp
370f2c6a47
Merge pull request #459 from griffpatch/feature/FencingAgain
...
Feature fencing again
2017-02-24 11:27:10 -05:00
Ray Schamp
a03b538fce
Merge pull request #476 from rschamp/greenkeeper-pls
...
Use caret ranges for dev dependencies
2017-02-23 08:33:36 -05:00
Chris Willis-Ford
a56db95aba
Merge pull request #446 from magmaboat/hasownproperty
...
Perform hasOwnProperty validation
2017-02-22 13:55:54 -08:00
Ray Schamp
ed4b0080b6
Use caret ranges for dev dependencies
...
These packages don't affect the output of the built package, so don't require a specific version. This should quiet Greenkeeper down a bit about our dependencies.
2017-02-20 17:15:50 -05:00
Ray Schamp
6fba4c61e3
Merge pull request #474 from LLK/greenkeeper/expose-loader-0.7.3
...
chore(package): update expose-loader to version 0.7.3
2017-02-20 16:45:05 -05:00
Ray Schamp
47953ab58f
Merge pull request #475 from LLK/greenkeeper/webpack-dev-server-2.4.1
...
chore(package): update webpack-dev-server to version 2.4.1
2017-02-20 16:44:45 -05:00
Ray Schamp
bee8c8d50d
Merge pull request #473 from LLK/greenkeeper/eslint-3.16.0
...
Update eslint to the latest version 🚀
2017-02-20 16:25:21 -05:00
Ray Schamp
feaec81d9d
Merge pull request #469 from LLK/greenkeeper/tap-10.2.0
...
Update tap to the latest version 🚀
2017-02-20 16:24:35 -05:00
greenkeeper[bot]
867d3c79f5
chore(package): update eslint to version 3.16.0
...
https://greenkeeper.io/
2017-02-20 16:37:01 +00:00
griffpatch
c5eb8ece16
Handle actual looping cases
...
And it starts to get a little less elegant :/
Wondering if this should not be handled better in another part of the
codebase?
We don't want to be duplicating existing code stepping functionality
locally at the end of the promise script really... What do you think?
2017-02-20 09:40:32 +00:00
griffpatch
362a231279
bug - escape from conditional branches
...
Execution bug: can't escape from conditional branches that end with a
Promise-resolution-terminating command block (see #464 )
2017-02-20 08:20:21 +00:00
griffpatch
682dec493f
Merge remote-tracking branch 'refs/remotes/LLK/develop' into bug/escapeFromConditionalBranches
2017-02-20 08:16:41 +00:00
greenkeeper[bot]
0118a19cd5
chore(package): update webpack-dev-server to version 2.4.1
...
Closes #470
https://greenkeeper.io/
2017-02-19 22:15:28 +00:00
greenkeeper[bot]
d7bff34a66
chore(package): update tap to version 10.2.0
...
https://greenkeeper.io/
2017-02-19 01:19:16 +00:00
Andrew Sliwinski
401fd78fd0
Merge pull request #463 from CSnap/sequencerTesting
...
Adding Sequencer Unit Tests
2017-02-18 10:24:52 -05:00
Andrew Sliwinski
c9f656f79e
Merge pull request #465 from LLK/greenkeeper/tap-10.1.2
...
Update tap to the latest version 🚀
2017-02-18 10:15:27 -05:00
greenkeeper[bot]
9f364b93eb
chore(package): update tap to version 10.1.2
...
https://greenkeeper.io/
2017-02-18 02:13:29 +00:00
Chris Willis-Ford
ddee4186b8
Merge pull request #460 from cwillisf/update-readme-playground
...
Update playground paths in README.md
2017-02-17 15:25:42 -08:00
Chris Willis-Ford
1671cbe1b0
Merge pull request #457 from cwillisf/fix-cachalot
...
Match Scratch 2.0 order of execution
2017-02-16 12:59:48 -08:00
SillyInventor
2fc2ee2c4b
Adding sequencer unit tests for each function
2017-02-16 14:30:00 -05:00
Christopher Willis-Ford
af77098161
Update playground paths in README.md
...
A recent change moved the location of the playground source files and
the URL used to access the playground when running the dev server. This
change updates README.md to reflect the new locations.
2017-02-15 15:31:20 -08:00
griffpatch
7bc141e76e
Feature Fencing
...
This is a re-comit after the previous pull was reverted.
2017-02-15 15:59:54 +00:00
griffpatch
61d1872642
Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop
2017-02-15 15:51:10 +00:00
Ray Schamp
b4c98d30c6
Merge pull request #458 from LLK/revert-452-feature/fencing
...
Revert "Feature fencing"
2017-02-15 09:44:34 -05:00
Ray Schamp
39158c9d48
Revert "Feature fencing"
2017-02-15 09:40:10 -05:00
griffpatch
a2c43a80ab
Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop
2017-02-15 08:50:03 +00:00
Andrew Sliwinski
74f7c4f5b1
Merge pull request #456 from LLK/greenkeeper/tap-10.1.1
...
Update tap to the latest version 🚀
2017-02-14 21:00:21 -05:00
Chris Willis-Ford
ad4fe785a7
Merge pull request #452 from griffpatch/feature/fencing
...
Feature fencing
2017-02-14 16:55:38 -08:00
Christopher Willis-Ford
3b3daf8aca
Add hat execution order test
2017-02-14 16:33:42 -08:00
greenkeeper[bot]
fba054cc68
chore(package): update tap to version 10.1.1
...
https://greenkeeper.io/
2017-02-14 19:26:13 +00:00
greenkeeper[bot]
a69950add4
chore(package): update expose-loader to version 0.7.3
...
Closes #454
https://greenkeeper.io/
2017-02-14 18:57:35 +00:00
griffpatch
75e3f6002b
Fencing - Take 3
...
Dependant on scratch-render pull request.
2017-02-14 09:12:35 +00:00
Christopher Willis-Ford
18107cde7b
Reverse target iteration in allScriptsDo
...
The `allStacksAndOwnersDo` function in Scratch 2.0 runtime iterates
targets in reverse and projects sometimes rely on that for correct
initialization. If, for example, each sprite runs a "go back 999 layers"
or "go to front" block as its first action, the order of execution will
determine the ordering of the layers.
This change makes Scratch 3.0 match the Scratch 2.0 execution order.
2017-02-13 14:45:29 -08:00
Christopher Willis-Ford
bd76395676
Minor cleanup around cloning methods
2017-02-13 14:44:51 -08:00