Commit graph

611 commits

Author SHA1 Message Date
rachel-fenichel
0ccdf83e18 Merge pull request #52 from rachel-fenichel/feature/horizontal_flyout
Horizontal flyout rendering
2016-02-11 11:03:05 -08:00
Rachel Fenichel
e00fb1a590 Style fixes 2016-02-11 11:01:46 -08:00
Rachel Fenichel
193ff8de45 Merge branch 'feature/horizontal_flyout' of https://github.com/rachel-fenichel/scratch-blockly into feature/horizontal_flyout 2016-02-10 17:14:49 -08:00
Rachel Fenichel
39b4980867 horizontal flyout rendering. 2016-02-10 17:09:20 -08:00
Rachel Fenichel
0890596f15 horizontal flyout rendering. 2016-02-10 15:32:19 -08:00
Ray Schamp
66dd1868ec Merge pull request #51 from rschamp/bugfix/event-generator
Add generator file for event blocks
2016-02-10 16:06:04 -05:00
Ray Schamp
326f5e83a0 Update authors 2016-02-10 16:05:24 -05:00
Ray Schamp
ba63247e9d Fix comments for Scratch generators 2016-02-10 14:43:10 -05:00
Ray Schamp
f0b8862680 Add generator file for event blocks
Resolves #50
2016-02-10 14:38:22 -05:00
rachel-fenichel
c70edbb8f3 Merge pull request #49 from rachel-fenichel/feature/horizontal_playground
Generate both horizontal and vertical versions of blockly
2016-02-10 10:55:32 -08:00
Ray Schamp
d327202f33 Merge pull request #48 from rschamp/feature/rounded-notch-corners
Round notch corners
2016-02-10 10:19:38 -05:00
Ray Schamp
f5e129b3c1 Fix radius value 2016-02-10 10:18:57 -05:00
Ray Schamp
b41ac824aa Simplify rounded corners, make them circular 2016-02-10 10:16:13 -05:00
Ray Schamp
07f6df14f3 Document NOTCH_BASE_HEIGHT vs NOTCH_HEIGHT 2016-02-10 10:16:13 -05:00
Ray Schamp
e2c8d61399 Round notch corners
The rounding adds some height to the notch, so this is compensated by removing height from the notch "tab". For this reason the radius should stay relatively small.
2016-02-10 10:16:13 -05:00
Ray Schamp
8a415abdf1 Merge pull request #47 from rschamp/feature/rounded-hats
Round corners for hat/end blocks
2016-02-10 10:11:02 -05:00
Rachel Fenichel
c6edc7b4ba Remove old blockly_compressed and blockly_uncompressed files 2016-02-09 15:55:22 -08:00
Rachel Fenichel
62fd8f0f7e Generate both horizontal and vertical versions of blockly; set up playgrounds for each. 2016-02-09 15:53:14 -08:00
Ray Schamp
0f0567866a Round corners for hat/end blocks
Resolves #42
2016-02-09 16:54:35 -05:00
rachel-fenichel
ce875d0a94 Merge pull request #45 from rachel-fenichel/feature/iconic_toolbox
Optionally show icons instead of names for toolbox categories
2016-02-09 11:01:29 -08:00
Ray Schamp
a8d3ca7df3 Merge pull request #46 from thisandagain/feature/rendering
WIP - Horizontal block rendering
2016-02-09 12:07:57 -05:00
Rachel Fenichel
5692ddb591 optionally show icons instead of names for toolbox categories 2016-02-08 17:20:28 -08:00
rachel-fenichel
995d85e353 Merge pull request #25 from LLK/horizontal_toolbox
Horizontal toolbox layout and option to enable it.
2016-02-08 10:43:18 -08:00
rachel-fenichel
1c5b58ca83 Merge pull request #26 from rachel-fenichel/bugfix/horizontal_scrollbar
Fix scrollbar visibility when horizontal
2016-02-08 10:42:56 -08:00
Andrew Sliwinski
b8601656e0 Remove grid from playground 2016-01-28 20:42:57 -05:00
Andrew Sliwinski
d4a364e2b5 WIP horizontal block rendering 2016-01-28 20:30:35 -05:00
Andrew Sliwinski
461aac0a3d WIP block rendering 2016-01-28 16:58:42 -05:00
Andrew Sliwinski
dcf2be4fa3 Initial generators 2016-01-28 15:12:30 -05:00
Andrew Sliwinski
914ad369c3 WIP horizontal rendering 2016-01-27 15:54:48 -05:00
Andrew Sliwinski
2534a2514e WIP horizontal rendering 2016-01-27 15:44:58 -05:00
Andrew Sliwinski
df8955089f WIP on horizontal block rendering 2016-01-27 14:12:37 -05:00
Rachel Fenichel
6ec77a597a Fix scrollbar visibility when horizontal 2016-01-27 08:20:26 -08:00
Andrew Sliwinski
113b91d659 Additional block rendering progress. 2016-01-26 16:20:33 -05:00
Rachel Fenichel
1672e28f12 Horizontal toolbox layout and option to enable it. 2016-01-26 12:35:50 -08:00
Andrew Sliwinski
6a708da899 Initial SVG rendering modifications. 2016-01-26 14:57:43 -05:00
Neil Fraser
dc1f03a168 Merge pull request #231 from carlosperate/toolbox_nodes
Allow XML DOM nodes to be injected as toolbox in IE
2016-01-08 15:13:47 -08:00
Neil Fraser
b1b96e45db Merge pull request #228 from google/2016
Update from 2016 dev branch.
2016-01-08 14:03:22 -08:00
Neil Fraser
80f36f0629 Clean up for demo apps. 2016-01-08 13:58:18 -08:00
Neil Fraser
4253de041a Remove old realtime. 2016-01-08 13:03:22 -08:00
Neil Fraser
3bce368115 Simplify workspace options by removing svg property. 2016-01-07 17:01:01 -08:00
carlosperate
bda78da155 Allow nodes input to toolbox injection in IE 2016-01-05 00:56:57 +00:00
Neil Fraser
1facefc3cf Support Python 3 (and 2) 2016-01-04 14:38:41 -08:00
Neil Fraser
9746650aee Disable comment creation in IE. 2016-01-04 12:05:41 -08:00
Neil Fraser
554244fd35 Allow string hues. 2015-12-18 19:45:39 -08:00
Neil Fraser
c374827204 Routine recompile. 2015-12-17 15:38:50 -08:00
Neil Fraser
15a18b7d9f Merge remote-tracking branch 'origin/2016' into 2016
# Conflicts:
#	msg/json/en.json
2015-12-17 15:36:46 -08:00
Neil Fraser
19c71573b7 Update messages.
Remove unused PROCEDURES_CALLNORETURN_CALL.  Add
PROCEDURES_DEFNORETURN_COMMENT and PROCEDURES_IFRETURN_HELPURL.
2015-12-17 15:34:23 -08:00
Madeeha
7d48f253e6 changing the controls_if_if block to allow controls_if_elseif and controls_if_else blocks to attach to the bottom of the if block instead of in the middle of the block. 2015-12-17 15:29:50 -08:00
Neil Fraser
8738da0def Merge branch 'master' into 2016 2015-12-17 14:25:35 -08:00
Neil Fraser
a5ea93a1db Allow comments in flyouts. 2015-12-17 14:16:04 -08:00