Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop

Author: griffpatch

README.md

@@ -3,8 +3,7 @@
 
 [![Build Status](https://travis-ci.org/LLK/scratch-vm.svg?branch=develop)](https://travis-ci.org/LLK/scratch-vm)
 [![Coverage Status](https://coveralls.io/repos/github/LLK/scratch-vm/badge.svg?branch=develop)](https://coveralls.io/github/LLK/scratch-vm?branch=develop)
-[![Dependency Status](https://david-dm.org/LLK/scratch-vm.svg)](https://david-dm.org/LLK/scratch-vm)
-[![devDependency Status](https://david-dm.org/LLK/scratch-vm/dev-status.svg)](https://david-dm.org/LLK/scratch-vm#info=devDependencies)
+[![Greenkeeper badge](https://badges.greenkeeper.io/LLK/scratch-vm.svg)](https://greenkeeper.io/)
 
 ## Installation
 This requires you to have Git and Node.js installed.

package.json

@@ -25,27 +25,26 @@
   },
   "devDependencies": {
     "adm-zip": "0.4.7",
-    "babel-eslint": "7.0.0",
-    "copy-webpack-plugin": "3.0.1",
-    "eslint": "3.8.1",
-    "eslint-config-scratch": "^2.0.0",
+    "babel-eslint": "7.1.1",
+    "copy-webpack-plugin": "4.0.1",
+    "eslint": "3.15.0",
+    "eslint-config-scratch": "^3.1.0",
     "expose-loader": "0.7.1",
-    "gh-pages": "0.11.0",
-    "highlightjs": "8.7.0",
-    "htmlparser2": "3.9.0",
+    "gh-pages": "0.12.0",
+    "highlightjs": "9.8.0",
+    "htmlparser2": "3.9.2",
     "json": "9.0.4",
-    "json-loader": "0.5.4",
     "lodash.defaultsdeep": "4.6.0",
-    "minilog": "3.0.1",
+    "minilog": "3.1.0",
     "promise": "7.1.1",
     "scratch-audio": "latest",
     "scratch-blocks": "latest",
     "scratch-render": "latest",
     "script-loader": "0.7.0",
-    "stats.js": "0.16.0",
-    "tap": "5.7.1",
+    "stats.js": "0.17.0",
+    "tap": "10.0.2",
     "travis-after-all": "1.4.4",
-    "webpack": "1.13.0",
-    "webpack-dev-server": "1.14.1"
+    "webpack": "2.2.1",
+    "webpack-dev-server": "1.16.3"
   }
 }

src/blocks/scratch3_control.js

@@ -11,7 +11,7 @@ var Scratch3ControlBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3ControlBlocks.prototype.getPrimitives = function () {
     return {

src/blocks/scratch3_data.js

@@ -10,7 +10,7 @@ var Scratch3DataBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3DataBlocks.prototype.getPrimitives = function () {
     return {

src/blocks/scratch3_event.js

@@ -10,7 +10,7 @@ var Scratch3EventBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3EventBlocks.prototype.getPrimitives = function () {
     return {

src/blocks/scratch3_looks.js

@@ -10,7 +10,7 @@ var Scratch3LooksBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3LooksBlocks.prototype.getPrimitives = function () {
     return {

src/blocks/scratch3_motion.js

@@ -12,7 +12,7 @@ var Scratch3MotionBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3MotionBlocks.prototype.getPrimitives = function () {
     return {

src/blocks/scratch3_operators.js

@@ -1,4 +1,5 @@
 var Cast = require('../util/cast.js');
+var MathUtil = require('../util/math-util.js');
 
 var Scratch3OperatorsBlocks = function (runtime) {
     /**
@@ -10,7 +11,7 @@ var Scratch3OperatorsBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3OperatorsBlocks.prototype.getPrimitives = function () {
     return {
@@ -126,9 +127,9 @@ Scratch3OperatorsBlocks.prototype.mathop = function (args) {
     case 'floor': return Math.floor(n);
     case 'ceiling': return Math.ceil(n);
     case 'sqrt': return Math.sqrt(n);
-    case 'sin': return Math.sin((Math.PI * n) / 180);
-    case 'cos': return Math.cos((Math.PI * n) / 180);
-    case 'tan': return Math.tan((Math.PI * n) / 180);
+    case 'sin': return parseFloat(Math.sin((Math.PI * n) / 180).toFixed(10));
+    case 'cos': return parseFloat(Math.cos((Math.PI * n) / 180).toFixed(10));
+    case 'tan': return MathUtil.tan(n);
     case 'asin': return (Math.asin(n) * 180) / Math.PI;
     case 'acos': return (Math.acos(n) * 180) / Math.PI;
     case 'atan': return (Math.atan(n) * 180) / Math.PI;

src/blocks/scratch3_pen.js

@@ -163,7 +163,7 @@ Scratch3PenBlocks.prototype._wrapHueOrShade = function (value) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3PenBlocks.prototype.getPrimitives = function () {
     return {

src/blocks/scratch3_procedures.js

@@ -8,7 +8,7 @@ var Scratch3ProcedureBlocks = function (runtime) {
 
 /**
  * Retrieve the block primitives implemented by this package.
- * @return {Object.<string, Function>} Mapping of opcode to Function.
+ * @return {object.<string, Function>} Mapping of opcode to Function.
  */
 Scratch3ProcedureBlocks.prototype.getPrimitives = function () {
     return {