scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-25 06:52:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1641 commits 90 branches 1009 tags 169 MiB
Commit graph

1641 commits

This branch
This branch
All branches
Author SHA1 Message Date
DD Liu
6d11c9988a
Merge pull request #356 from fsih/eraserDisappears 
Bring back eraser after snapshot
 2018-04-09 13:25:12 -04:00
Jacco Kulman
0753b7ccc1 Added a comment (TRAVIS took wrong version) 2018-04-07 08:42:32 +02:00
Jacco Kulman
d0536be3ae Fixes (const instead of let) to satisfy TRAVIS 2018-04-07 08:25:33 +02:00
Jacco Kulman
b7f0551fac Fixes (whitespace, semicolons) to satisfy TRAVIS 2018-04-07 08:20:59 +02:00
Jacco Kulman
e64f015489 Replace png background with vector version 2018-04-07 07:59:52 +02:00
DD
15053d15f0 convert to vector on button press 2018-04-06 16:57:59 -04:00
DD
94ae07f1f2 Bitmap button rasterizes 2018-04-06 16:23:43 -04:00
DD Liu
57ca54f7a5
Merge pull request #367 from fsih/fixTextNudge 
Fix text nudge
 2018-04-06 16:15:48 -04:00
DD
f995f30e37 Button toggles on switch format 2018-04-06 11:52:34 -04:00
DD
436bad4826 fix nudge 2018-04-06 10:57:40 -04:00
DD
08465826fb Merge branch 'convertToBitmap' of github.com:fsih/scratch-paint into convertToBitmap 2018-04-05 18:07:42 -04:00
DD
2b8c291765 Add format reducer 2018-04-05 18:06:37 -04:00
DD
e6b151c41f Re-enable convert to bitmap button 2018-04-05 18:04:29 -04:00
DD
c6d886ff1e Re-enable convert to bitmap button 2018-04-05 17:51:10 -04:00
DD
82d2e30cae Add raster layer 2018-04-05 17:37:40 -04:00
DD
0bf2355cbc Make raster not blurry on zoom 2018-04-05 17:37:19 -04:00
DD Liu
83c84027b7
Merge pull request #364 from fsih/removeUnused 
Remove unneeded applyMatrix
 2018-04-04 15:00:49 -04:00
DD
aff5866391 Remove unneeded applyMatrix 2018-04-04 14:50:11 -04:00
DD Liu
2e5aee5ff5
Merge pull request #359 from Jacco/issue/332 
Issue/332 Rotate-tool fix
 2018-04-04 14:42:19 -04:00
Jacco Kulman
c0c3531e4c Fixed issue with simplification 2018-04-04 19:36:58 +02:00
DD Liu
6c6d3a8bfb
Merge pull request #337 from Jacco/issue/301 
Reduce target when fill hole with same color #301
 2018-04-03 18:56:58 -04:00
DD
2b840c2f47 Add ability to fill transparent text 2018-04-03 18:21:12 -04:00
Jacco Kulman
c9d5b7d3a7 Ungrouping should not reduce CompoundPaths with 1 child 2018-04-03 23:12:24 +02:00
Jacco Kulman
e4c73da4ba Trailing space removed (Travis fix) 2018-04-03 22:54:36 +02:00
Jacco Kulman
f544a5e1f6 Simplification wwas incomplete 2018-04-03 22:36:49 +02:00
Jacco Kulman
ffc1da3b8e Rotation tool shift fix + simplification 2018-04-03 22:32:46 +02:00
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