Merge branch 'master' of https://github.com/Microsoft/TouchDevelop

embedded/emitter.ts

@@ -370,7 +370,7 @@ module TDev {
             return "  int "+r+"_w = "+w+";\n" +
               "  int "+r+"_h = "+h+";\n"+
               "  uint8_t "+r+"[] = "+lit+";\n";
-          }) +
+          }).join("\n") +
         "}\n\n";
       }
 

www/blockly/blocks-custom.js

@@ -396,7 +396,7 @@ Blockly.Blocks['device_show_image_offset'] = {
     this.appendValueInput("sprite").setCheck('sprite');
     this.appendValueInput("offset")
         .setCheck("Number")
-        .appendField("x");
+        .appendField("offset");
     this.setTooltip('');
     this.setPreviousStatement(!0);
     this.setNextStatement(!0);
@@ -417,7 +417,7 @@ Blockly.Blocks['device_scroll_image'] = {
     this.appendValueInput("frame offset")
         .setCheck("Number")
         .setAlign(Blockly.ALIGN_RIGHT)
-        .appendField("x");
+        .appendField("frame offset");
     this.appendValueInput("delay")
         .setCheck("Number")
         .setAlign(Blockly.ALIGN_RIGHT)

www/blockly/compiler.ts

@@ -891,12 +891,12 @@ var stdCallTable: { [blockType: string]: StdFunc } = {
   },
   device_scroll_image: {
     f: "scroll image",
-    args: [ "sprite", "x", "delay" ],
+    args: [ "sprite", "frame offset", "delay" ],
     isExtensionMethod: true
   },
   device_show_image_offset: {
     f: "show image",
-    args: [ "sprite", "x" ],
+    args: [ "sprite", "offset" ],
     isExtensionMethod: true
   },
   device_get_button: {

www/blockly/editor.html

@@ -78,13 +78,13 @@
         <block type="math_number">
           <field name="NUM">1</field>
         </block>
-        <block type="device_show_letter">
-          <value name="letter">
-            <block type="text">
-              <field name="TEXT"></field>
-            </block>
-          </value>
-        </block>
+        <!-- <block type="device_show_letter"> -->
+        <!--   <value name="letter"> -->
+        <!--     <block type="text"> -->
+        <!--       <field name="TEXT"></field> -->
+        <!--     </block> -->
+        <!--   </value> -->
+        <!-- </block> -->
         <block type="device_show_number">
           <value name="number">
             <block type="math_number">
@@ -176,14 +176,14 @@
         <!--   </value> -->
         <!-- </block> -->
         <block type="device_show_image_offset">
-          <value name="x">
+          <value name="offset">
             <block type="math_number">
               <field name="NUM">0</field>
             </block>
           </value>
         </block>
         <block type="device_scroll_image">
-            <value name="x">
+            <value name="frame offset">
                 <block type="math_number">
                     <field name="NUM">1</field>
                 </block>