scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-27 16:32:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
6353 commits 495 branches 1644 tags 1.4 GiB
Commit graph

6353 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Mickel
84bd42d734 Functions to add Sprite2/costumes/backdrops (#291) 
* Functions to add Sprite2/costumes/backdrops

* Have sb2import return the top-level target
 2016-10-20 11:44:01 -04:00
Tim Mickel
3d57c2e74c Drop single-stepping and pause modes (#294) 2016-10-20 11:42:16 -04:00
Tim Mickel
9af9a87cb6 Pass rotation center and bitmap resolution to renderer (#288) 2016-10-19 17:01:48 -04:00
Eric Rosenbaum
0858a22ffb adding theremin block and set instrument 2016-10-19 15:44:30 -04:00
Ray Schamp
0cf21b26f0 Merge pull request #290 from rschamp/fix-playground 
Prevent npm from outputting repo URL on gh-pages publish
 2016-10-18 13:01:42 -04:00
Ray Schamp
bcfb4ea8c9 Add docs for publishing the playground 2016-10-18 12:57:12 -04:00
Ray Schamp
fa0918b592 Prevent npm from outputting repo URL 2016-10-18 12:56:53 -04:00
Eric Rosenbaum
f3f2fea3dd add watch command 2016-10-18 12:50:22 -04:00
Ray Schamp
9d4eaffd43 Merge pull request #289 from rschamp/fix-playground 
Fix scratch-* dependency versions for npm update
 2016-10-18 12:05:21 -04:00
Ray Schamp
1b9f9e63d6 Fix scratch-* dependency versions for npm update 
The issues:
* The scratch-blocks@0.1.0 version exists because I accidentally published 0.1.0 (no -prerelease modifier) while setting up NPM
* I added a step that causes Travis to run `npm update` after installing
* The "0.1.0-prepublish" dependency version makes no sense

This made Travis install the old version of scratch-blocks that I published accidentally, which breaks the playground.
 2016-10-18 12:00:52 -04:00
Ray Schamp
2abfe25d6d Fix gh-pages commit messages 
Don't output full logs, just the commit that the build is for. And use the author, not the committer, since GitHub is almost always the committer on develop.
 2016-10-18 10:16:34 -04:00
Ray Schamp
4cb680c047 Merge pull request #276 from rschamp/Makefile-- 
Replace Makefile with npm scripts
 2016-10-18 09:44:32 -04:00
Ray Schamp
525a230a48 Add .gitattributes so eslint can run on Windows 2016-10-18 09:38:28 -04:00
liam4
052cae0176
Merge branch 'develop' of https://github.com/llk/scratch-vm 2016-10-18 08:05:29 -03:00
Tim Mickel
e49f076fa1 Interpreter fixes, enhancements, features (#280) 
* Thread stepping rework; interp.redraw equivalent

* Add turbo mode and pause mode

* Yielding behavior to match Scratch 2.0

* Implement warp-mode procedure threads

* Add check for recursive call

* Inline wait block timer

* Revert to setInterval and always drawing

* Restore yielding in glide

* 30TPS compatibility mode

* 5-call count recursion limit

* Removing dead primitive code

* To simplify, access runtime.threads inline in `stepThreads`.

* Warp mode/timer fixes; recursive check fixes; clean-up

* Add basic single-stepping

* Add single-stepping speed slider

* Allow yielding threads to run in single-stepping

* Restore inactive threads tracking for block glows

* Add clock pausing during pause mode

* Documentation and clean-up throughout

* Don't look for block glows in `thread.topBlock`.

* Add null check for block glows; rename `_updateScriptGlows` to reflect block glowing

* Use the current executed block for glow, instead of stack

* Add more comments to `stepToProcedure`, and re-arrange to match 2.0

* Tweak to Blocks.prototype.getTopLevelScript

* Revert previous

* Fix threads array to be resilient to changes during `stepThreads`

* Restore inactive threads filtering

* Fix typo in "procedure"

* !! instead of == true
 2016-10-17 23:23:16 -04:00
Tim Mickel
060d1ab2a5 Updated blocks for new renderer features (#257) 
* Add "touching" block, layers blocks

* Keep in fence, if on edge bounce, fix to touching edge

* Fix degtoRad in "if on edge, bounce"

* Fixes from review
 2016-10-17 23:17:55 -04:00
Eric Rosenbaum
6d9f889aa7 fixed sound loading 2016-10-17 17:16:55 -04:00
Eric Rosenbaum
ba84b6e34b move audioengine to its own module 2016-10-17 17:16:13 -04:00
Eric Rosenbaum
7bd0142deb Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 
# Conflicts:
#	playground/index.html
 2016-10-17 17:13:43 -04:00
Tim Mickel
352c6516d3 Fix parent setting in sb2 importer (#283) 2016-10-17 16:44:33 -04:00
Cosmic Web Services
454eb904a3 Add days since 2000 block (#272) 
* Add days since 2000 block

* Empty line addition

* Add semicolin

* Empty line addition

* Tabed

* Remove extra line

* Make it exactly like scratch 2 was

* Fixed spacing
 2016-10-17 13:57:25 -04:00
Ray Schamp
2904152318 Merge pull request #282 from rschamp/feature/vm.clear 
Add VM.clear method
 2016-10-17 13:56:37 -04:00
Ray Schamp
5615583fb2 Lint 2016-10-17 13:54:27 -04:00
Ray Schamp
bd95c1461d Add VM.clear method 
Use it before loading projects so targets don't accumulate when multiple projects are loaded on the same instance.

Move check to see if the clone is the original clone onto the block implementation so all clones can be removed.

Fixes #274
 2016-10-17 13:43:38 -04:00
Andrew Sliwinski
1615c47d80 Merge pull request #279 from thisandagain/bugfix/229 
Fix `degToRad` function definition
 2016-10-17 11:56:48 -04:00
Andrew Sliwinski
9cd4d96101 Add test coverage for SB2 importer (#278) 2016-10-17 11:55:21 -04:00
Andrew Sliwinski
ace9a96fc2 Fix degToRad function definition. Resolves GH-229 2016-10-17 11:52:02 -04:00
Andrew Sliwinski
80fa2d5a58 Resolve merge conflicts 2016-10-17 10:50:24 -04:00
Ray Schamp
503de088fe Merge pull request #259 from TheBrokenRail/patch-19 
Copy Assets To Playground With Webpack
 2016-10-17 09:49:14 -04:00
Ray Schamp
9db0dc1bd0 Merge pull request #277 from rschamp/bettertravis 
Update packages after installing
 2016-10-17 09:47:10 -04:00
Ray Schamp
3f4a244cbd Replace Makefile with npm scripts 2016-10-17 09:42:35 -04:00
Ray Schamp
95dc6d38b3 Update packages after installing 
This is the less hacky way to keep scratch-* packages up to date (and any others in the future).  This is only necessary because we cache the node_modules directory.
 2016-10-17 09:38:41 -04:00
Tim Mickel
3bfd755e60 Complete implementation of stop block (#271) 
* "Other scripts in stage" sb2

* Complete implementation of "stop" block
 2016-10-13 23:00:46 -04:00
Tim Mickel
c45b420115 Fix check for existing hat threads (#269) 2016-10-13 22:14:19 -04:00
TheBrokenRail
ebe8f63232 Fix 2016-10-13 20:01:17 -04:00
Tim Mickel
1e86d48a31 Clicking blocks in the toolbox (#267) 2016-10-13 17:15:49 -04:00
Tim Mickel
dcda82a009 Use default toolbox XML (#265) 2016-10-13 17:05:53 -04:00
Tim Mickel
8c654bbe60 Procedure blocks (#264) 2016-10-13 13:11:26 -04:00
Eric Rosenbaum
31d680a229 lint 2016-10-13 11:54:00 -04:00
Eric Rosenbaum
d808a83f79 lint 2016-10-13 11:48:31 -04:00
Eric Rosenbaum
e084a76485 lint 2016-10-13 11:35:52 -04:00
Ray Schamp
c9c2cc560e Merge pull request #263 from dekrain/bug-fix/assets_loc 
Fix relative localization for assets
 2016-10-13 10:53:24 -04:00
dekrain
91037a261e Fix relative localization for assets 2016-10-13 16:19:42 +02:00
Ray Schamp
b5f6a8d22f Merge pull request #242 from TheBrokenRail/patch-13 
Add NPM Script 'build'
 2016-10-13 09:35:29 -04:00
TheBrokenRail
476221fc1b change second start to build 2016-10-12 21:00:10 -04:00
TheBrokenRail
1d99efbcd8 Copy Assets To Playground With Webpack 2016-10-12 20:58:03 -04:00
Eric Rosenbaum
80764f053d lint 2016-10-12 17:22:50 -04:00
dekrain
49d6bd3b67 Fix new project creation (#256) 
* Fix new project creation

* Fix new project creation

* const -> var
 2016-10-12 13:56:31 -04:00
Eric Rosenbaum
7b179546ed new setup for use with scratch-gui 2016-10-12 13:17:51 -04:00
Tim Mickel
a7522c7734 Fix data_listcontents block name (#254) 2016-10-11 17:12:19 -04:00