scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-26 23:42:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
247 commits 91 branches 1012 tags 171 MiB
Commit graph

247 commits

This branch
This branch
All branches
Author SHA1 Message Date
DD Liu
7705be1ce0 Merge pull request #65 from fsih/yaml3 
Attempt 3 at fixing npm deploy
 2017-10-16 11:28:42 -04:00
DD
f2bf86881e remove json dep 2017-10-16 11:28:06 -04:00
DD
1681d36ed5 attempt 3 2017-10-16 11:26:55 -04:00
DD Liu
01f91f16b4 Merge pull request #64 from fsih/yaml2 
Append version number to npm deploy to fix npm deploy
 2017-10-16 11:07:57 -04:00
DD
7c84e5b418 Revert "Revert "Add before deploy script that appends version"" 
This reverts commit 32881a984e.
 2017-10-16 11:01:50 -04:00
DD
0842da0458 add json dep 2017-10-16 11:01:07 -04:00
DD Liu
9b72eceee8 Merge pull request #63 from LLK/revert-62-yaml 
Revert "Add before deploy script that appends version"
 2017-10-16 10:49:11 -04:00
DD Liu
32881a984e Revert "Add before deploy script that appends version" 2017-10-16 10:48:25 -04:00
DD Liu
2d7860f495 Merge pull request #62 from fsih/yaml 
Add before deploy script that appends version
 2017-10-16 10:40:46 -04:00
DD
cdac361cc8 add before deploy with version 2017-10-16 10:30:29 -04:00
Paul Kaplan
fb11d5dd5e Merge pull request #59 from paulkaplan/color-picker 
Color picker
 2017-10-16 08:52:09 -04:00
DD Liu
f2e090e293 Merge pull request #57 from fsih/convertDep 
Use scratch fork of paper
 2017-10-14 19:34:19 -04:00
Paul Kaplan
e2e4823642 Fix with feedback from DD 2017-10-13 14:24:07 -04:00
Paul Kaplan
452ded76e3 Merge pull request #58 from paulkaplan/react-16 
Update to react 16
 2017-10-13 13:59:46 -04:00
Paul Kaplan
3eaf8047aa Initial prototype of color picker 2017-10-13 13:34:25 -04:00
Paul Kaplan
8ffb95c02d Fix node env issue 2017-10-13 13:33:04 -04:00
Paul Kaplan
1d6e854e4a Update to react 16 2017-10-13 13:27:49 -04:00
DD
4077fe828c use scratch fork of paper 2017-10-12 18:35:30 -04:00
DD
4001a24bf5 Limit to develop branch 2017-10-12 17:20:30 -04:00
DD
828279db6a add deploy to npm 2017-10-12 17:10:17 -04:00
DD Liu
0f2d485f98 Merge pull request #54 from fsih/readme 
Add readme
 2017-10-12 15:41:22 -04:00
DD
f65f51d3a0 add readme 2017-10-12 12:05:38 -04:00
DD Liu
19eeeff018 Merge pull request #52 from fsih/fixDrag 
Fixes the bounding box bounding an area much larger than the sprite after dragging it in select mode.
Fixes the pieces of a grouped sprite drifting apart as it is moved around in select mode.
 2017-10-12 11:32:56 -04:00
DD
ae3c0f1eed Fix lint 2017-10-12 11:28:23 -04:00
DD
64c6ddedaf Fix bugs during select and drag 2017-10-12 11:28:23 -04:00
DD Liu
e79faa79d1 Merge pull request #51 from fsih/fixImport 
Fix import
 2017-10-12 11:26:14 -04:00
DD Liu
f7a5111950 Merge pull request #48 from fsih/addUndo 
Add undo/redo
 2017-10-12 11:25:31 -04:00
DD
9242faffa6 fix typo 2017-10-12 11:23:35 -04:00
DD
49b197eba2 Revert "remove the default imported costume" 
This reverts commit 879297ca95640b41e3e1fbe989a6323912bd7470.
 2017-10-12 11:23:35 -04:00
DD
1d0ffef40f Revert "Make unimplemented buttons grey" 
This reverts commit c320a0b6416887b916853d6265cc123bca776b57.
 2017-10-12 11:23:35 -04:00
DD
affe8463be fix undo removes cursor preview 2017-10-12 11:23:35 -04:00
DD
4d9ecb2a2c fix lint 2017-10-12 11:23:35 -04:00
DD
4d0e2b4c44 remove the default imported costume 2017-10-12 11:23:35 -04:00
DD
01d1ddec9d Make unimplemented buttons grey 2017-10-12 11:23:35 -04:00
DD
87eb78ad49 update stage on undo and redo 2017-10-12 11:23:35 -04:00
DD
7523af09f0 add missing file 2017-10-12 11:23:35 -04:00
DD
345a43e127 merge onUpdateSvg and undoSnapshot 2017-10-12 11:23:35 -04:00
DD
4300924671 clean up unused things in selection so I dont have to add undo to them 2017-10-12 11:23:35 -04:00
DD
28464b237b call undo 2017-10-12 11:23:35 -04:00
DD
8baf731328 add undo reducer 2017-10-12 11:22:40 -04:00
DD
cb34c29db6 Fix some issues with import not centering costume 2017-10-11 17:48:21 -04:00
DD Liu
582ab61665 Merge pull request #45 from fsih/colorChanger 
Selection updates color indicators, and color indicators update selection
 2017-10-11 14:41:51 -04:00
DD
f7cd7fc54d fix function 2017-10-11 11:58:05 -04:00
DD
ab244a5e4c convert getSelectedItems(recursive) to 2 functions 2017-10-11 11:32:51 -04:00
DD
df8c3f66e3 attempt 2 at trying to get tests to work on travis 2017-10-06 14:00:50 -04:00
DD
c67370ab80 attempt 1 at trying to get tests to work on travis 2017-10-06 13:55:28 -04:00
DD
8d405b586d Merge branch 'develop' into colorChanger 2017-10-06 13:32:33 -04:00
DD Liu
b06e2b5da0 Merge pull request #15 from fsih/reshape 
Add reshape tool
 2017-10-06 13:30:58 -04:00
DD
251c10b839 Merge branch 'develop' into reshape 2017-10-06 13:25:18 -04:00
DD
5efce49463 Merge branch 'develop' into reshape 2017-10-06 13:20:15 -04:00