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

97 commits

Author SHA1 Message Date
morant
c6c1a63ff0 Merge branch 'feature/194' of https://github.com/morantsur/scratch-vm into develop 
+ Solve code conflicts, and handle deserialization of 3.0 projects.

# Conflicts:
#	src/index.js
#	test/unit/serialization_sb2.js
 2017-01-27 20:05:54 -05:00
Chris Willis-Ford
9b04392211 Move build outputs into a dist/ subdirectory (#375) 
* Move Node output: /dist.js => /dist/node/scratch-vm.js
* Move web output: /vm{.js,.min.js} => /dist/web/scratch-vm{.js,.min.js}
* Update build output references in package.json and the playground's index.html
* Move the VirtualMachine class out of index.js into its own file, referenced by index.js. The VirtualMachine class is otherwise unchanged.
* Add .gitattributes rules for new file types which were added to this repository without specifying their text/binary attributes
* Turn on source maps in webpack and add corresponding .gitignore rule
 2017-01-13 13:34:26 -08:00
Eric Rosenbaum
fec9e5b91a add audio to playground 2017-01-06 11:49:25 -05:00
Eric Rosenbaum
4298f4865f remove outdated audio from playground 2017-01-06 10:27:59 -05:00
Andrew Sliwinski
04d9620631 Merge branch 'patch-24' of https://github.com/TheBrokenRail/scratch-vm into feature/194 2016-12-24 08:46:50 -05:00
Eric Rosenbaum
f2793a1d59 Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 
# Conflicts:
#	package.json
#	src/engine/runtime.js
#	src/sprites/clone.js
 2016-12-21 15:29:57 -05:00
Ray Schamp
e9da046969 Report full sprite info in targetsUpdate 
We need more than just the name for the initial render, so send everything consistent with sprite info reports.
 2016-12-07 17:11:08 -05:00
TheBrokenRail
532df2079b Update index.html 2016-12-04 08:39:46 -05:00
TheBrokenRail
39e71aa4f4 Add To Playground 2016-12-03 13:25:15 -05:00
Ray Schamp
adaf2df743 Emit sprite info report for all sprites 
This allows costume data to reach listeners even when the sprite isn't the editing target.

Filter out non-editing target reports in the playground to match previous behavior.
 2016-11-30 13:21:00 -05:00
Ray Schamp
2ff719f2ba Fix consistency of existing emits 2016-11-23 15:43:05 -05:00
Tim Mickel
f235cb47e6
Merge remote-tracking branch 'LLK/develop' into feature/remove-empty-project 
# Conflicts:
#	src/index.js
 2016-10-31 10:39:36 -04:00
Tim Mickel
56ef01745f Implement sprite info emitting and posting (#320) 2016-10-26 13:27:12 -04:00
Tim Mickel
1dc4aaa2d7 Remove rAF usage and inline into _step (#318) 2016-10-26 11:32:15 -04:00
Tim Mickel
d75f1c5965
Remove empty project 2016-10-26 10:30:16 -04:00
Tim Mickel
3d57c2e74c Drop single-stepping and pause modes (#294) 2016-10-20 11:42:16 -04: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
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
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
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
0024b209bd Merge remote-tracking branch 'LLK/develop' into develop 2016-10-11 13:47:24 -04:00
Eric Rosenbaum
ed9623ef4b new pitch shifter 2016-10-11 13:29:19 -04:00
Tim Mickel
5c6d80ab8e Toolbox update Oct 7 (#246) 
* Toolbox XML update October 7

* Blocks font CSS
 2016-10-07 15:51:03 -04:00
Eric Rosenbaum
ed650ba487 Merge remote-tracking branch 'LLK/develop' into develop 2016-10-05 17:16:13 -04:00
Eric Rosenbaum
bc07a13159 cleanup 2016-10-05 17:16:05 -04:00
Eric Rosenbaum
0db0783fe8 working on sound font player 2016-10-04 14:19:04 -04:00
Eric Rosenbaum
086dd35329 comments 2016-10-03 20:07:42 -04:00
Tim Mickel
dd624aea06 Update toolbox for data_list rename (#227) 2016-10-03 11:44:08 -04:00
Eric Rosenbaum
e1df4b3aaf fixed dictionary of loaded sounds 2016-10-01 17:27:28 -04:00
Eric Rosenbaum
6988cfc0d3 starting to load sounds from project files 2016-09-28 16:42:25 -04:00
Eric Rosenbaum
fbaad0fe06 experimenting with a soundfont 2016-09-28 13:20:51 -04:00
Eric Rosenbaum
54c5c82fde moved audio engine files 2016-09-27 18:18:15 -04:00
Eric Rosenbaum
7c91565408 Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop 2016-09-27 18:12:20 -04:00
Ray Schamp
a99f9ad5ff Provide playground dependencies with webpack 
This confines all the files the playground needs to the playground directory.
 2016-09-26 09:42:37 -04:00
Tim Mickel
a687184c3c Fix and improve playground threads display (#198) 2016-09-21 16:31:23 -04:00
Ray Schamp
4e547556a8 Use attachRenderer rather than the constructor 
This makes the renderer optional as well as making the order of instantiation flexible.
 2016-09-20 15:09:21 -04:00
Ray Schamp
499ba5235c Scope renderer to instance 
This allows usage without global scope to attach a renderer to the VM. It also provides the ability to have multiple VMs/renderers to be used at once.
 2016-09-20 02:52:33 -04:00
TheBrokenRail
470f686662 Update Playground With Procedure Blocks (#191) 2016-09-18 11:32:24 -04:00
Tim Mickel
542899949e Update for RenderWebGLLocal -> RenderWebGL (#181) 
* Update for RenderWebGLLocal -> RenderWebGL

* Move button under title
 2016-09-15 19:02:03 -04:00
Tim Mickel
6b3f0d3d8a Playground update; update SB2 spec map for list, _ of _ blocks (#184) 
* Playground update

* Update SB2 spec map for list, _ of _ blocks
 2016-09-15 17:10:32 -04:00
Eric Rosenbaum
8872f663a4 Merge remote-tracking branch 'LLK/develop' into develop 
# Conflicts:
#	playground/index.html
#	playground/playground.js
#	src/engine/execute.js
#	src/engine/runtime.js
#	src/index.js
#	src/sprites/clone.js
 2016-09-15 16:58:41 -04:00
Eric Rosenbaum
aa812aa6b7 worker less audio engine, can meow 2016-09-15 15:59:29 -04:00
TheBrokenRail
b6e30a7b23 Added 'New Project' Button (#171) 
* Added 'New Project' Button

* Added 'New Project' Button Functionality

* Changed To addEventListener

* Move To Import/Export
 2016-09-13 22:04:44 -04:00
Eric Rosenbaum
e19c1942c3 Merge remote-tracking branch 'LLK/develop' into develop 
# Conflicts:
#	src/index.js
#	src/sprites/clone.js
#	src/worker.js
 2016-09-13 18:09:43 -04:00
Eric Rosenbaum
d9a703b4ad play sound and play note block 2016-09-13 17:52:54 -04:00
Tim Mickel
08b40b4d1d Drop worker support (#175) 
* Take out worker code

* Fix Blockly event listening (minus worker)

* Recompile Sept. 13
 2016-09-13 17:49:45 -04:00
Tim Mickel
833c5ed313 When clicked hats (#156) 2016-09-12 17:16:10 -04:00
Tim Mickel
79346c0925 Fixes for #138 (#166) 
* Markup/CSS adjustments

* Move assets to folder

* Strip extra font-family

* More robust handling of project-load fail state

* Move empty project creation to its own function

* Move green flag/stop back out of the tab

* Restore default id
 2016-09-12 12:03:24 -04:00
TheBrokenRail
40b530fa7e Offline Support [READY TO MERGE?] [ALONG WITH THE SCRATCH-RENDER PR] (#138) 
* Remove Fallback Project

* Added A Newline and Removed Fallback Project

* Made The SB2 Project Import Field Fit In  More With All Other Textboxes

* Better Description Of SB2 Import Field

* Oops!

* The XML Import Area Doses Not Need To Be Resizable!

* That Didn't Work As Planned

* Now it won't rezize

* Added SB3New

* Add Code For SB3New

* Better 404

* Indentation

* NodeJS complains about quotes

* Moved And Renamed SB3New

* Renamed Refrences

* Prefix With ./

* Typo

* Newline Fix

* Scratch Cat By Default!

* Single Quotes And Max Legth Fixed

* Better Comment Above loadProject

* Move newProject to index.js

* Added Dependincies to index.js

* Deleted newProject.js

* Removed Unneeeded Semicolon

* @param {?string}

* Added SVG For Scxratch Cat

* Now Uses Scratch Cat Offline (REQUIRES PULL REQUEST MADE TO SCRATCH-RENDER TO BE MERGED OR IT WILL NOT WORK)

* Added Stage PNG

* Added Stage Creation

* Fix Sizing Issues

* Import And Compatibility With Less Hacky Image Import (Scratch-Render)

* Import And Compatibility With Less Hacky Image Import (Scratch-Render)

* Fixed Line Length

* Added Navigation Bar

* Added CSS For Drop Down Menus

* Nicer Scale

* Nicer Dropdowns

* Remobved Dropdown CSS (It Didn't Work)

* Add Scratch Player Bar CSS

* Add Scratch Player Bar HTML
 2016-09-12 11:05:16 -04:00