Commit graph

167 commits

Author SHA1 Message Date
TheBrokenRail
ec2361cf91 Fix IE/Edge Support () 2017-02-18 14:06:45 -05:00
Chris Willis-Ford
2463d2c50a Merge pull request from cwillisf/fix-cachalot
SVG: compensate for viewbox offset
2017-02-17 10:25:46 -08:00
Ray Schamp
c146debde8 Merge pull request from LLK/revert-82-feature/fencing
Revert "Feature fencing"
2017-02-15 09:39:38 -05:00
Ray Schamp
42e5e724c2 Revert "Feature fencing" 2017-02-15 09:38:23 -05:00
Andrew Sliwinski
ac34ba7a13 Merge pull request from LLK/greenkeeper/tap-10.1.1
Update tap to the latest version 🚀
2017-02-14 20:59:15 -05:00
Chris Willis-Ford
393efdd3ae Merge pull request from griffpatch/feature/fencing
Feature fencing
2017-02-14 16:54:02 -08:00
Christopher Willis-Ford
959c635f58 SVG: compensate for viewbox offset
In Scratch 2.0, an SVG costume's origin is stored relative to that SVG's
viewbox. In order to use the origin values correctly, then, we need to
compensate for the viewbox offset.
2017-02-14 15:59:45 -08:00
greenkeeper[bot]
9e53d1c53d chore(package): update tap to version 10.1.1
https://greenkeeper.io/
2017-02-14 19:26:35 +00:00
Ray Schamp
18e4fedaf5 Merge pull request from LLK/greenkeeper/babel-loader-6.3.0
Update babel-loader to the latest version 🚀
2017-02-14 10:54:39 -05:00
greenkeeper[bot]
626369a5d9 chore(package): update babel-loader to version 6.3.0
https://greenkeeper.io/
2017-02-14 09:20:58 +00:00
griffpatch
b39bb4d3fd Fencing Take 3
Refactor to accept and return a position as an array of ints [x, y]
2017-02-14 09:08:32 +00:00
griffpatch
1a3e9845d0 Merge remote-tracking branch 'refs/remotes/LLK/develop' into feature/fencing 2017-02-14 08:30:42 +00:00
griffpatch
100625c6d7 Fencing 2017-02-14 08:30:07 +00:00
griffpatch
fea7643e7e rename fencing method 2017-02-11 14:23:05 +00:00
Chris Willis-Ford
4d8b5da491 Merge pull request from CSnap/fix_SkinMeasurements
Initialize Measurement
2017-02-10 12:04:54 -08:00
Chris Willis-Ford
fd4ef087d5 Merge pull request from LLK/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2017-02-10 11:42:13 -08:00
Christopher Willis-Ford
8087dca4a9 docs(readme): clean up badges 2017-02-10 11:36:57 -08:00
SillyInventor
dc53feaf41 Initialize Measurement 2017-02-10 14:21:45 -05:00
Chris Willis-Ford
a0b3a687cd Merge pull request from griffpatch/bug/alphaChannelConversion
Bug alphachannelconversion
2017-02-09 07:49:56 -08:00
griffpatch
4e21184854 Lint Issues
Comments too long
2017-02-09 10:04:48 +00:00
griffpatch
aa993779bb Feature - Fencing of drawables
Provide a method in the scratch-render to return the fenced coordinates
of a drawable moving to a given position.
2017-02-09 09:56:27 +00:00
griffpatch
fd2b86ea7a Merge remote-tracking branch 'refs/remotes/LLK/develop' into feature/fencing 2017-02-09 08:55:32 +00:00
griffpatch
4dba5db28d Alpha channel conversion
I wasn't so clever with this - I'm sorry. Now that I have managed to
link up my local render & vm projects I am able to fix the issue
properly. Many appologies!
2017-02-09 08:36:57 +00:00
Ray Schamp
35803dcfc9 Merge pull request from rschamp/bugfix/73-retina-size
Fix SVG size calculation
2017-02-07 13:58:47 -05:00
Ray Schamp
9a8f4f2a88 Fix SVG size calculation
It was being incorrectly calculated based on devicePixelRatio.

Fixes . Thanks to @cwillisf for figuring it out!
2017-02-07 10:48:47 -05:00
Christopher Willis-Ford
805ec54f57 chore: adapt code for Webpack 2 2017-02-03 11:01:29 -08:00
greenkeeper[bot]
187a783e74 docs(readme): add Greenkeeper badge
https://greenkeeper.io/
2017-02-02 17:25:31 +00:00
greenkeeper[bot]
549f596195 chore(package): update dependencies
https://greenkeeper.io/
2017-02-02 17:25:30 +00:00
griffpatch
3e476e2d25 Merge remote-tracking branch 'refs/remotes/LLK/develop' into develop 2017-01-28 13:53:08 +00:00
Andrew Sliwinski
c3c7bb28ae Merge pull request from griffpatch/develop
Bug in alpha channel conversion
2017-01-27 10:58:38 -05:00
griffpatch
6f5acfee7b Bug in alpha channel conversion
This is groundwork required by the issue:
https://github.com/LLK/scratch-vm/issues/393
2017-01-27 12:26:11 +00:00
Chris Willis-Ford
9841de85f1 Merge pull request from CSnap/clear_fix
Clear Button Fix
2017-01-25 09:51:57 -05:00
Ray Schamp
2fc9005c60 Merge pull request from rschamp/bugfix/new-skins-without-rotationCenter
Calculate rotation center if it's not supplied
2017-01-25 09:43:24 -05:00
Ray Schamp
bf2863921c Carry rotationCenter assignment to create*Skin 2017-01-25 09:29:29 -05:00
Ray Schamp
c478ebec35 Use explicit rotationCenter argument
This is more explicit than the previous behavior, and more in line with the way we supply the costumeResolution
2017-01-25 09:28:58 -05:00
SillyInventor
ea786aa4bd set canvas to dirty when clearing pen canvas 2017-01-24 19:44:47 -05:00
Chris Willis-Ford
abd76720ee Merge pull request from cwillisf/pen
Pen
2017-01-20 13:21:54 -08:00
Christopher Willis-Ford
5eef82a9dc Add missing jsdoc for _setAttributes on PenSkin 2017-01-20 13:16:22 -08:00
Christopher Willis-Ford
3bdb1fff1f Small changes & fixes from VM integration
Changes include:
- Implement pen clear
- Upack pen-related location parameters
- Fix inverted vertical position on pen actions
- Remove canvas debug content
- Set `strokeStyle` instead of `fillStyle`
- Remove location parameter from stamp operation: always stamp in place
2017-01-19 11:22:32 -08:00
Andrew Sliwinski
ce5a3b8ad6 Merge pull request from thisandagain/bugfix/oss
Add Contribution Guidelines and Issue / PR Templates
2017-01-18 08:23:28 -05:00
Andrew Sliwinski
f393d86b8e Improve contribution guidelines and issue/pr templates 2017-01-17 17:07:12 -05:00
Chris Willis-Ford
a4b863e464 Merge pull request from cwillisf/fix-webpack-dev-server
Fix webpack dev server
2017-01-13 13:31:45 -08:00
Ray Schamp
875a5a3ec1 Calculate rotation center if it's not supplied
When a new skin is added, previously the rotation center was set to `[0, 0]`.  In the case of costumes and backdrops added from libraries, the center should be calculated from the bounding box of the imported skin.

Toward 
2017-01-13 13:10:20 -05:00
Chris Willis-Ford
51e8aa9b1a Merge pull request from cwillisf/skin-classes
Move `Skin` functionality out of `Drawable` into its own classes
2017-01-12 10:57:07 -08:00
Christopher Willis-Ford
1531ea8ae6 Fix outdated method of collecting size 2017-01-11 10:05:36 -08:00
Christopher Willis-Ford
f7fd05cfba Use skin-relative coordinates for Pen actions 2017-01-10 15:22:33 -08:00
Christopher Willis-Ford
f5af954acb Webpack config cleanup, fix dev server
This change tweaks the expression of paths in the Webpack config to make
`webpack-dev-server` work again. This opened the door for some minor
cleanup of `path` & `filename` in the `output` configuration entries.
Thanks to @rschamp for help resolving the `webpack-dev-server` problems.
2017-01-10 14:55:07 -08:00
Christopher Willis-Ford
c2ca8d2a84 Add source maps to Webpack config 2017-01-10 14:39:47 -08:00
Christopher Willis-Ford
78c0d09c72 Flip y coordinate for internal renders
Scratch uses y=up, whereas WebGL and the Canvas element both use y=down.
To make this work, we set a non-conventional projection matrix when
rendering to the stage. Some of the internal renders (touching color,
stamp, etc.) were using a y-flipped projection matrix, though, which
means that the output was double-flipped and would appear incorrect. For
the touching-color block this just meant a cosmetic issue: the debug
canvas looks upside-down. For pen stamp, though, it's a real issue since
the stamp was appearing upside down on the stage.

This change ensures that the projection matrix for every internal render
follows WebGL / Canvas conventions, and that we only y-flip on the final
render to the stage.
2017-01-10 12:56:32 -08:00
Christopher Willis-Ford
f29ed34ddc Implement pen point, line, and stamp
Also clean up the code around our calls to `readPixels`:
- Use `Uint8Array` instead of `Buffer` to hold the pixels
- Use `ImageData.data.set` instead of a `for` loop when copying pixels
  to a canvas
2017-01-10 11:47:45 -08:00