Commit graph

4538 commits

Author SHA1 Message Date
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
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
Tim Mickel
da5b70ffd2 Add CONTRIBUTING.md for scratch-vm (#244)
* Add CONTRIBUTING.md for scratch-vm

* Thought through language

* Forum post -> developers link

* paper
2016-10-05 16:37:55 -04:00
Ray Schamp
3476e419b1 Merge pull request #243 from rschamp/github-templates
Add issue and PR templates for contributors
2016-10-05 11:36:54 -04:00
Ray Schamp
b28c67633a Remove Type section 2016-10-05 10:19:25 -04:00
Ray Schamp
2b54366d1c Add issue and PR templates for contributors 2016-10-05 10:00:28 -04:00
Liam
30535d8e6e Implement "distance to" block (#239)
* Implement "distance-to" block

* distance-to in stage should always be 10000
2016-10-04 21:26:59 -04:00
TheBrokenRail
9b07889b3f Fix Stage PNG (#241)
* Fix Stage PNG

* Add New Stage PNG

* Remove Old Stage PNG

* Delete backdrop1.png

* Rename New Stage PNG

* Delete stage.png

* Fix Stage Resolution
2016-10-04 20:38:11 -04:00
TheBrokenRail
cb4a75928e Add NPM Script 'build' 2016-10-04 20:25:06 -04:00
Liam
5871672551 Implement "go to" block (#238)
* Implement "go to" block

* Add a missing semicolon

My text editor doesn't automatically insert them and I'm not used to using
semicolons so much. :(

* Implement go-to-random

* Clean up the go-to-random code a bit

* Add rounding to _random_ picks
2016-10-04 18:19:52 -04:00
Andrew Sliwinski
a688004418 Merge branch 'develop' of github.com:LLK/scratch-vm into develop 2016-10-04 15:29:17 -04:00
Andrew Sliwinski
6cd9697bed Add secure environment var for coveralls. Re GH-103 2016-10-04 15:21:55 -04:00