scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 05:52:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
765 commits 90 branches 1006 tags 166 MiB
Commit graph

765 commits

This branch
This branch
All branches
Author SHA1 Message Date
DD Liu
7180b2892a
Merge pull request #339 from heyitsmeuralex/fix-editorconfig-indent 
Fix editorconfig indentation rules
 2018-04-03 10:31:32 -04:00
alex
2397135a3a
Merge branch 'develop' into fix-editorconfig-indent 2018-04-03 01:12:45 +01:00
alex
1bd3e0179b Use 2sp for .yml files 2018-04-03 01:10:27 +01:00
DD
1a2c297c7b bring back eraser after snapshot 2018-04-02 18:50:35 -04:00
DD Liu
0ff5ad991a
Merge pull request #264 from heyitsmeuralex/use-font-playground 
Use sans-serif font in playground
 2018-04-02 11:00:16 -04:00
Jacco Kulman
3a86ffe642
Merge pull request #1 from LLK/develop 
Get my fork up to date
 2018-04-02 09:20:00 +02:00
Paul Kaplan
985d847a89
Merge pull request #353 from paulkaplan/disable-keyboard-shortcuts 
Fix disable keyboard (woops...)
 2018-03-30 13:17:03 -04:00
Paul Kaplan
943d64b437 Fix keyboard disabling 2018-03-30 13:16:11 -04:00
Paul Kaplan
7399d7d8f8
Merge pull request #352 from paulkaplan/disable-keyboard-shortcuts 
Disable keyboard shortcuts because they interfere with text tool
 2018-03-30 13:07:02 -04:00
Paul Kaplan
848aa7e838 Disable keyboard shortcuts because they interfere with text tool 2018-03-30 13:00:11 -04:00
Paul Kaplan
a830e17d35
Merge pull request #347 from paulkaplan/fix-leading 
Fix leading
 2018-03-29 15:59:25 -04:00
Paul Kaplan
769c6560e4 Fix leading 2018-03-29 15:58:22 -04:00
Paul Kaplan
f394ae5d89
Merge pull request #346 from paulkaplan/fix-paper-version 
Update to scratch/paper version
 2018-03-29 15:28:53 -04:00
Paul Kaplan
57d6a9866f Update to scratch/paper version 2018-03-29 15:28:23 -04:00
Paul Kaplan
8e13c59b8f
Merge pull request #345 from paulkaplan/scratch-svg-text 
Text follow ups: don't strip newlines and use Scratch default size/font
 2018-03-29 13:39:38 -04:00
Paul Kaplan
449192ebb3 Remove the preprocessing step of stripping newlines. 
It does not seem to be required anymore: I'm no longer seeing errors
from the watermelon.

It was breaking multiline text import from scratch 2 SVGs which use
newlines.
 2018-03-29 11:46:56 -04:00
Paul Kaplan
5c0219e745 Use scratch 2 default font 2018-03-29 11:46:02 -04:00
Paul Kaplan
b1447b01da
Merge pull request #335 from Jacco/issue/219 
Redraw select bounding box controls on zooming #219
 2018-03-28 08:58:40 -04:00
Paul Kaplan
42abd4a33c
Merge pull request #336 from Jacco/issue/179 
Line connect guide size remains same when zooming #179
 2018-03-28 08:58:15 -04:00
Andrew Sliwinski
601433e2d1
Merge pull request #341 from Jacco/issue/340 
Added .md files from scratch-vm Fixes #340
 2018-03-28 08:52:52 -04:00
Paul Kaplan
d9587ba8d7
Merge branch 'develop' into issue/219 2018-03-28 08:51:54 -04:00
Jacco Kulman
fb577b0882 Added .md files from scratch-vm Fixes #340 2018-03-27 16:45:27 +02:00
alex
f5e17adad3 Fix editorconfig indentation rules 2018-03-26 17:17:29 +01:00
alex
ef78584045 Fix codestyle 2018-03-26 17:12:28 +01:00
Paul Kaplan
e5c6886664
Merge pull request #333 from fsih/textEdit 
Text edit
 2018-03-26 11:32:28 -04:00
Paul Kaplan
8463c4eacd
Merge pull request #327 from fsih/textTool 
Text tool
 2018-03-26 11:31:42 -04:00
Paul Kaplan
af2c49e639 Fix double clicking to enter edit mode and clearing selection. 
The first was caused by the "lastMode" flag being stored after the
double click edit was done, causing it to immediately exit edit mode.
The second problem was that the selection should be cleared when
entering edit mode on another text area.
 2018-03-26 11:23:55 -04:00
Jacco Kulman
5593b03074 Added the setSelectedItems call for wheel zooming 2018-03-26 16:40:59 +02:00
Jacco Kulman
a98ba28152 Fix 2 TRAVIS errors (whitespace, let) 2018-03-26 14:53:33 +02:00
Jacco Kulman
f707af70fd When removing a hole, the parent should be reduced before fillColor is set 2018-03-26 13:46:25 +02:00
Jacco Kulman
0198265fb8 The radius of the circle is now divided by paper.view.zoom, and the strokeWidth also. (Fixes #179) 2018-03-26 13:30:11 +02:00
Jacco Kulman
3afd232aea Call setSelectedItems from zoom functions (Fixes #219) 2018-03-26 12:59:26 +02:00
DD
b98708ff70 Make clicking outside of the canvas activate select mode. This way the user can change the fill color easily, instead of the text getting deselected as soon as they click fill. 2018-03-22 17:56:54 -04:00
DD
6bfc3f23df Don't apply outline to text by default 2018-03-22 17:53:17 -04:00
DD
865554d7f3 lint 2018-03-22 17:20:39 -04:00
DD
3782d5ad6e Add missing file 2018-03-22 16:22:38 -04:00
DD
b1d5111ed4 fix lint 2018-03-22 16:22:24 -04:00
DD
28da99bb05 Check for text area in a better way 2018-03-22 15:26:43 -04:00
DD
baf628c5c9 Detect view bounds changes and update the edit text matrix in response 2018-03-22 15:23:51 -04:00
DD
0c4f545326 Add transform when zoomed in 2018-03-22 14:34:46 -04:00
DD
c75d3f63ba Add undo 2018-03-22 14:31:03 -04:00
DD Liu
86ee3d8cdd Edit text moves with text transform 2018-03-22 11:07:10 -04:00
DD
1d29a7dceb Showing text on top of other text 2018-03-20 17:26:27 -04:00
DD
da0864b81b Add a text edit area 2018-03-20 14:47:14 -04:00
DD
cbd2a89cd0 Merge branch 'develop' into textTool 2018-03-20 14:16:47 -04:00
DD Liu
724fe85645
Merge pull request #325 from fsih/unfocusText 
Unfocus text fields when canvas clicked and don't take keystrokes in canvas when text fields are focused
 2018-03-20 14:06:59 -04:00
DD
1c093df92b Only unblur inputs if you clicked on the paper canvas 2018-03-20 11:03:41 -04:00
DD
44eedfe225 Remove unnecessary changes 2018-03-19 14:50:05 -04:00
DD
b4294b8268 Merge branch 'develop' into textTool 2018-03-19 12:43:44 -04:00
DD
242ee0d6c7 Unfocus text fields when canvas clicked 2018-03-19 12:40:58 -04:00