957 Commits

Author SHA1 Message Date
eef85c57b7 release: version 0.8.2 2016-08-16 01:11:07 +02:00
d4e9b1e896 Merge pull request #516 from juliandescottes/feature-drag-selection
Feature drag selection
2016-08-16 01:10:18 +02:00
8e3ac50f81 Issue #290: cleanup unused code in SelectionManager 2016-08-16 01:04:55 +02:00
f4cbabe2ce Issue #290: selection tools: clear hasSelection flag when calling commitSelection 2016-08-16 00:40:01 +02:00
69393127fa Issue #290: rename dismissSelection to commitSelection 2016-08-16 00:40:01 +02:00
fc7fc6d9b0 Issue #290: Fix typo in comment 2016-08-16 00:40:01 +02:00
01aa4629cc Issue #290: Commit selection on ENTER 2016-08-16 00:40:01 +02:00
22797e5dc5 Issue #290: add missing parameter to dismissSelection in BaseSelect 2016-08-16 00:40:01 +02:00
0d5dc21a41 Issue #290: change boolean flag name to isMovingContent in BaseSelect 2016-08-16 00:40:01 +02:00
0d1210e71f Issue #290: fix wand cursor hotspot 2016-08-16 00:40:01 +02:00
34f2a9df0b Issue #163: show highlighter pixel for selection tools when no selection 2016-08-16 00:40:01 +02:00
a383e59280 Issue #290: allow to drag selection when using SHIFT while selection 2016-08-16 00:40:01 +02:00
230f1b23fc Merge pull request #518 from epicabsol/icontweaks
Cursor tweaks
2016-08-06 18:45:40 +02:00
77ccd60e77 Renamed lighten cursor
lighting.png -> lighten.png
2016-08-06 09:23:05 -07:00
5014937392 Merge pull request #517 from epicabsol/master
Correct desktop window icon
2016-08-06 13:08:26 +02:00
17e6cf9b38 Dither & stroke cursors
Added dither and stroke cursors. The line on the stroke cursor is quite
hard to see, but I think that's pretty unaviodable. I would suggest
moving to a larger cursor size.
2016-08-05 22:32:24 -07:00
d795c297f5 Lighting cursor, more tweaks
Added an icon for the lighting tool, although it's somewhat difficult to
see what it is without looking closely. I'd love to hear other ideas for
a cursor. (See juliandescottes/piskel#351)
I also reworked the hit point of the existing cursors by a few pixels.
2016-08-05 21:34:46 -07:00
f4bf053564 Reworked circle drawing cursor
Reworked circle drawing cursor to match the style of the rectangle
cursor.
2016-08-05 20:33:18 -07:00
d10c284436 Correct desktop window icon filename
I found the logo at dest/prod/logo.png, while there was no
dest/logo.png. Fixes juliandescottes/piskel#515
2016-08-05 19:06:49 -07:00
fdd4fb5b4e only update zoom for a valid modifier, fix zoom centering bug when using keyboard shortcuts 2016-07-30 00:01:32 +02:00
3e7999cfc5 Merge pull request #385 from smiegrin/master
Introduces zooming towards/away from mouse
2016-07-28 09:39:18 +02:00
f4c860ddfa Consolidates zooming into single function. 2016-07-26 09:28:18 -06:00
2dee5fcad1 Merge pull request #512 from juliandescottes/fix-move-viewport
Fix viewport shaking on touchmove event on mobile/tablet
2016-07-26 12:20:06 +02:00
4895017ebb Fix viewport shaking on touchmove event on mobile/tablet 2016-07-26 12:13:49 +02:00
81b1bca7f5 Merge branch 'master' of https://github.com/juliandescottes/piskel 2016-07-25 14:40:58 -06:00
0b1ec655ae retina: update lasso & shape select icons 2016-07-25 09:32:50 +02:00
144cf4b7de release: set version to 0.9.0-SNAPSHOT 2016-07-24 19:42:46 +02:00
a778cbb787 release: version 0.8.1 2016-07-24 19:25:15 +02:00
94b781a2e5 Merge pull request #510 from juliandescottes/scroll-selected-layer
Issue #502: scroll selected layer into view when redrawing layer list
2016-07-24 19:22:17 +02:00
ba56a32b88 Issue #502: scroll selected layer into view when redrawing layer list 2016-07-24 19:21:07 +02:00
fc0521784b Merge pull request #509 from juliandescottes/retina-icons
retina icons
2016-07-24 19:19:15 +02:00
a96bc0c72f retina icons 2016-07-24 17:06:47 +02:00
f49a9fd588 chore: update nwjs to 0.15.4 2016-07-23 00:23:07 +02:00
872afd17f7 Merge pull request #508 from leereilly/alt-option-button-osx
Replace 'alt' buttons with 'option' buttons on Macs?
2016-07-22 13:55:28 +02:00
89c4044016 Replace 'alt' buttons with 'option' buttons on Macs 2016-07-20 12:35:05 -06:00
782939039d release: set version to 0.9.0-SNAPSHOT 2016-07-10 15:56:50 +02:00
db62daccf9 release: release version 0.8.0 2016-07-10 14:14:29 +02:00
0bc7f3bc05 dev env: automatically remove fake header from desktop builds 2016-07-10 13:59:11 +02:00
4518f50efa consider layer with opacity=0 as transparent 2016-07-04 00:23:03 +02:00
01a0bcf13c extract dev header to separate template 2016-07-03 15:40:04 +02:00
94a9a1495f chore: update grunt-nw-builder to 2.0.3 (finally fixes osx app issue!) 2016-07-03 00:32:33 +02:00
cd36a57a1a export controller: add synchronized rows input, remove poweroftwo checkbox 2016-07-02 16:49:17 +02:00
b39b3befa1 Merge pull request #487 from code-dot-org/piskel-on-npm
Prepare for npm publishing
2016-06-22 12:08:31 +02:00
93055f4b4a Prepare for npm publishing
Introduces some small package changes that simplify publishing Piskel to NPM as a ready-to-use application.

Since Piskel is not simply a JavaScript "module" (not something one would 'require' into another application) its role as a package on npm is somewhat unconventional - it contains the release build of Piskel, ready to serve as a static website, and a small `piskel-root` utility that will print the absolute path to that content (which will have been installed who-knows-where by npm).

Mostly this works by adding the "files" and "bin" entries to package.json, and by adding an .npmignore file (which simply prevents npm from using your .gitignore and ignoring the built files that we want to ship).

With these settings in place you could publish to npm anytime (as long as you have permission) but I've added `preversion` and `postversion` scripts to simplify and automate the process.  Here's how you publish a release:

```
npm login # If not already logged in
npm version [major|minor|patch|<other>] # see `npm help version` for more options
```

By itself this will lint, run the full test suite, do a release build, make sure the working directory is clean, bump the version number in package.json, commit the version number change and add a git tag with the new version, push the new version to GitHub and publish the release build output to npm.

If you don't have an npm account, create one at npmjs.com.  You'll need to do the initial release.

An npm user should then be able to download the latest Piskel release by running `npm install piskel`.  They could then find the location of Piskel's index.html by running `` `npm bin`/piskel-root `` (perhaps more useful for automation purposes... our own build copies the built Piskel release from its npm-installed location to a directory where it gets served by Rails).

By itself this may not seem _that_ useful, but it's a step toward making Piskel easier to embed with other appilications.  I've got a start on the next big improvement, where a parent application can `require('piskel')` to get an API object that facilitates communication with the editor running within an iframe.  You can see an early version of that at https://github.com/code-dot-org/piskel/pull/7
2016-06-17 17:07:03 -07:00
b1fcc68924 Merge pull request #485 from code-dot-org/import-service
Extract import logic to ImportService
2016-06-17 09:46:32 +01:00
7e112776b6 Use Constants.EMPTY_FUNCTION 2016-06-16 18:13:08 -07:00
efbfeca200 Improved comments 2016-06-16 18:12:13 -07:00
e1cba9f13b Re-adopt ns convention for module definition 2016-06-16 18:09:47 -07:00
e37d93f7f9 Extract import logic to ImportService
Isolates import dialog logic from actual import logic, which makes headless import eaiser to implement.
2016-06-14 18:12:25 -07:00
c49fe4d6a0 Issue #483 - limit zoom to have 10 sprite pixels displayed on screen 2016-06-09 11:05:59 +02:00
c0f0445544 Fix Transform tool CMD modifier on OSX 2016-06-05 00:25:41 +02:00
014a1d418f Merge pull request #482 from juliandescottes/feature-tiled-drawing
Feature tiled drawing
2016-06-04 17:07:28 +02:00
4b8e5ace07 Issue #470: remove references to tiled-preview, rename preferences 2016-06-04 17:03:34 +02:00
5533664900 Issue #470: move the seamless overlay color to Constants.js 2016-06-04 16:58:49 +02:00
21b2261a9d Feature #470: update application settings layout 2016-06-04 16:50:58 +02:00
f2ff3bc74e Feature #470: Tiled drawing improvements 2016-06-04 16:50:58 +02:00
51da3ec80d Merge pull request #481 from juliandescottes/chore-update-package-fields
chore: Update package.json fields
2016-06-04 10:59:14 +02:00
92ab0602ee chore: Update package.json fields 2016-06-04 10:54:21 +02:00
7777be2226 Merge pull request #478 from code-dot-org/fix-peerDependencies
Downgrade grunt to ^0.4.5
2016-06-04 10:31:06 +02:00
30e3b4dd09 Downgrade grunt to ^0.4.5
This eliminates the peerDependencies complaints on `npm install` from
the various grunt plugins being used.  I looked at upgrading the
plugins but several still have no official support for grunt 1+.
2016-06-03 12:21:21 -07:00
3d0d82b5f7 Merge pull request #474 from juliandescottes/feature-spritesheet-options
Add FramesheetRenderer unit test
2016-05-29 22:31:01 +02:00
e6c8c59e81 Add FramesheetRenderer unit test 2016-05-29 22:30:09 +02:00
20fd196321 Merge pull request #473 from juliandescottes/feature-spritesheet-options
Feature spritesheet options
2016-05-29 11:54:28 +02:00
058b6fa333 Issue #293: add FramesheetRenderer unit tests 2016-05-29 11:47:57 +02:00
c8fa83462a Issue #293: remove unused user settings 2016-05-29 11:19:54 +02:00
fae04f3616 Issue #293: use input type number and fix linting issues 2016-05-29 11:06:45 +02:00
169ce21556 Issue #293: Add spritesheet layout options in PNG export tab 2016-05-29 10:45:19 +02:00
5a0d5da5f4 Merge pull request #472 from juliandescottes/export-tabs
Fix #446: Split export panel in tabs
2016-05-23 23:30:07 +02:00
2f295825f2 Issue #446: store selected export tab in user preferences 2016-05-23 22:51:48 +02:00
c63c764060 Issue #446: Improve export panels style consistency 2016-05-23 22:29:20 +02:00
ba8964a2af Issue #446: Cleanup gif export panel 2016-05-23 00:40:23 +02:00
f66c2578ab Issue #446: Add export tabs, move zoom controls 2016-05-22 23:37:28 +02:00
32e701aa55 Move ImageExportController to ExportController and Fix line height for toolbox titles 2016-05-22 15:49:39 +02:00
e272fbe32f Merge pull request #471 from juliandescottes/GMartigny-issue_#447_dirty_state_on_replace
G martigny issue #447 dirty state on replace
2016-05-22 15:09:57 +02:00
aa9c1659fc Issue #447: apply review comments 2016-05-22 15:05:22 +02:00
58d491cb53 Update test
Still have to be fixed
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-05-22 15:03:47 +02:00
58a1a6b043 Dirty status compare last save state index and current state index
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-05-22 15:03:47 +02:00
9b6d45e8ed Code formating
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-05-22 15:03:47 +02:00
0f00ef563a Fix the states replay loop
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-05-22 15:03:47 +02:00
eb1320de11 Move history service to linked list with random UUID
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-05-22 15:03:47 +02:00
da94e0c1fc Merge pull request #469 from mattdinthehouse/master
Implemented issue #403
2016-05-13 00:53:50 +02:00
da60495643 Had a zero instead of an O in unit test... 2016-05-12 11:15:29 +10:00
5345c1ff0a Added unit test 2016-05-12 10:56:33 +10:00
299d4fb895 Renamed Align to Center 2016-05-12 10:39:29 +10:00
7c4d03b105 Fixed style issues 2016-05-10 21:52:27 +10:00
0e4f1046d3 Implemented issue #403 2016-05-10 21:37:00 +10:00
7e88aeb9a8 Merge pull request #468 from juliandescottes/fix-layersoverflow
Issue #467: fix max height for layers & panels lists
2016-05-08 13:35:23 +02:00
7c47aa9ecd Issue #467: style changes: smaller toolbox borders, layout fixes 2016-05-08 13:28:19 +02:00
c1d8c7a20e Issue #467: fix max height for layers & panels lists 2016-05-08 04:12:43 +02:00
e5ab4e53d7 Merge pull request #466 from juliandescottes/greenkeeper
greenkeeper: update dependencies
2016-05-07 16:04:35 +02:00
1c41bbee82 greenkeeper: update dependencies 2016-05-07 15:45:55 +02:00
be79eb2f6f Merge branch 'master' of https://github.com/juliandescottes/piskel 2016-05-04 16:31:53 -06:00
f32d5dea20 Merge pull request #456 from juliandescottes/issue352-selected-color
Issue #352: add gold/black SVG backgrounds for selected color
2016-04-22 00:14:58 +02:00
806b447f93 Issue #352: add gold/black SVG backgrounds for selected color 2016-04-22 00:08:14 +02:00
85eed8a2e2 Merge pull request #460 from juliandescottes/issue458-colorformat
Issue #458: format selected color from spectrum  as HexString
2016-04-21 23:52:30 +02:00
78932048e8 Issue #458: format selected color from spectrum as HexString 2016-04-21 23:44:42 +02:00
cede7955dd Merge pull request #457 from juliandescottes/greenkeeper-staging
greenkeeper: update dependencies
2016-04-21 22:42:11 +02:00
77fb50701f greenkeeper: update dependencies 2016-04-21 22:37:58 +02:00
d46ab48c1b Merge pull request #440 from clementleger/c_file_export
C file export
2016-04-18 16:48:16 +02:00
e41b8f740b C Export: Remove temporary canvas and directly use the rendered one for export 2016-04-11 16:43:26 +02:00
dfb8fec0c9 C export: fix after review 2016-04-11 14:33:58 +02:00
b3da940943 Merge pull request #445 from robmuh/master
Warp -> Wrap in move tool spelling
2016-04-10 14:14:22 +02:00
2a1073d0c5 Warp -> Wrap in move tool spelling 2016-04-09 13:06:33 -04:00
4927557c89 C export: Fix rgb ordering in uint32_t 2016-04-06 19:38:11 +02:00
d176973e72 C export: add static const qualifier for arrays 2016-04-06 19:17:39 +02:00
664821b9f5 Fix coding style and better output 2016-04-05 23:01:27 +02:00
1b553d28e3 Export: add c file exporter 2016-04-05 22:00:50 +02:00
c96dde9972 Fix #419: upgrade nwjs version to 0.12.3 2016-03-31 03:42:53 +02:00
ba98256a08 Merge pull request #435 from juliandescottes/add-layer-opacity-2
Add layer opacity support
2016-03-26 20:48:40 +01:00
327df539a7 Issue #414: part10: support opacity in preview renderers 2016-03-24 02:17:57 +01:00
99b00bc57f Issue #414: part 9: persist layer opacity when resizing 2016-03-24 02:17:57 +01:00
add97baf54 Issue #414: part8: Support transparency for GIF export
Transparent layers are rendered properly in GIFs.

As soon as a layer as some opacity (ie not 0 or 1) the GIF will be
rendered with preserveColors set to false. This could be improved,
preserveColors could still be applied if the flattended picture has
only opaque pixels, for a color count lower than the GIF limit.

Other topic to handle : we are creating way to many canvas element.

A simple GIF rendering of a 50 frames animation with 10 layers creates
1000 canvas elements before creating the GIF. Should consider adding some
pooling in the CanvasUtils.createCanvas helper.
2016-03-24 02:17:57 +01:00
76a29bf51a Issue #414: part7: Support transparency for ZIP export
Added renderFrameAt API to LayerUtils
Reuse LayerUtils and PiskelController renderFrameAt in PngExportController
2016-03-24 02:17:57 +01:00
7bf2662b66 Issue #414: part6: Support transparency when exporting as PNG spritesheet
Added flattenFrameAt to LayerUtils.
Added renderFrameAt to PiskelController (using flattenFrameAt)
Use renderFrameAt in PiskelRenderer (which is used for PNG spritesheet)

chore: renamed createLayerFromSpritesheet to createFramesFromSpritesheet
       (in LayerUtils)
2016-03-24 02:17:57 +01:00
d2dc42e7cf Issue #414: part5: rename PiskelController getFrameAt to getMergedFrameAt 2016-03-24 02:17:57 +01:00
186b5a305a Issue #414: part4: UI to view/update layer opacity 2016-03-24 02:17:57 +01:00
a75e78e366 Issue #414: part3: PiskelController api + history support 2016-03-24 02:17:57 +01:00
6546b520b3 Issue #414: part2: serialize and deserialize layer opacity 2016-03-24 02:17:57 +01:00
7660119b50 Issue #414: part1: add opacity to Layer model 2016-03-24 02:17:57 +01:00
6a9c9467a5 Merge pull request #433 from mattdinthehouse/master
Issue #411: Export as ZIP: Pad frame numbers with leading zeroes
2016-03-24 00:47:51 +01:00
a712764401 Syntax changes to meet code style 2016-03-23 21:50:43 +11:00
da105e6237 Moved the padding code to a new StringUtils.js utility and made the export code use it 2016-03-23 21:32:22 +11:00
e2b6f0776b Added frame and layer id padding to splittedExport 2016-03-23 20:51:08 +11:00
c7381b771f Added sprite number padding to mergedExport 2016-03-23 20:45:35 +11:00
776cf1ec87 Merge pull request #426 from juliandescottes/greenkeeper-grunt-contrib-watch-1.0.0
Update grunt-contrib-watch to version 1.0.0 🚀
2016-03-13 22:45:50 -07:00
5f49a68b62 chore(package): update grunt-contrib-watch to version 1.0.0
http://greenkeeper.io/
2016-03-12 23:20:38 +01:00
fc75334e48 Merge pull request #425 from juliandescottes/update-license-apache
Update license apache
2016-03-11 23:36:26 +01:00
fced9fa914 Update README.md 2016-03-11 23:35:48 +01:00
661c6fba7d Update LICENSE 2016-03-11 23:32:24 +01:00
539d7c7870 Merge pull request #397 from GMartigny/issue_#348
Issue #348 : colorpicker showing on top of tooltip
2016-03-11 00:58:36 +01:00
14fde4f8a0 Multi-line title on color selector 2016-03-05 17:31:56 +01:00
7088d9aa33 Revert modifications after discussion 2016-03-05 17:23:25 +01:00
c907f47f5d Merge pull request #418 from juliandescottes/greenkeeper-grunt-jscs-2.8.0
Update grunt-jscs to version 2.8.0 🚀
2016-03-05 14:54:32 +01:00
1aa6b61bee Merge pull request #415 from juliandescottes/greenkeeper-load-grunt-tasks-3.4.1
Update load-grunt-tasks to version 3.4.1 🚀
2016-03-05 14:54:21 +01:00
3043bac82c chore: update package.json dependencies (bulk) 2016-03-05 12:55:08 +01:00
fc1d23b3f5 Merge pull request #407 from juliandescottes/greenkeeper-grunt-contrib-jshint-1.0.0
Update grunt-contrib-jshint to version 1.0.0 🚀
2016-03-05 12:49:38 +01:00
f9b8a78396 Merge pull request #406 from juliandescottes/greenkeeper-grunt-contrib-clean-1.0.0
Update grunt-contrib-clean to version 1.0.0 🚀
2016-03-05 12:49:22 +01:00
a965bb0908 chore(package): update grunt-jscs to version 2.8.0
http://greenkeeper.io/
2016-03-02 21:24:14 +01:00
ba43c888be chore(package): update load-grunt-tasks to version 3.4.1
http://greenkeeper.io/
2016-03-01 07:32:46 +01:00
00ee251868 chore(package): update grunt-contrib-jshint to version 1.0.0
http://greenkeeper.io/
2016-02-17 01:47:37 +01:00
bcb6c3aca9 chore(package): update grunt-contrib-clean to version 1.0.0
http://greenkeeper.io/
2016-02-15 22:52:53 +01:00
e79183812b Merge branch 'greenkeeper-karma-0.13.21' 2016-02-13 08:25:06 +01:00
2058630768 Merge branch 'master' into greenkeeper-karma-0.13.21
Conflicts:
	package.json
2016-02-13 08:21:53 +01:00
be8a87110d Merge pull request #404 from juliandescottes/greenkeeper-karma-0.13.20
Update karma to version 0.13.20 🚀
2016-02-13 08:12:42 +01:00
54342c16d1 chore(package): update karma to version 0.13.21
http://greenkeeper.io/
2016-02-12 23:38:29 +01:00
dd2e55f65e chore(package): update karma to version 0.13.20
http://greenkeeper.io/
2016-02-12 16:23:04 +01:00
e7c53dac38 Merge pull request #398 from juliandescottes/greenkeeper-grunt-spritesmith-6.3.0
Update grunt-spritesmith to version 6.3.0 🚀
2016-02-12 06:42:07 +01:00
ebe37a612f Merge pull request #395 from juliandescottes/greenkeeper-grunt-contrib-uglify-0.11.1
Update grunt-contrib-uglify to version 0.11.1 🚀
2016-02-12 06:42:00 +01:00
ef7108a5e0 Merge pull request #400 from GMartigny/issue_#349
Issue #349 : Frame list slightly scroll on the right
2016-02-12 05:32:18 +01:00
fc9cb07be1 Revert to whole frame draggable
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-04 15:33:49 +01:00
ae1f880473 Merge pull request #399 from GMartigny/issue_#350
Issue #350
2016-02-04 15:10:52 +01:00
eb02e713e2 improve the sortable widget with direction, tolerance and handle
fix CSS to prevent horizontal scroll
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-04 11:53:08 +01:00
ecc1444b76 chore(package): update grunt-spritesmith to version 6.3.0
http://greenkeeper.io/
2016-02-04 06:26:16 +01:00
4985dfacf3 put background-position-x and -y together for compatibility
resize a bit to align with container
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-03 17:32:32 +01:00
365503d9b5 Merge pull request #396 from GMartigny/issue_#392
Issue #392 : Allow to close the options drawer with the escape key.
2016-02-03 15:57:43 +01:00
9bd3bf4adf code formating
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-03 14:17:12 +01:00
fb9c600b9f fix #348
Add a proposition to replace the title attribute.
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-03 12:45:44 +01:00
20ecfd431b Merge issue_#392 2016-02-03 09:29:19 +01:00
5eb936d8c2 fix #392
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-03 09:19:21 +01:00
f72da81fa4 chore(package): update grunt-contrib-uglify to version 0.11.1
http://greenkeeper.io/
2016-02-02 17:46:20 +01:00
30b0e5e607 add Netbeans project folder
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
2016-02-02 16:39:57 +01:00
c55a81f29b Merge pull request #393 from juliandescottes/greenkeeper-karma-jasmine-0.3.7
Update karma-jasmine to version 0.3.7 🚀
2016-02-01 13:01:45 +01:00
0712e04c12 chore(package): update karma-jasmine to version 0.3.7
http://greenkeeper.io/
2016-02-01 12:19:03 +01:00
3b6c5aa7a4 Sync upstream Jan 31 2016 2016-01-31 16:41:34 -07:00
d2ac600d7a Merge pull request #390 from juliandescottes/greenkeeper-grunt-spritesmith-6.2.0
Update grunt-spritesmith to version 6.2.0 🚀
2016-01-30 14:20:59 +01:00
049faba83e Merge pull request #391 from juliandescottes/greenkeeper-grunt-jscs-2.7.0
Update grunt-jscs to version 2.7.0 🚀
2016-01-30 14:20:32 +01:00
cb5ece914e chore(package): update grunt-jscs to version 2.7.0
http://greenkeeper.io/
2016-01-29 18:07:14 +01:00
b90887b98c chore(package): update grunt-spritesmith to version 6.2.0
http://greenkeeper.io/
2016-01-29 06:19:56 +01:00
cc62c5b3cb chore : fix ShortcutServiceTest on macosx 2016-01-24 13:02:32 +01:00
e8f6bcee63 Merge remote-tracking branch 'upstream/master' 2016-01-18 07:39:31 -07:00
01eb0cdb43 Merge pull request #384 from juliandescottes/greenkeeper-grunt-contrib-jshint-0.12.0
Update grunt-contrib-jshint to version 0.12.0 🚀
2016-01-18 00:35:20 +01:00
412067ad90 Introduces zooming towards/away from mouse 2016-01-17 16:30:21 -07:00
857524dee4 chore(package): update grunt-contrib-jshint to version 0.12.0
http://greenkeeper.io/
2016-01-17 19:11:00 +01:00
73b165ef0c chore : fix jshint errors "thanks" to caret version range from grunt-contrib-jshint 2016-01-16 15:28:28 +01:00
cd8d5c0b52 Issue #383 : Use metaKey as ctrlKey for Move tool on OSX 2016-01-16 12:31:03 +01:00
01a0cb14fd Merge pull request #382 from juliandescottes/greenkeeper-grunt-spritesmith-6.1.1
Update grunt-spritesmith to version 6.1.1 🚀
2016-01-13 23:27:15 +01:00
4394e29db0 Merge branch 'master' into greenkeeper-grunt-spritesmith-6.1.1 2016-01-13 23:24:13 +01:00
4361992014 Merge pull request #378 from juliandescottes/greenkeeper-karma-phantomjs-launcher-0.2.3
Update karma-phantomjs-launcher to version 0.2.3 🚀
2016-01-13 23:23:12 +01:00
b46d882c18 Merge branch 'master' into greenkeeper-karma-phantomjs-launcher-0.2.3
Conflicts:
	package.json
2016-01-13 23:20:24 +01:00
00a162a22e Merge branch 'greenkeeper-karma-0.13.19' 2016-01-13 23:18:53 +01:00
af382401be Merge branch 'master' into greenkeeper-karma-0.13.19
Conflicts:
	package.json
2016-01-13 23:18:38 +01:00
aaaf824ad7 Merge branch 'greenkeeper-karma-0.13.18' 2016-01-13 23:05:10 +01:00
97690ce486 Merge branch 'master' into greenkeeper-karma-0.13.18
Conflicts:
	package.json
2016-01-13 23:04:51 +01:00
f58a54e2ea Merge pull request #377 from juliandescottes/greenkeeper-grunt-jscs-2.6.0
Update grunt-jscs to version 2.6.0 🚀
2016-01-13 23:03:35 +01:00
a2fce811dd Merge pull request #376 from juliandescottes/greenkeeper-karma-0.13.17
Update karma to version 0.13.17 🚀
2016-01-13 23:03:20 +01:00
42aefa6851 Merge branch 'greenkeeper-load-grunt-tasks-3.4.0' 2016-01-13 23:02:26 +01:00
31edd71c41 Merge branch 'master' into greenkeeper-load-grunt-tasks-3.4.0
Conflicts:
	package.json
2016-01-13 23:00:15 +01:00
34bfe0668c chore(package): update grunt-spritesmith to version 6.1.1
http://greenkeeper.io/
2016-01-12 02:56:16 -08:00
936991cefa chore(package): update karma to version 0.13.19
http://greenkeeper.io/
2016-01-05 16:57:32 -08:00
f7112bb005 chore(package): update karma to version 0.13.18
http://greenkeeper.io/
2016-01-05 01:16:12 +01:00
5369b31dbc chore(package): update karma-phantomjs-launcher to version 0.2.3
http://greenkeeper.io/
2016-01-04 23:54:38 +01:00
323ab36a1b chore(package): update grunt-jscs to version 2.6.0
http://greenkeeper.io/
2016-01-04 21:09:43 +01:00
016079bdc8 chore(package): update karma to version 0.13.17
http://greenkeeper.io/
2016-01-04 16:36:17 +01:00
b394a69904 chore : nwjs config for macos build 2015-12-29 23:44:02 +01:00
e8eafb8004 Merge pull request #373 from juliandescottes/greenkeeper-karma-0.13.16
Update karma to version 0.13.16 🚀
2015-12-25 07:59:39 +01:00
777cbb5b0a chore(package): update karma to version 0.13.16
http://greenkeeper.io/
2015-12-24 21:49:52 +01:00
4cb78b283c Merge pull request #372 from juliandescottes/greenkeeper-karma-phantomjs-launcher-0.2.2
Update karma-phantomjs-launcher to version 0.2.2 🚀
2015-12-24 12:47:22 +01:00
dd6920f641 chore(package): update karma-phantomjs-launcher to version 0.2.2
http://greenkeeper.io/
2015-12-24 12:39:26 +01:00
152e6c9c0d release : bump version to 0.7.0-SNAPSHOT 2015-12-22 19:48:46 +01:00
b0e6e31b88 release : bump version to v0.6.0 2015-12-21 23:12:14 +01:00
0d4c8cd5df chore(package): update load-grunt-tasks to version 3.4.0
http://greenkeeper.io/
2015-12-19 18:28:29 +01:00
f756266d6c Merge pull request #366 from juliandescottes/greenkeeper-karma-phantomjs-launcher-0.2.1
Update karma-phantomjs-launcher to version 0.2.1 🚀
2015-12-14 23:13:00 +01:00
ae56e9422f chore : add peer dependency phantomjs 2015-12-14 23:05:45 +01:00
771e3d0981 chore(package): update karma-phantomjs-launcher to version 0.2.1
http://greenkeeper.io/
2015-12-11 02:13:50 +01:00
eff4ac3056 chore : update nw builder, fix desktop build 2015-12-09 23:02:44 +01:00
22e876c844 Merge pull request #365 from juliandescottes/greenkeeper-grunt-jscs-2.5.0
grunt-jscs@2.5.0 breaks build ⚠️
2015-12-09 22:44:08 +01:00
21d4857b74 Update deps, use grunt-connect instead of express, fix jscs errors 2015-12-09 22:38:58 +01:00
8c29afbca6 chore(package): update grunt-jscs to version 2.5.0
http://greenkeeper.io/
2015-12-09 21:57:34 +01:00
8f558fb798 Rollback dependency update 2015-12-09 10:33:41 +01:00
c56161ee91 Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-12-09 00:36:26 +01:00
09969253d3 Closes #364 : Update all dependencies 2015-12-09 00:34:47 +01:00
3c31746785 chore(package): update dependencies
http://greenkeeper.io/
2015-12-09 00:34:47 +01:00
a928a2819f Merge pull request #360 from juliandescottes/improve-straight-lines
Improve straight lines
2015-12-04 14:46:18 +01:00
172da85f15 Issue #146 : removed unused constant in PixelUtils 2015-12-04 14:39:20 +01:00
f5a33dc39a Issue #146 : add unittest for line & uniform lines
Uniform lines step is now capped so that the step remains lower
than min(dx, dy). If the step would be greater than this value,
use Infinity and draw a straight line
2015-12-04 14:30:36 +01:00
00f0debf12 Issue #146 : Move line creation utils to PixelUtils 2015-12-02 13:59:58 +01:00
20b7eb2a3c Issue #146 : Improve shift+stroke to draw more uniform lines 2015-12-02 00:46:11 +01:00
c70e339296 Issue #338 : disable sizeInput sync if maintainration is off in usersettings 2015-12-02 00:44:13 +01:00
6583d8f8b9 Issue #357 : Trans. -> white if too many colors + add test files 2015-12-01 20:07:26 +01:00
e1592a8ace Merge pull request #359 from juliandescottes/gif-transparency-bug
Issue #357 : prevent transparency in GIF export if more than 256 colors
2015-12-01 14:35:04 +01:00
5b567683a7 Issue #357 : prevent transparency in GIF export if more than 256 colors 2015-12-01 14:17:26 +01:00
4d8b093941 Fixes #355 : IconMarkupRenderer:render signature changed 2015-12-01 01:16:04 +01:00
f828471f0d Merge pull request #354 from juliandescottes/add-brush-size
Add brush size
2015-12-01 01:06:40 +01:00
92d5a4a2fe Issue #258 : Add pensize support to DrawingTest + add pensize test suite 2015-12-01 00:54:18 +01:00
f0ed4927e8 Issue #258 : Move resize method to utils + add unit test 2015-12-01 00:54:17 +01:00
67b66e4a10 Issue #258 : Support pensize for DitheringTool 2015-12-01 00:54:17 +01:00
f767d24280 Issue #258 : Update test recorder after ToolController refactor 2015-12-01 00:54:16 +01:00
27061291a3 Issue #258 : Simplify Lighten & update test 2015-12-01 00:54:16 +01:00
12ac85f0f6 Issue #258 : add support for left/right keys + bugfix 2015-12-01 00:50:57 +01:00
3525b318a6 Issue #258 : KB shortcuts to increase/decrease pensize 2015-12-01 00:50:56 +01:00
fce9bb5727 Issue #258 : Fix replay for Stroke tool with != pensizes 2015-12-01 00:50:55 +01:00
3cc3204939 Issue #258 : Update style and tooltip 2015-12-01 00:50:55 +01:00
222c65a8a5 Issue #258 : Initial implementation : missing tests + cleanup 2015-12-01 00:50:54 +01:00
4196576c19 Merge pull request #353 from juliandescottes/reduce-http-calls
Reduce http calls
2015-12-01 00:45:10 +01:00
06e864ca0a Issue #344 : Add clean:all task 2015-12-01 00:41:02 +01:00
3d1a24d5cf Issue #344 : cleanup dest folder(s), cleanup Gruntfile 2015-12-01 00:41:02 +01:00
070003a414 Issue #344 : Escape django template tags 2015-12-01 00:41:01 +01:00
7d5259acd7 Issue #344 : include piskel-boot in index.html 2015-12-01 00:41:00 +01:00
2b28577813 Issue #344 : Avoid templating syntax conflict with Django 2015-12-01 00:41:00 +01:00
7e1451fa8d Issue #344 : Remove iframes loader, Gruntf cleanup 2015-12-01 00:40:59 +01:00
dd1d2bf441 Issue #344 : Add watch:dev task to rebuild sprites 2015-12-01 00:39:51 +01:00
8aa6eff715 Issue #344 : Add image spriting using spritesmith 2015-12-01 00:39:37 +01:00
6f5e2f130e Fixes #346 by blurring disabled buttons 2015-11-30 16:46:27 +01:00
26f4448175 Merge pull request #343 from juliandescottes/fix-color-format
Issue #332 : always use lowercase hexstring format for colors
2015-11-27 23:05:09 +01:00
82510314a5 Issue #332 : always use lowercase hexstring format for colors 2015-11-27 22:58:11 +01:00
7fea616f0f Merge pull request #342 from juliandescottes/store-resize-to-userpref
Store resize to userpref
2015-11-25 00:49:46 +01:00
8d26d693ff Issue #338 : Cleanup public/private in SettingsController 2015-11-25 00:40:12 +01:00
9329a5fd03 Issue #338 : Remove jquery from settingscontroller, destroy setting controller when closing drawer 2015-11-25 00:36:19 +01:00
1c1f6c11ab Merge branch 'master' into store-resize-to-userpref 2015-11-20 00:27:05 +01:00
cfe3545eec Merge pull request #339 from juliandescottes/add-straight-lines
Issue #146 : Draw straight lines
2015-11-20 00:16:18 +01:00
b27e6b6f66 Issue #146 : Draw straight lines 2015-11-20 00:09:18 +01:00
30c3cdbcc5 Issue #338 : Store resize prefs to userpref 2015-11-19 08:18:26 +01:00
392204e5c5 Issue #335 : Remove autocomplete from settings input text fields 2015-11-13 08:51:05 +01:00
0dff1f7a9a Merge pull request #334 from juliandescottes/add-custom-shortcuts
Close #287
2015-11-13 00:13:34 +01:00
6d309419d3 Issue #287 : Move utility functions from Shortcuts.js to ShortcutService 2015-11-12 23:14:57 +01:00
460688e2d5 Issue #287 : Move helptext to tooltip, change cheatsheet column layout 2015-11-12 22:47:51 +01:00
947306a80c Issue #287 : Update helptext 2015-11-12 20:31:50 +01:00
0b439e1b00 Issue #287 : Add forbidden keys & helptext 2015-11-12 20:31:50 +01:00
676cbd17ea Issue #287 : Edit shortcuts from cheatsheet window (WIP) 2015-11-12 20:31:49 +01:00
2e3558ef08 Issue #287 : Edit shortcuts from the Cheatsheet dialog (WIP) 2015-11-12 20:31:49 +01:00
b5234089cd Issue #287 : Move CheatsheetService to CheatsheetController + DialogsController 2015-11-12 20:31:48 +01:00
5cda3e57b4 Issue #287 : fix shortcut for cheatsheet 2015-11-12 20:31:47 +01:00
ca3bbf1c57 Issue #287 : Shortcuts now rely on Shortcut instances. Shortcut key can be changed dynamically. 2015-11-12 20:31:47 +01:00
8081d5e232 Issue #287 : Fix unit test mocks 2015-11-12 20:31:46 +01:00
2c75daecb1 Issue #287 : Move shortcut definition to tool instances 2015-11-12 20:31:46 +01:00
c11e0d5d8d Issue #287 : Rename addShortcut/removeShortcut to less ambiguous register/unregister 2015-11-12 20:31:45 +01:00
107751b7eb Merge branch 'AlexHolly-gruntfile' 2015-11-11 22:30:20 +01:00
8ec47506bf Issue #331 : Gruntfile : host as variable 2015-11-11 22:28:10 +01:00
6311049210 Merge pull request #326 from AlexHolly/touch_s-pen
Tablet Touch & s-pen
2015-11-07 14:01:09 +01:00
4cf6088441 tweak valid checks and event types 2015-11-05 16:12:27 +01:00
00a05ee839 fix style error 2015-11-03 15:00:29 +01:00
73badf06b0 remove strange file 2015-11-03 03:49:41 +01:00
ea679913f9 tablet touch and s-pen 2015-11-03 03:42:31 +01:00
ba33533178 tablet touch and s-pen input 2015-11-03 03:34:13 +01:00
c32b327f23 Fix #322 : Save As button no longer works on offline builds 2015-10-25 00:18:01 +02:00
573d7ca051 Fix SwapColor will not replace color if their string representation is using a different case 2015-10-24 15:41:21 +02:00
23b82b4cf0 Releasing : bump package.json to 0.6.0-SNAPSHOT 2015-10-09 23:42:18 +02:00
f61682bb8d Issue #300 : follow-up : use shorter label 2015-10-08 23:55:45 +02:00
a9e04a4abd Merge pull request #320 from juliandescottes/fix-layerpreview-tooltip
Issue #312 : Improve layer preview tooltip + mutualize tooltip code
2015-10-08 00:51:47 +02:00
0021de35b4 Issue #312 : Improve layer preview tooltip + mutualize tooltip code 2015-10-08 00:47:35 +02:00
1e693e4e36 Merge pull request #318 from juliandescottes/fix-colorswap-memoryusage
Issue #315 : custom replay for Swap Color
2015-10-06 01:28:57 +02:00
a3a75b6096 Issue #315 : custom replay for Swap Color 2015-10-06 01:22:43 +02:00
2448e65ffa Merge pull request #317 from juliandescottes/add-lasso-tool
Add lasso tool
2015-10-06 00:51:43 +02:00
814db90e54 Issue #311 : Fix post-rebase issues 2015-10-06 00:49:30 +02:00
3585c2debd Issue #311 : Fix incomplete lasso issue when creating a new selection 2015-10-06 00:21:14 +02:00
8b983414a6 Issue #311 : adding jsdoc to PixelUtils visitConnectedPixels 2015-10-06 00:21:13 +02:00
4d53f5e3b7 Issue #311 : Cleanup and comments 2015-10-06 00:21:13 +02:00
9811a3a604 Issue #311 : Add drawing test for lasso 2015-10-06 00:21:12 +02:00
28912fc58f Issue #311 : Add lasso tool. Implementation and cleanup 2015-10-06 00:21:12 +02:00
7554b3355c Fix #311 : Add Lasso tool icons 2015-10-06 00:20:58 +02:00
f7592f864b Issue #311 : Add lasso tool initial commit 2015-10-05 23:51:10 +02:00
66fa71affd Merge pull request #316 from juliandescottes/fix-transformtool-savestate
Issue #315 : Implement custom replay for transform tools + add drawin…
2015-10-05 00:22:51 +02:00
a0c9f2923e Issue #315 : Fix replay with alt/shift/ctrl modifiers 2015-10-02 02:04:03 +02:00
c9529dc65c Issue #315 : avoid saving state when replaying state 2015-10-02 01:48:35 +02:00
a8f727fdcd Issue #315 : Implement custom replay for transform tools + add drawing test support 2015-10-02 01:27:59 +02:00
48d1214a6d Merge pull request #314 from juliandescottes/add-save-service
Add save service
2015-10-01 01:10:23 +02:00
b859857b2d Issue #277 : Switch HeaderController to events instead of infinite setTimeout 2015-10-01 01:07:29 +02:00
669d7a21cb Issue #277 : Fix FF bug showing native save popup despite preventDefault 2015-10-01 01:06:54 +02:00
a286d5926a Issue #277 : Cleanup save controller 2015-10-01 00:30:36 +02:00
92cc986fb6 Merge pull request #300 from jnlopar/exportscale
Adds the ability to export a scaled spritesheet.
2015-09-29 08:34:35 +02:00
da1f26291c Adds superclass destroy call to ImageExportController. 2015-09-28 17:14:48 -07:00
a92e198519 Adds input event listener to scaling factor. 2015-09-28 17:10:40 -07:00
91ffce0bfe Makes scaling export more compact and adds tooltip. 2015-09-28 17:10:25 -07:00
acb6fd2172 Issue #277 : Add unit test for StorageService 2015-09-25 01:41:22 +02:00
055bcdb001 Enhancement : Adding CTRL+SHIFT+Z as REDO shortcut 2015-09-20 12:25:54 +02:00
fe9875841a Issue #277 : Add isSaving state to storageService 2015-09-20 11:19:17 +02:00
e5be581e19 Issue #277 : Move all name update logic to a dedicated controller polling the model 2015-09-20 10:42:15 +02:00
6620f7e5a9 Issue #277 : Add global StorageService, enable CTRL+S 2015-09-20 10:42:14 +02:00
758cc6202a Issue #277 : Add new css file to style list 2015-09-20 10:41:49 +02:00
d96c1a9c06 Issue #277 : Extract save panel css to dedicated file 2015-09-20 10:41:49 +02:00
551e15e67b Issue #277 : Move storage services to dedicated package 2015-09-20 10:41:48 +02:00
d576c56068 Merge pull request #310 from juliandescottes/Integrate-SelectedColorsService
Integrate selected colors service
2015-09-20 02:32:15 +02:00
fddec5c95c Fix : Update package.json version to 0.5.5-SNAPSHOT 2015-09-20 02:20:17 +02:00
1abd6113a3 Fix : Speed up dialog animations 2015-09-20 02:20:16 +02:00
ef05cc4fd1 Refactor : move FrameTransform to transform package 2015-09-20 02:20:16 +02:00
87341b049e Fix : Add peer dependency to jasmine-core in package.json 2015-09-20 02:20:15 +02:00
9f31b2c7e4 Fix : Hide grid when zoom no longer allows proper display 2015-09-20 02:20:15 +02:00
3f992cbb4a Applying review comments 2015-09-20 02:12:59 +02:00
0bdcf38d2f Fix : Update package.json version to 0.5.5-SNAPSHOT 2015-09-19 22:58:01 +02:00
d254a9b72e Fix : Speed up dialog animations 2015-09-19 18:22:56 +02:00
d8d7f1adea Refactor : move FrameTransform to transform package 2015-09-19 17:56:32 +02:00
d6a85aaf6f Fix : Add peer dependency to jasmine-core in package.json 2015-09-19 00:25:33 +02:00
1bc85bfbca Fix : Hide grid when zoom no longer allows proper display 2015-09-19 00:07:14 +02:00
90c2ed3470 Removing states in class members and using a SimplePen#draw method instead. 2015-09-17 02:26:59 +02:00
5a469202e9 Remove color argument from BaseTool/BaseSelect interfaces 2015-09-16 23:40:44 +02:00
8faa6db4c0 Fix SelectedColorsService tests 2015-09-16 23:36:55 +02:00
8d618fc31c Merge remote-tracking branch 'origin/Integrate-SelectedColorsService' into Integrate-SelectedColorsService
Conflicts:
	src/js/controller/DrawingController.js
	src/js/tools/drawing/DitheringTool.js
2015-09-16 23:03:57 +02:00
e9c99a241f Migrate tools to BaseTool#getToolColor 2015-09-16 22:58:13 +02:00
3209c50304 Create MouseStateService and integrate 2015-09-16 22:57:53 +02:00
5d38804523 Integrate selectedColorsService into PaletteController and PaletteListController
- update selectedColorsService getColors array API to explicit
getPrimary/getSecondary
- update drawing test helper as well
2015-09-16 22:57:52 +02:00
d17f235aee Merge pull request #309 from juliandescottes/dithering-tests
Dithering tests
2015-09-16 12:59:21 +02:00
a0350ff2e8 Integrate selectedColorsService into PaletteController and PaletteListController
- update selectedColorsService getColors array API to explicit
getPrimary/getSecondary
- update drawing test helper as well
2015-09-16 02:24:56 +02:00
d6351fccb3 Add dithering tool drawing tests 2015-09-16 01:13:45 +02:00
a58b643a26 Add SelectedColorsService unit tests 2015-09-16 01:13:21 +02:00
5367c75972 Merge pull request #308 from juliandescottes/dithering
Introduce basic dithering tool
2015-09-15 07:47:11 +02:00
7d964c7fde Fix dithering right-click color inversion on FF/IE
Record pressed mouse button type only at mousedown time.
On IE/FF, the button type is not available during mousemove.
Did a round of testing on both FF and Chrome.
2015-09-15 00:57:13 +02:00
d0acb625cf Applying review comments for dithering tool 2015-09-14 23:40:16 +02:00
e6950e5c1a Issue #306 : Switch implementation for memoizer 2015-09-14 22:04:25 +02:00
63449b2694 Fixing lint errors 2015-09-14 21:53:29 +02:00
ed32ddc747 Introduce basic dithering tool 2015-09-14 21:41:10 +02:00
cbb97c60d0 Issue #215 : Fix cursor coordinates regression 2015-09-14 18:47:41 +02:00
ece3105893 Merge pull request #307 from juliandescottes/add-real-size-preview
Add real size preview
2015-09-13 23:55:53 +02:00
069bfb9a90 Issue #305 : Changed naming for consistency -> original-size 2015-09-13 23:28:53 +02:00
96ab2dd781 Issue #305 : Add keyboard shortcut for native preview resolution 2015-09-13 23:07:22 +02:00
1fe327495c Issue #305 : Allow DrawingController to zoom out to real size 2015-09-13 22:44:59 +02:00
089b4ea14d Issue #306 : Selection : set opacity for overlay instead of pixel per pixel 2015-09-13 21:32:45 +02:00
3853a78019 Merge branch 'master' into add-real-size-preview 2015-09-13 19:25:29 +02:00
ee0a4c16aa Fix : Migrate to new travis infrastructure 2015-09-13 19:22:20 +02:00
84e26b28da Issue #305 : Add 1x icon, redesign popup icon 2015-09-13 19:16:08 +02:00
cffb68c88c Fix : Hand cursor was not properly centered 2015-09-13 17:33:06 +02:00
489298e87a Issue #304 : Blur FPS range input only on change event 2015-09-13 15:49:18 +02:00
dffe23746c Issue #303 : Reset input[type=range] padding in reset.css 2015-09-13 15:12:46 +02:00
8c629bd842 Issue #301 : Switch between light and dark highlighted pixel color 2015-09-12 17:54:11 +02:00
251ceae318 Merge branch 'exportscale' of https://github.com/jnlopar/piskel into exportscale
Conflicts:
	src/css/settings.css
2015-09-06 11:57:55 -07:00
c7a80ebdec Drops settings back to 550px, since it doesn't need the extra 50 anymore. 2015-09-06 11:57:02 -07:00
2280740421 Drops settings back to 550px, since it doesn't need the extra 50 anymore. 2015-09-06 11:54:35 -07:00
c6287653f9 Moves the scaling factor into spritesheet export. Cleans up CSS and makes description spans with inline styles into divs. Adds a little more margin below the scaling factor so it's not too snug with the Download PNG button. 2015-09-06 11:53:10 -07:00
bd8eaa4307 Uses ImageResizer for spritesheet export scaling. 2015-09-06 11:48:04 -07:00
c0fda032e5 Reverts change to BlobUtils. 2015-09-06 11:42:13 -07:00
744709b15b Issue #256 : update Move tool tooltip 2015-09-02 01:16:09 +02:00
6a2f7fb58d Issue #256 : add drawing test 2015-09-02 00:48:29 +02:00
479df8ced7 Issue #256 : apply move tool to all layers / all frames 2015-09-02 00:36:03 +02:00
72edf47734 Adds the ability to export a scaled spritesheet. 2015-08-31 11:21:17 -07:00
6b6674a04d Issue #215 : Dev environment : first undo/redo drawing test 2015-08-25 01:01:12 +02:00
754bc9b830 Issue #215 : Dev environment : support keyboard/undo/redo events in drawing tests 2015-08-24 23:56:09 +02:00
ff98670055 Selection Manager : fix undo/redo regression 2015-08-15 17:08:09 +02:00
4e1f6bee3f Build : add grunt desktop-mac target 2015-08-15 16:29:13 +02:00
6a4d3cb106 Keyboard Cheatsheet : extract color shortcuts to dedicated category 2015-08-14 00:01:47 +02:00
7048e1fd42 Palette toolbox : 1-9 shortcut styling update 2015-08-13 01:01:20 +02:00
cd36c07a45 Add shortcut numbers for 1-9 palette colors 2015-08-13 00:44:47 +02:00
9f0aaceb5f Merge pull request #292 from juliandescottes/copy-paste-oob-crash
Copy paste oob crash
2015-08-09 15:55:12 +02:00
99da69553c Copy paste out of bounds : added SelectionManager unit tests 2015-08-09 15:42:46 +02:00
fdb5483e87 JSCS fixes 2015-08-09 12:51:25 +02:00
1208324d4d Copy paste bug : add unit tests for FrameUtils with null value 2015-08-09 12:37:03 +02:00
5437ad8651 Merge branch 'copy-paste-oob-crash' of https://github.com/juliandescottes/piskel into copy-paste-oob-crash 2015-08-09 01:49:47 +02:00
c074217047 Add macos specific nodewebkit configuration 2015-08-09 01:22:25 +02:00
e0c9a46ed3 wip : needs tests 2015-08-07 08:37:13 +02:00
d962217f90 Issue #281 : Add app.settings & user pref for layer preview opacity 2015-07-26 02:00:46 +02:00
9800d85cb7 Add keyboard shortcuts 1 to 9 to quickly select palette colors 2015-07-24 01:16:47 +02:00
011b07c735 Palette editor : Fix blur delegation on Firefox 2015-07-22 00:10:56 +02:00
2fdc85556b Palette Editor : Fix color change from hex input 2015-07-21 23:40:55 +02:00
7a8efc56b0 Import dialog : image-preview style : display changed to block 2015-06-07 13:19:44 +02:00
0d81865f3b Adding button to reset.css font rules 2015-06-07 12:45:51 +02:00
12cfe16cb4 Cleaning up settings and dialogs CSS 2015-06-07 12:40:40 +02:00
e773f9ae6d Merge pull request #284 from JALissiak/spritesheetImport
Adding spritesheet import - fixes #188
2015-06-04 08:09:13 +02:00
5c46cfe20a Updating for pull request feedback
- Using labels for the import type radio buttons
- Non animated gifs can now be imported as a spritesheet
- Fixing frame slicing to ignore a partial frame while looping
2015-06-03 19:48:29 -07:00
2d9001db6e Updating the spritesheet import to use size
- The import dialog now allows users to select an option between single image or spritesheet importing
- The spritesheet option allows setting of the size of an indivdual frame and the offset from the left/top from which to start slicing frames
- Selecting the spritesheet option will display a frame slice grid over the preview image to give a quick view of where the frames will be made
- When importing the spritesheet blank (transparent) frames and also partial frames will be ignored
- This allows users to import spritesheets that have been packed into a larger image with excess padding
2015-06-02 21:54:26 -07:00
8ff15fd0e1 Fixing the preview frame grid stroke
- The width/height of the canvas used to draw the frame grid in the preview was incorrect, so the stroke width was too thick
- This change fixes it so the stroke width remains nice and thin by applying the correct canvas size
2015-06-01 10:50:58 -07:00
8e4ea8437f Fixing unnecessary whitespace changes
- My editor added additional whitespace to several unchanged lines, so I just reverted them
2015-06-01 10:38:10 -07:00
48f24c0cf3 Adding spritesheet import
- Updated the import dialog to allow users to specify the number of frames in the image (which defaults to 1 x and 1 y)
- Setting the frame count for x and y will draw a dotted line in the preview that shows where the image will be split into individual frames
- When imported with a frame count above 1, the source image will be split into the different frames and loaded just as if it were an animated gif
- This allows users to import existing spritesheet pngs, including those produced by the piskel export function
2015-06-01 10:29:52 -07:00
8d85093874 Fix GIF issue 2015-05-18 11:51:28 +02:00
1beeb8d6e4 Revert "Fix a GIF bug ... again"
This reverts commit f9b07b29a9.
2015-05-18 11:47:48 +02:00
f9b07b29a9 Fix a GIF bug ... again 2015-05-18 10:40:05 +02:00
9bc330e5e8 Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-05-13 11:21:24 +02:00
a51e20b370 Fix #282 : Clean build of gif.js made the issue disappear ... 2015-05-13 11:20:44 +02:00
ef6ef6256e Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-05-08 22:36:03 +02:00
4edbc29e72 Fix #281 : Zoom keyboard shortcuts on Firefox
Keycode not consistent on FF :
https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode

Also added support for numpad +/- keys.
2015-05-08 22:34:29 +02:00
b72c775a04 Merge pull request #275 from MaxEden/master
Zip-Export: Split by layers option
2015-05-04 16:05:42 +02:00
0c9f04bc71 Prepare release 0.5.2 2015-05-03 11:43:38 +02:00
034057dcd2 Moved subfunctions to prototype 2015-04-30 13:17:56 +06:00
016316518d Zip-Export: Split by layers option 2015-04-29 20:20:35 +06:00
ac9ccd04e2 Fix currentcolors on sprites with many frames 2015-04-29 04:00:46 +02:00
ce8d71f47e Fix : resize panel : maintain ratio is always on 2015-04-28 13:32:55 +02:00
29cd0d80f3 Prepare 0.5.1 release 2015-04-28 07:29:01 +02:00
d3f5a41c0d Fix popup preview on Firefox 2015-04-27 22:34:50 +02:00
3f181c6248 Fix gif export transparency issue 2015-04-27 22:23:35 +02:00
8ae14281cc Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-04-26 23:34:09 +02:00
9de77c9f21 Fix : Add mac os menu (removed with nw > 0.10) 2015-04-26 23:33:49 +02:00
d31865a9ef Update windows build scripts after nw version update 2015-04-26 22:46:40 +02:00
cf62f2ac0b Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-04-26 22:13:23 +02:00
16362e1b13 Fix : Online save failing 2015-04-26 22:07:14 +02:00
aa79919496 Prepare release 0.5.0 2015-04-26 22:01:06 +02:00
6df145455e enhancement : use size-input instead of select for export 2015-04-24 14:57:01 +02:00
daceb326c5 enhancement : use size-input instead of select for export 2015-04-24 14:55:00 +02:00
5fbadc0d80 wip : Add save as button 2015-04-24 00:00:53 +02:00
473bd4705c Add save as button 2015-04-23 23:59:05 +02:00
c570d8fd75 Switching to AGPLv3 2015-04-15 17:39:56 +02:00
7909d4d94b #268 : Update README.md : license info 2015-04-15 09:08:30 +02:00
138d5d02d2 #268 : Use GPLv2 license 2015-04-15 09:07:11 +02:00
0683583da1 Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-04-15 07:28:13 +02:00
1decd64a30 Merge pull request #269 from juliandescottes/current-colors-webworker
Current colors webworker
2015-04-15 07:27:43 +02:00
9e1cfef924 fix:focus preview popup if already opened 2015-04-15 07:27:00 +02:00
e384f7d2e2 Added Blob polyfill for Phantom JS (debug mode only) 2015-04-14 23:08:53 +02:00
be3d2cf20d merge 2015-04-14 22:36:25 +02:00
54ae52e117 Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-04-14 21:31:49 +02:00
b480acc6a0 Added JSCS linter to enforce style conventions 2015-04-14 18:02:33 +02:00
007e4d4e11 Usability : keyboard shortcuts cheatsheet
- click outside of cheatsheet-wrapper closes the popup
- removed jquery from CheatsheetService
- removed label 'Keyboard shortcuts' in favor of tooltip
2015-04-14 11:09:36 +02:00
6070ebead5 Updated dependencies 2015-04-13 17:24:49 +02:00
5b081c8859 Cleanup Gruntfile.js 2015-04-13 16:30:30 +02:00
29e205d441 Merge pull request #267 from juliandescottes/uncaught-errors-crash-nodewebkit
#261 replaced throw by console.error for recoverable errors
2015-04-13 14:38:15 +02:00
1f5272415c #261 replaced throw by console.error for recoverable errors 2015-04-13 14:33:34 +02:00
d1b12a07ac fix : check undefined palette 2015-04-13 13:29:13 +02:00
f2f8158efb Merge pull request #266 from juliandescottes/fix-transparent-gifs
Fix transparent gifs
2015-04-13 13:20:20 +02:00
77877c118f unknown tinycolor 2015-04-13 13:11:36 +02:00
e0c16486d3 fix : strip # from hexcolor before parseint16 2015-04-13 13:08:42 +02:00
ba491736c1 test : add unit test for ColorUtils 2015-04-13 13:02:12 +02:00
0e817a88a7 Fix for #265 2015-04-13 11:45:50 +02:00
5d4b8b87a3 Update README.md 2015-04-13 08:53:24 +02:00
94c29c2ff5 Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-04-10 00:58:10 +02:00
e260b36585 Update save form display 2015-04-10 00:57:20 +02:00
3d42ab25b2 Merge pull request #264 from Dovaa/patch-1
Update README.md
2015-04-10 00:27:00 +02:00
0a6250141a Update README.md
There is a Linux version from 0.3.0
2015-04-09 17:12:43 -05:00
3d58bcae6c Fix jshint errors 2015-04-09 18:24:34 +02:00
281103c46e wip : replace Job by promises 2015-04-09 17:17:05 +02:00
e6ed0c28a3 wip : replace Job by promises 2015-04-09 17:16:58 +02:00
522006f67a wip : replace Job by promises 2015-04-09 17:16:48 +02:00
e11355193b Now using webworker to compute current colors 2015-04-09 17:16:26 +02:00
30cdb6d335 Fix node-webkit regression 2015-04-08 00:14:35 +02:00
c40e27bc17 Merge pull request #262 from juliandescottes/fix-palette-bugs
Fix palette bugs
2015-04-08 00:04:20 +02:00
3d6cd3e576 Fix post merge bugs for desktop mode 2015-04-07 23:54:49 +02:00
4b7b18ca6f post merge 2015-04-07 23:15:36 +02:00
9e6e39e3d8 WIP : Use workers to compute hash and current colors 2015-03-26 11:15:11 +01:00
c600d62bd2 Merge pull request #259 from leegrey/desktop-save-action
Desktop IO Features
2015-03-26 10:42:52 +01:00
f114676db7 Include save file path in "Successfully Saved" popup. Show full save path under the save button. Hide the "save to browser" portion of the save panel when running in desktop mode. 2015-03-26 20:32:27 +13:00
0ec3787fc4 change require() to window.require() so compiler does not report errors. 2015-03-25 18:36:55 +13:00
40cced7be0 Merge branch 'master' into fix-palette-bugs 2015-03-24 17:17:22 +01:00
81a9e7a678 Merge pull request #260 from juliandescottes/fix-chrome-canvas-radeon-bug
Workaround for Chrome 41 issue Canvas + Radeon :
2015-03-24 17:01:37 +01:00
6328fe760f Workaround for Chrome 41 issue Canvas + Radeon :
Issue opened at https://code.google.com/p/chromium/issues/detail?id=469906
Workaround in FrameRenderer.js is to decrease the width+height of the
fillRect of 1 pixel.
Issue seems to impact only Radeon users (not sure if all cards are
impacted)
2015-03-24 16:02:47 +01:00
932974d744 Undid changes to suppress Errors, since grunt test did not like it that way either. (Bad style.) 2015-03-24 23:09:44 +13:00
eb4941417c suppressing build errors when referring to "require" and "process" 2015-03-24 22:58:42 +13:00
93deb1c2c5 Just adding semicolons to make the linter happy 2015-03-24 22:33:14 +13:00
c9b581f6db When running in Node-Webkit, hold onto the full savePath when opening.piskel files via the gui or drag and drop. 2015-03-22 00:39:23 +13:00
6a6f75b3ce Moved desktop lO logic to new DesktopStorageService class. Bound keypresses for ctrl-o, ctrl-s, and ctrl-shift-s. Savepath is now also propagated on resize operation. SaveFile can optionally guarantee that a supplied file extension will be present on output file. 2015-03-19 23:46:53 +13:00
04a1633a90 Moved desktop FileUtils into their own class. Split PiskelFileUtils::loadFromFile() so the decoding portion can be called separately by desktop load function. "savePath" is stored in piskel instance, and propagated to new instances in HistoryService. "savePath" is also stored on load so it is available for resave. 2015-03-18 00:24:03 +13:00
b168e8ca76 Store user selected filePath on the Piskel instance stored in pskl.app.piskelController. Getter and Setter in PublicPiskelController for filePath. 2015-03-16 23:13:36 +13:00
fa6f2e5db6 Added new save functions for when running in Node-Webkit. 2015-03-15 01:40:00 +13:00
1c66282b01 Added pskl.utils.Environment for detecting if Piskel is running in Node-Webkit. 2015-03-14 00:11:24 +13:00
5cbb9b8664 ongoing : web workers for current colors service 2015-03-11 18:51:49 +01:00
6254490a23 feature #251 : Set default size in Resize pref panel 2015-03-04 08:37:37 +01:00
43e60e300c Set preview render flag when updating TILED_PREVIEW seW 2015-03-03 23:50:19 +01:00
fe95abca0f Switch to template for popup preview (easier integration) 2015-03-03 23:36:12 +01:00
bcecd3058b Popup preview : refactor, cross browser, WIP
- moved preview controllers to pskl.controller.preview
- renamed PreviewFilmController to FramesListController
- renamed AnimatedPreviewController to PreviewController
- fixed init of popup preview on IE (use ownerDocument to create
  TiledFrameRenderer container) => should try with innerHTML
- moved open popup button inside the minimap (show on hover)
2015-02-28 10:56:15 +01:00
68a807ccb5 Forgot PopupPreviewController.js 2015-02-27 23:57:14 +01:00
7a355b39a0 Refactored HistoryService, CurrentColorsService, draft for popup preview 2015-02-27 23:54:18 +01:00
0f1489727c Removed JQuery from ImportController 2015-02-26 22:07:36 +01:00
bab3d6677e Remove JQuery from all setting controllers 2015-02-26 01:25:33 +01:00
bcb709300c Added method to enable image smoothing on Canvas 2015-02-26 00:13:32 +01:00
4f2f01ea36 Wrapped applicationSettings in FORM 2015-02-23 00:32:34 +01:00
8592cd2e53 Moved resize+app settings to AbstractSettingController 2015-02-23 00:23:11 +01:00
b4c1a4c714 Merge branch 'master' into fix-palette-bugs 2015-02-22 23:08:21 +01:00
294af67099 Merge pull request #248 from juliandescottes/enhancement-increase-max-fps
Enhancement increase max fps
2015-02-22 23:07:46 +01:00
3585a6f96e Merge resize content and resize canvas in single form 2015-02-22 23:01:43 +01:00
0914e2816e Added Event utils to easily add/remove events without leaks. Added Max FPS setting to appl settings 2015-02-22 18:03:46 +01:00
0b41c0f648 Removing jquery leftover 2015-02-22 16:47:44 +01:00
beb2fa6ba9 Removed JQuery from ApplicationSettings 2015-02-21 15:41:32 +01:00
61fb6c5e6f Extract resize anchor code to dedicated widget file 2015-02-20 01:40:34 +01:00
d310a77893 Enhancement : choose anchor for resize canvas 2015-02-17 02:06:52 +01:00
84f366e7e4 enhancement : resize panel 2015-02-15 23:41:58 +01:00
561d016a45 fix : keyboard accessibility for colorpicker inpus 2015-02-12 00:39:38 +01:00
334d6ad21f fix : rename preferences tab 2015-02-10 23:09:28 +01:00
0382b3858b enhancement - cleaner UI for resize panel 2015-02-05 02:21:15 +01:00
2aa87b5fac enhancement - cleaner UI for resize panel 2015-02-05 02:16:25 +01:00
d7fef0f88b fix - log error if BackupService fails to store piskel in localstorage 2015-02-05 01:59:37 +01:00
c7131678f8 Fix mousewheel event for IE11 2015-01-24 00:00:08 +01:00
5224c9ddd8 Merge branch 'master' of https://github.com/juliandescottes/piskel 2015-01-23 23:21:14 +01:00
3265a96fe6 Prepare release 0.4.2 2015-01-23 23:17:39 +01:00
5831447f75 Fix #242, onion skin rendered not cleared if 0 frames 2014-12-27 15:02:41 +01:00
043f077408 Bug in undo when cancelling Shape tool used with Shift key 2014-12-24 08:27:54 +01:00
25bb46d097 Merge pull request #241 from juliandescottes/enhancement-support-rectangular
Enhancement support rectangular
2014-12-21 19:06:42 +01:00
5cb1d0cd03 Fixed CanvasRenderer regression + added unit test 2014-12-21 18:56:40 +01:00
123ea31191 Cleanup minimapController, center previewFilm canvas 2014-12-21 18:38:14 +01:00
1df5d0da38 Merge pull request #240 from juliandescottes/enhancement-pause-animation
Enhancement pause animation
2014-12-21 16:52:13 +01:00
50f159c982 Merge pull request #239 from juliandescottes/enhancement-performance-improvements
Enhancement performance improvements
2014-12-21 16:48:10 +01:00
df5aef363b Move to imgstore-b, change body bg 2014-12-21 16:44:10 +01:00
0642e17aa8 Draw lines of pixels instead of single pixels 2014-12-19 08:28:15 +01:00
1402394d07 Animation pauses when FPS slider at 0FPS + slight perf improvement 2014-12-18 23:57:34 +01:00
e1ba57c92f cleanup MinimapController 2014-12-18 22:29:14 +01:00
2db04fe7d6 Support rectangular resolution & maximize viewport usage 2014-12-18 21:42:03 +01:00
dc61be27f0 Update README.md 2014-11-26 08:55:53 +01:00
7fd49aaccb Removed localhost url ... 2014-11-26 07:48:15 +01:00
cffaec09b2 Prepare release 0.4.0 2014-11-25 22:54:18 +01:00
62a7755407 Merge pull request #235 from juliandescottes/feature-add-effects
Feature add effects
2014-11-25 22:43:12 +01:00
2ab1e29365 Merge branch 'master' into feature-add-effects 2014-11-23 21:54:31 +01:00
fe110a3d8e Merge pull request #233 from juliandescottes/enhancement-move-viewport
Enhancement move viewport
2014-11-23 21:53:34 +01:00
5afec16258 Cleanup of console.log in MinimapController.js-n 2014-11-23 21:48:32 +01:00
fad483ce7a Increased movement speed 2014-11-23 21:44:51 +01:00
b10e87d2b7 Fix for issue #189 : user can move the viewport via click n drag of middle mouse button 2014-11-23 21:37:34 +01:00
61ee1d9b32 Added clone tool + icon 2014-11-23 16:27:12 +01:00
ce1a5c4918 Rotate non square sprites, added rotate icon, unit tests for transforms 2014-11-23 15:03:35 +01:00
796cd4466e Added Rotate tool + abstract Transform tool 2014-11-22 00:07:11 +01:00
0f49c884f2 Mutualize HTML generation for drawing tools and transform 2014-11-21 01:15:55 +01:00
c8dae1cb79 Added mirror transformation 2014-11-19 23:00:25 +01:00
54837d0e21 Issue #228 : Zoom is very slow on Firefox 2014-11-01 14:00:35 +01:00
001e35cf7b Merge pull request #229 from etumyan/fps-oninput
Combining oninput and onchange events for the FPS counter. Close #225
2014-11-01 13:57:49 +01:00
ac5083633b Combining oninput and onchange events for the FPS counter. 2014-10-31 22:38:11 +04:00
c32af500dc add notification if image upload fails 2014-10-01 01:21:49 +02:00
dc4de32162 Added support for .PAL palettes 2014-09-30 00:58:15 +02:00
243990a90f Fixed : cache issue coming from piskel-boot file 2014-09-30 00:19:54 +02:00
96ef362cf8 preparing release v0.3.0 2014-09-28 11:20:34 +02:00
e1e029a849 Merge pull request #221 from juliandescottes/enhancement-palette-sorting
Enhancement palette sorting
2014-09-27 11:06:43 +02:00
fe5e8966a5 added shortcuts to select previous / next color in palette 2014-09-27 11:04:03 +02:00
37aa6c3d72 sort colors on image import for palette 2014-09-27 01:22:20 +02:00
d805e13d57 sort colors on image import for palette 2014-09-27 01:10:54 +02:00
a7ef57b6ee fixed color sorting for desaturated colors 2014-09-26 00:03:24 +02:00
ac08775406 improved current colors sort 2014-09-25 00:13:23 +02:00
6583d3d560 moved rgbToHex correct implementation to pskl core utils 2014-09-24 21:53:41 +02:00
b5465ca066 fixed palette import bug 2014-09-24 21:50:16 +02:00
258d13371d improved current colors sort algorithm 2014-09-24 08:15:18 +02:00
e3e6730b45 improved current colors sort algorithm 2014-09-24 07:43:04 +02:00
6ef99bba15 improved current colors sort algorithm 2014-09-24 00:26:31 +02:00
afe790e5e3 Removed unused CSS rules for old edit/merge layer actions 2014-09-23 08:05:31 +02:00
8989e984cb added dedicated style for colors-list for IE and FF + bug fixing on ProgressBarCOntroller for FF 2014-09-23 08:00:46 +02:00
00dd660571 Use dedicated service to display progress information 2014-09-22 23:51:28 +02:00
8a29b78af8 Merge branch 'master' into enhancement-palette-sorting
Conflicts:
	src/js/utils/FrameUtils.js
2014-09-21 21:56:22 +02:00
9ef46d5ec5 added FrameUtils unit tests 2014-09-21 21:39:54 +02:00
6445b44d02 Moved image import to worker 2014-09-20 09:14:21 +02:00
9afe69cb87 Split CreatePaletteControllers in ctrl + widget for colors list 2014-09-18 07:59:56 +02:00
508fb79c32 Homogeneize layout, drop palette 2014-09-18 07:18:07 +02:00
8ebdc4cd41 Enhancement palettes : Added download palette
- palettes can be downloaded as GPL palettes
- slightly tweaked the UI of hsl rgb picker
- switched preferred format of spectrum to hex
2014-09-17 01:32:59 +02:00
fab9c6e836 select new palette after saving 2014-09-16 00:37:24 +02:00
f7f9587520 Merge pull request #220 from juliandescottes/enhancement-layers-options
Enhancement layers options
2014-09-16 00:10:42 +02:00
12dcacea5a increased the timeout for Travis tests 2014-09-13 20:32:01 +02:00
9325abb924 Enhancement : Layers merge
Added drawing test + fixed drawing test runner on Mac OS X
2014-09-13 20:21:40 +02:00
4ed7338f25 Feature : merge layers
Added feature to merge a layer with the layer below
Done at #jsconfeu2014 :)

New icon in icons : merge-icon.png
TODO : reorder the icons folder, it's waaaaaaay too messy !!
2014-09-13 20:10:05 +02:00
90845b3a62 Enhancement : Color palettes
- Added clone feature when editing existing palette
- Added arrow up/down to increase decrease input values
- Paint.net palettes are supported
2014-09-09 23:53:57 +02:00
125e332b7c Enhancement : palette color creator
- Added import of GPL files
2014-09-07 18:25:17 +02:00
e457209c8f Enhancement : Palette color creator
- Added import button on create palette dialog
- implemented import from images
- missing limitation on color count when importing !!
- should remove button when editing existing palette
2014-09-07 14:31:28 +02:00
8643f4402a Moved PaletteService from pskl.service to piskel.service.palette 2014-09-07 12:27:06 +02:00
92d7109ef7 Enhancement : Palette colors creation
- Added cancel button to create palette dialog
- Added escape/unescapeHtml methods to pskl.utils
- Escaping palette name now ...
- Removed outdated comment in app.js regarding appEngine token
- Added a call to destroy() during dialogClose of AbstractDlgCtrl
2014-09-07 12:22:44 +02:00
6b32239fa1 fixed bug with hue slider capped to 255 2014-09-06 22:37:05 +02:00
8441f28ac1 Palette creator can save palettes to local storage 2014-09-06 12:37:11 +02:00
e8db80a0ec Extracted ColorPicker code to dedicated widget package (noooooooo) ; Added basic palette creation mechanism (list colors + add color) 2014-09-04 08:34:17 +02:00
7d9f8a8ccf Added color picker in create palette popup 2014-09-04 00:22:02 +02:00
073f46b0d7 starting palette implementation using creation wizard 2014-08-30 18:39:54 +02:00
32e528525c Small cleanup zip export screen 2014-08-27 01:12:29 +02:00
913ef272cf Merge pull request #214 from juliandescottes/feature-add-tests
Feature add tests
2014-08-26 23:57:45 +02:00
1a8f10c63d Merge branch 'posva-master' into feature-add-tests 2014-08-26 22:46:33 +02:00
b2ab504422 Drawing tests structure cleanup 2014-08-26 08:21:58 +02:00
35d4be5d3e Configuration clenup 2014-08-26 01:11:14 +02:00
efccfdc0c6 Added test for lighten / darken 2014-08-24 23:44:22 +02:00
895a15524d Cleanup of HistoryService, removed this.$serviceName for consistency 2014-08-24 18:10:09 +02:00
006d72a195 removed temporary file 2014-08-24 18:03:42 +02:00
13001bd7bd added drawing tests for all tools currently available 2014-08-24 17:57:30 +02:00
caebce5ec8 added test suite runner, removed tests from travis build 2014-08-23 22:45:52 +02:00
978319af20 Allow to rename basename for PNG in ZIP export option.
This may helps #192
2014-08-22 11:27:45 +02:00
a8788c83f1 add drawing tests to casper 2014-08-22 00:51:35 +02:00
56b1f421bc add drawing tests to casper 2014-08-22 00:37:35 +02:00
1955d3f8f5 First implementation of tool tester 2014-08-21 00:50:59 +02:00
17824ae1c4 Update README.md 2014-08-17 20:42:38 +02:00
34dbcedec3 Adding karma-phantomjs-launcher to package.json 2014-08-14 02:28:37 +02:00
e711050f75 Trying other version of node-webkit 2014-08-14 02:24:59 +02:00
844437dfc9 Update (hardcode to 1.4.21) npm version for travis build 2014-08-14 02:09:08 +02:00
715c148908 Update node version for travis build 2014-08-14 02:00:49 +02:00
b0ec276aac Adding karma tests to grunt build 2014-08-14 01:50:33 +02:00
8d8c40e6a6 tests update 2014-08-12 07:11:23 +02:00
6d6e80c762 tests update 2014-08-12 00:30:57 +02:00
05e8f9adac added karma runner + first test 2014-07-23 19:42:08 +02:00
1b99a22c1d Updated node and dependencies 2014-07-20 23:55:10 +02:00
280dd1a809 Merge pull request #208 from juliandescottes/feature-export-to-file
Feature export to file
2014-07-15 00:33:36 +02:00
c1900a07f0 Final fixes before new version 2014-07-15 00:31:24 +02:00
a43b20e182 fix lighten bug when starting on transparent pixel 2014-07-14 16:44:36 +02:00
b556143b66 fixed fps when restoring backup 2014-07-14 14:39:21 +02:00
19c99d1aa7 Fixed canvas ordering, fixed FPS during local import 2014-07-14 14:14:28 +02:00
dc78c3cecd Yet another history bug ! 2014-07-14 00:37:17 +02:00
829bcb8ad1 Simplified lighten + fixed frame caching bug 2014-07-13 21:01:50 +02:00
56f008bda6 restored history snapshot interval to 50 2014-07-13 18:17:13 +02:00
5350255eee fixed lighten reset + fixed history bug 2014-07-13 17:59:53 +02:00
d4884a2de5 Capture events on tmp download link created by FileUtils 2014-07-13 15:54:13 +02:00
581bd46dcd Cleanup + updated tooltips 2014-07-13 15:15:45 +02:00
1e8315f32c Switch back to imgstore-a 2014-07-13 14:11:49 +02:00
cc8460cc26 Fix gif worker URL on IE11 appengine mode 2014-07-13 14:02:35 +02:00
aa375315a2 Fixed mime type bug on Firefox 2014-07-13 01:01:33 +02:00
e5cb0717e2 cleanup 2014-07-13 00:43:35 +02:00
6af04bb599 cleanup 2014-07-13 00:21:36 +02:00
dfc3bfd181 Fixed Gruntfile for ghpages export 2014-07-12 21:14:07 +02:00
ad3dd935e0 Create 2 new dialog controllers
Image import is now triggering a popup after selecting the file.
Same for local saves.

Drag and drop of .piskel files opens the piskel immediately !

Remains to do :
- redesign the dialog for import image and browse local
- create dialog for recover session
- improve recover session to handle more than the last session
2014-07-12 15:34:50 +02:00
18ff6f88a7 Merge branch 'feature-dnd-images' into feature-export-to-file 2014-07-12 11:12:18 +02:00
b2fbe269d3 Merge branch 'master' into feature-export-to-file 2014-07-12 00:46:27 +02:00
a8ce829e6c Image dnd first implementation 2014-07-12 00:41:39 +02:00
2fabf68282 Merge pull request #203 from juliandescottes/feature-swap-color
Feature swap color
2014-07-11 00:25:22 +02:00
b66d5ee93b Cleanup of tooltip generation 2014-07-11 00:14:21 +02:00
982a5ab048 Refactoring tooltip code + display CMD on mac 2014-07-10 01:32:16 +02:00
a6d70920e2 Improve tooltip design 2014-07-09 07:56:22 +02:00
b311312260 Removed hack from ColorPicker class 2014-07-08 20:09:21 +02:00
665d2bd9bc Settled on temp icon for swap colors 2014-07-08 20:06:03 +02:00
4aac65fb9e Settled on temp icon for swap colors 2014-07-08 20:04:16 +02:00
4102e929f4 Removed unused methods from Frame 2014-07-07 23:33:29 +02:00
b3bb2472f1 perf step 1 : ok on chrome,horrible on FF 2014-07-07 22:48:13 +02:00
a6d939cc9a Fix selection paste transparent pixels 2014-07-06 23:59:07 +02:00
304a5c06da swap color : initial implementation 2014-07-06 23:56:50 +02:00
707a69182f Fixed IE issues + verisoning for iframeloader and boot 2014-07-06 17:15:18 +02:00
8f5ead43d9 Fix : remove cache issues for css, js, templates
Packaged css and js are now suffixed with the build date.
All templates are exported to a folder named after the build date.
Streamlined the build process to copy files to piskel-website.

Isolated common part between piskel and piskel-website in a separated
template, which is now completely created by the grunt build of piskel.

Added a windows CMD script to copy the static resources to piskel-website.
2014-07-06 16:17:14 +02:00
41a4ee3f3d cleanup of import tab 2014-07-06 12:55:29 +02:00
f8b6d7b0d3 Merge branch 'master' into feature-export-to-file 2014-07-05 23:53:03 +02:00
84e757768e Merge pull request #200 from juliandescottes/enhancement-horizontal-mirror
Enhancement : modifiers for Mirror pen
2014-07-05 23:11:20 +02:00
264e236473 Merge pull request #199 from juliandescottes/enhancement-overlay-shortcut
Enhancement overlay shortcut
2014-07-05 23:10:55 +02:00
96fc5f2418 Enhancement : modifiers for Mirror pen 2014-07-05 17:04:18 +02:00
26a463c4b4 Updated font-icon with a better grid 2014-07-05 14:16:53 +02:00
8e425c64d4 Add fonts to copy task 2014-07-05 11:45:10 +02:00
bf9be5de2d Fixed input range style on IE11 2014-07-05 11:41:40 +02:00
2c235e659b Fixed layout on FF, removed options in drawer 2014-07-05 11:39:02 +02:00
a77168986a Enhancement : Shortcuts for onion kin + layer prev
Added 2 new icons :
- Animated Preview Panel : toggle onion skin
- Layers Toolbox : toggle layer preview

Added an icon font generated with icomoon.

SVGs for both icons have been made under Inkscape and are kept under
misc/svg.

All reference SVGs have been moved to misc/svg.

Added 2 keyboard shortcuts for toggling onion skin / layer preview :
- alt L : toggle layer preview
- alt O : toggle onion skin
2014-07-05 11:27:11 +02:00
24186d5aec Added keyboard shortcuts 2014-07-04 19:17:02 +02:00
7b3f5ee858 Merged changes 2014-07-03 23:40:30 +02:00
939042a645 Merge pull request #195 from juliandescottes/performance-animated-preview
Performance animated preview
2014-07-03 23:29:01 +02:00
fa4e96e7e5 Added documentation in CachedFrameProcessor 2014-07-03 23:23:31 +02:00
fa626532ba cleanup of performance improvement 2014-07-03 00:48:49 +02:00
a2e2459169 cleanup of performance improvement 2014-07-03 00:09:47 +02:00
8a70943b09 Fix : fix classes extending simplePen 2014-07-02 07:34:07 +02:00
d126023c4a temp 2014-06-30 20:38:14 +02:00
f2281d7125 temp commit 2014-06-29 23:16:37 +02:00
3efa94dce5 Merge branch 'master' into feature-export-to-file 2014-06-27 07:16:48 +02:00
bd7ebc5f7d Fix : add backup service and make undo safer 2014-06-27 02:08:00 +02:00
89466d582a Feature : Save Piskel project as File
First commit :
Removed Local storage feature
Added 'download project' 'open project' options

First attempt at simplifying right panel.

To be continued ...
2014-06-23 00:49:54 +02:00
23fd3c464c Prepare 0.1.0 tag 2014-06-22 01:05:57 +02:00
5e5ec1a358 Scripts for packaging application 2014-06-22 00:05:02 +02:00
42c799d217 added scripts for desktop packaging 2014-06-21 22:39:37 +02:00
98f59fecf1 Feature : add onion skin option
New option in application settings : onion skin.
You can choose the overlay to display now :
- no overlay
- onion skin (default)
- layer preview (previous default)

Available in Application Settings panel.

Only one overlay can be used at the same time.
The onion skin overlay is driven by a new OnionSkinRenderer maanged by the
drawing.

The drawing controller is responsible for instanciating and 'choosing' the
overlay renderer.

When switching to a new overlay, other overlays are cleared and flushed
(they cache their rendering frame, flush empties the cache).

NB : flush is only available on LayersRenderer and OnionSkinRenderer for
now.
2014-06-19 23:33:57 +02:00
fbb5ccc7e2 Fix : bugs in imageToBlob and PngExportController 2014-06-17 07:46:15 +02:00
d0739e811d More cosmetic changes to README.MD ! 2014-06-14 15:04:18 +02:00
25089c1772 Add travis build status to README.cmd 2014-06-14 15:03:01 +02:00
762bd42790 Attempt to fix travis build 2014-06-14 14:55:27 +02:00
4f4cb1cf12 Attempt to fix travis build 2014-06-14 14:51:58 +02:00
2809a551d7 Fix : Export to GIF : download option
In the GIF export panel, user can now choose between :
- export online (previous 'upload' feature)
- download GIF

Labels have been updated in the PNG export panel to follow the same
convention.

CanvasToBlob library was modified and moved to dedicated utils to handle
not only canvas, but also any base64 dateURI.
2014-06-14 14:21:26 +02:00
d501129e8e Fix : retrieve piskel info from controller 2014-06-13 19:06:15 +02:00
a45407571e Fix : dont modify transparent color 2014-05-20 23:28:16 +02:00
da9cd78b56 Fix : dont modify transparent color 2014-05-20 22:42:39 +02:00
93f3526f4b Merge branch 'fix-zoom-level' 2014-05-18 17:33:25 +02:00
cdef28c60f Fix : force zoomMultiplier to 1 on using +/- 2014-05-18 17:32:20 +02:00
aafc74bab8 Merge pull request #185 from juliandescottes/fix-zoom-level
Fix zoom level
2014-05-18 17:18:17 +02:00
f1b6ea4ae3 Fix : zoom step depends on mousewheel event delta value 2014-05-18 16:33:01 +02:00
0fec4eff4a Fix: cannot detect mac touchpad : switch to throttling 2014-05-18 16:05:59 +02:00
6dc3a2bdf7 merge 2014-05-18 15:51:11 +02:00
ac2fe87558 Merge pull request #184 from juliandescottes/feature-shift-frame
Feature shift frame
2014-05-17 11:24:29 +02:00
5b4074fc38 Merge branch 'master' into feature-shift-frame 2014-05-17 11:11:29 +02:00
c7c536dc80 Fix : Loading state with delete frame/layer
The Frame and Layer selected after an undo/redo are now taken from the
next state saved in the HistoryQueue.
2014-05-17 11:03:18 +02:00
2aa8bf578b Enhancement : Move tool: shift out of bound pixels
When holding shift and using the move tool,pixels normally exiting the
frame will now be redrawn on the other end of the frame.

Makes it easy to perform sliding animations.
2014-05-17 11:01:09 +02:00
7cbf2b2794 Fix : Update tooltip text for lighten tool 2014-05-17 08:44:23 +02:00
1401c30d87 Fix : Lighten tooltip + fix for #170
Issue 170 : both selected frame and layer are kept after a resize
2014-05-17 00:38:13 +02:00
d8772bdd8d Fix : do not apply lighten if transparent 2014-05-17 00:09:59 +02:00
b0318c8b11 Merge pull request #183 from juliandescottes/feature-lighten-darken-simple
Feature lighten darken simple
2014-05-17 00:01:21 +02:00
0c441c214b Feature : darken lighten
Added new tool to lighten/darken. By default is in lightening mode. If the
user holds ctrl/cmd while using the tool, switches to darkening mode.

If the user holds shift while using the tool, then each pixel can only be
modified once per tool usage (ie user keeps hovering the same pixel, it
won't get lighter/darker after the first time). Can be useful if you want
to keep control of the amount of colors in the sprite.

TODO :
- Ability to select explicitly lighten/darken (context menu for
tools).
- Ability to set the 'step' (ie the strength of the lighten/darken)
2014-05-16 23:51:04 +02:00
7569a4343c Fix : Undo/redo for eraser 2014-05-16 22:40:09 +02:00
21a759d8eb Fix : trigger tool move on keyup to acknowledge modifier changes 2014-05-16 22:36:23 +02:00
a3c409ff94 Merge pull request #182 from juliandescottes/enhancement-gif-encoding
Enhancement gif encoding
2014-05-16 08:25:01 +02:00
a3108225f6 Fix : Zoom level : reduce zoom step on mac os + added keyboard shortcuts 2014-05-14 23:52:32 +02:00
6c882928cc Enhancement : Lossless GIF encoding
If there are less than 256 colors in the piskel, do not perform anycolor
quantization, just reuse the colors from the piskel.

Added preserveColorsParameter to gif.js library.

If nb colors>256, fallback to the previous behavior. This could be
improved by checking the number of colors for each frame. The palette is
defined independantly for each frame, so as long as a frame is <256
colors, we could reuse the original colors.

I also believe that images with more colors would get a better quality if
we could use a single color sample for all frames. This would avoid color
'gaps' as we can experience today. In any case, for piskel, < 256 is a
reasonable assumption
2014-05-12 01:06:37 +02:00
cf560fce0f Merge branch 'master' into enhancement-gif-encoding 2014-05-12 00:50:48 +02:00
cc45ede931 Initial commit 2014-05-12 00:50:13 +02:00
43957b4a13 Merge pull request #180 from juliandescottes/feature-tiled-preview
Feature tiled preview
2014-05-12 00:49:34 +02:00
384f8f71b1 Merge 2014-05-12 00:18:34 +02:00
2827bbe94a Merge pull request #179 from juliandescottes/feature-dynamic-palette
Feature dynamic palette
2014-05-12 00:10:26 +02:00
2ec71da0e8 Merge branch 'master' into feature-tiled-preview 2014-05-11 23:35:34 +02:00
a8e0fef416 Merge branch 'master' into feature-dynamic-palette 2014-05-11 23:34:49 +02:00
6fcbfe3873 Merge pull request #178 from fsvieira/master
Standalone App with node-webkit
2014-05-11 23:34:15 +02:00
0d599ae4a7 Merge branch 'master' of https://github.com/juliandescottes/piskel 2014-05-11 21:18:43 +01:00
8eb0374351 Change node webkit releases location, ignore unecessary files. 2014-05-11 21:16:57 +01:00
cfb846b6de Moved hardcoded values to constants in PaletteListController 2014-05-11 11:55:00 +02:00
94ce3907da Renamed UsedColorsService to CurrentColorsService + exposed getCurrentColors explicitly 2014-05-08 22:11:16 +02:00
453fbcf88e Fix : changed classnames used for primary and secondary color highlight in palette 2014-05-08 22:03:19 +02:00
3969867dfa Fix : bug when setting switching primary and secondary colors 2014-05-08 21:56:36 +02:00
9af23baa88 Fix : set name for tiled background checkbox 2014-05-08 21:23:15 +02:00
59195c9fb6 Tiled preview : mutualize canvas background update
When user changes canvas background, css class now applied on document
body.

Created new controller listening to Events.USER_SETTINGS_CHANGED to handle
this.
2014-05-08 20:57:31 +02:00
6ad5bde5d1 TiledPreview : follow up 2014-05-08 20:45:05 +02:00
98135d01f8 Merge branch 'master' into feature-tiled-preview 2014-05-08 01:42:53 +02:00
aa4c94e3af Feature : Tiled preview initial commiy 2014-05-08 01:41:14 +02:00
c98d25ab66 Fix : Duplicate Current Frame bug (shift+n)
Events were not raised when using Duplicate current frame on
PublicPiskelController.
2014-05-08 01:36:59 +02:00
637fa05109 Feature : Current colors palette
Created dynamic palette displaying currently used colors.
This palette is now selected by default.

New service UsedColorsService created. Listens to PISKEL_RESET and
TOOL_RELEASED and keeps track of the list of current colors.

Still need to :
- improve sorting of colors
- allow to clone the current color palette as a custom palette
- add proper getter in UsedColorService to get the list of current colors

Also I hardcoded a max-height for the palettes-list as I found no better
way of handling the case of palettes containing many colors.

Maybe should add a limit to the number of colors handled by this automatic
palette.
2014-05-07 00:43:28 +02:00
db6dff0564 change node webkit versions to work with older node versions. 2014-05-06 19:27:24 +01:00
f4108c7dbf Fix : removing useless label in resize panel 2014-05-06 07:27:12 +02:00
7ad836f9f9 Setup nw releases destinations to build folder. 2014-05-06 03:16:51 +01:00
8a85e953f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	Gruntfile.js
2014-05-06 02:53:18 +01:00
c565111947 Added grunt server and server:watch tasks 2014-05-05 23:43:23 +02:00
fa3b44baf9 Build : Added grunt server:debug target 2014-05-05 23:20:00 +02:00
f16b810ffb Merge pull request #177 from juliandescottes/enhance-build
Enhance build
2014-05-05 23:13:30 +02:00
adca1bbd08 Added grunt server task to run server+watch 2014-05-05 23:08:11 +02:00
bc23e9cea6 Enhancement : full piskel build deployed to dest
Use grunt [default] to build the application.
Target dest with a webserver to launch the application.
2014-05-05 22:36:34 +02:00
b7362c7082 Merge pull request #175 from juliandescottes/feature-resize-content
Enhancement : Possibility to resize canvas content during resize
2014-05-05 22:05:10 +02:00
0b1977b47c Fix : Fixed styling for resize content checkbox 2014-05-05 21:58:17 +02:00
1db937ae01 Enhancement : Possibility to resize canvas content during resize
- new checkbox in resize panel
- content is resized using nearest neighbor
- deactivated by default

2 bug fixes :
- remove focus after closing drawer
- fire resize event after undo/redo if size changed
2014-05-04 22:58:36 +02:00
7fb5fe93fa Make desktop app directory with all nedded files before build it. 2014-05-01 01:00:10 +01:00
b2bdb252b7 Merge remote-tracking branch 'upstream/master' 2014-04-30 23:59:47 +01:00
38f18360b8 Fix : selection : click on non transparent pixel was cancelling selection 2014-04-30 08:30:29 +02:00
d803e88c93 added node-webkit to generate standalone app. 2014-04-28 22:13:44 +01:00
a060e32b15 Enhancement : #169 : Use several meta for shortcut
- can now use shift+ctrl+alt in shortcut definition
- paste opaque for selection remapped to ctrl+shift+V
2014-04-24 13:28:21 +02:00
cf2c0e7045 Enhancement : preview copied selection + paste only opaque 2014-04-24 00:38:21 +02:00
98aad13f1e Merge pull request #168 from juliandescottes/feature-undo-redo
Feature undo redo
2014-04-23 23:56:31 +02:00
af52d9a96a Enhancement : Selection tools various enhancements
- can use BACKSPACE key to delete selection content
  when no selection, backspace retains the default behavior
- cursor for rectangle selection has been changed to crosshair
- fixed a bug where selection seemed to be cropped when released out of
  the visible canvas
2014-04-23 23:47:23 +02:00
5541d030a5 Feature : undo redo including frame/layer actions
- Frame and Layer CRUD actions are now registered and can be cancelled
- Limited performance impact while drawing
- Improved frame cache invalidation
2014-04-22 23:57:30 +02:00
c2a3ccc8d0 Simplified SAVE STATE events, added wrap method to easily build decorators 2014-04-20 13:15:30 +02:00
8335c07519 Fix : layer manager was broken 2014-04-19 20:19:24 +02:00
b8ef570077 Removed cached serializer in Frame.js 2014-04-19 20:04:43 +02:00
d45ea00ca5 Refactored piskel controller to extract the event creation 2014-04-19 16:01:51 +02:00
b7e4deae00 Fix : frame and layer should be correctly selected when loading a snapshot state 2014-04-18 13:13:42 +02:00
0cecdc74eb Temp commit 2014-04-17 01:27:49 +02:00
b712a497e2 Feature : import sprites from GIF 2014-04-12 18:54:39 +02:00
9e78086ea8 Feature : import sprites from GIF 2014-04-12 18:48:39 +02:00
a59bfcab11 Feature : import sprites from GIF 2014-04-12 18:40:25 +02:00
29fa604d74 Fix : protect LayerRenderer against fake setDisplaySize calls 2014-04-12 15:16:18 +02:00
c5accf978e Fix : Plug PreviewFilmController to USER_SETTING_CHANGED 2014-04-12 14:19:28 +02:00
76044fa6d4 Fix : Plug PreviewFilmController to USER_SETTING_CHANGED 2014-04-12 14:19:13 +02:00
23f1e8908e Enhancement : performance : event delegation for previewfilmcontroller 2014-04-12 14:15:45 +02:00
b217f8f005 Added progress bar for GIF rendering 2014-04-12 12:09:22 +02:00
09319ecc1b Added progress bar for GIF rendering 2014-04-12 12:08:53 +02:00
3abf0897d5 Enhancement : display canvas size next to cursor coords 2014-04-12 10:14:57 +02:00
ee3285089a Enhancement : shape tool + shift : now constrained to minimum 2014-04-12 09:49:29 +02:00
4804477498 Merge branch 'master' of https://github.com/juliandescottes/piskel 2014-04-11 23:36:26 +02:00
dc729ee80b Feature : display cursor coordinates
- new controller CursorCoordinatesController
- added div in right column (bottom:0)
- 3 new events : CURSOR_MOVED, DRAG_START, DRAG_END
- modified tools to fire events when necessary

The cursor coordinates are displayed when the mouse is hovering the
drawing area. When the mouse leaves the area, the indication disappears.
If the user is using a tool that involves dragging (selection, rectangle,
circle), the indicator displays the original coordinates (captured during
drag start) and the current coordinates.
2014-04-11 23:32:28 +02:00
0d3a078145 Update README.md 2014-04-11 01:14:07 +02:00
abd5ac5959 Feature : export to ZIP 2014-04-11 01:12:01 +02:00
d42064d2fe Merge branch 'feature-color-palette' 2014-04-09 23:39:20 +02:00
dd4a544d7a Bug : current layer index was a string 2014-04-09 23:38:35 +02:00
39d7d4d8c8 Enhancement : Rename layers
- added rename icon in layers list
- mutualized CSS for edit icon between palette manager and layers list
- new CSS file icons.css for actions/links/buttons using icons
- layers are no longer retrieved by name, but by index
2014-04-09 23:24:25 +02:00
78974a9a93 Merge pull request #159 from juliandescottes/feature-color-palette
Feature color palette
2014-04-07 23:00:07 +02:00
644b72cc6e Bug : New palette name was set to object MouseEvent ! :) 2014-04-02 22:53:58 +02:00
1ce633bd06 Fix : Tools event listeners are now on window
Smoother user experience. Drawing shapes, selecting etc... is no longer
blocked by either the drawing canvas or the document.
2014-04-02 22:37:01 +02:00
c9251229fc Feature : Hold shift to preserve shape ratio
- mutualized shape tools common code in a ShapeTool class
- when holding shift and drawing a frame, the ratio is preserved
- selection and shape tools now support the mouse to leave the drawing
  area
- shape tools can go 'outside' the drawing canvas
- Frame set/getPixel now check the pixel is in range instead of crashing
2014-04-02 22:21:32 +02:00
7357614d9a Fix : Window resize is erasing the canvas
Issue was coming from the cached frame renderer.
During the window resize, we update the displaySize of the frame renderer,
regardless of the fact that the dimensions changed or not.

The setDisplaySize triggers a destruction of the canvas. But the
CachedFrameRenderer will render the frame only if it detects a change. In
this case, setDisplaySize has been overrided in CachedFrameRenderer to
skip any processing if the dimensions didn't change.

This behavior could be actually done in the FrameRenderer itself, but
since this is crucial to the CachedFrameRenderer behavior, I prefer to
keep it in this class.

Alternatively, could implement a way to discard caches of
CachedFrameRenderers from the outside.
2014-03-30 23:28:18 +02:00
090443c318 Feature : Color palette : fix spectrum issue
The palette manager UI is redrawn almost everytime the model changes.
This way, UI is always in sync with the model.

However, spectrum instances are spawning everytime a redraw is performed.
They cannot be cleaned before the redraw is performed, because if a
spectrum picker is opened, it should remain like this. This allows the
cuser to keep modifying a color without having to reopen the picker each
time he/she stops on a color.

As a workaround, I keep a reference on all the spectrum containers and
destroy them all when the manager is disposed.

Ideally I'd prefer to have a single spectrum instance that I could move
around depending on which color the user wants to edit. I.e. I want to
mutualize all the picker instances ...  But this will require a bit more
work.

Also added a notification when the user saves a palette.
Updated z-index of user-message container so that it is always above the
rest of the application.
2014-03-30 22:42:28 +02:00
3be4c78883 Fix : resize application on startup to adapt correctly to narrow screens 2014-03-30 21:55:29 +02:00
3765ce3d5e Issue #158 : updated zindex of minimap zoom square 2014-03-30 21:29:44 +02:00
4410aa5420 minor fix : remove console.log in PalettesListController 2014-03-30 21:01:14 +02:00
6d62d11872 Fix : drawing with the right mouse button (FF, IE)
Mousemove events do not have the correct button information
Need to keep the state of which button is clicked at which moment

This was actually the initial implementation ...
But I removed it because I couldn't remember why we did this in the
beginning.

Added lots of 'warnings' in comments, but won't be safe until we get good
integration tests.

References :
- FF : https://bugzilla.mozilla.org/show_bug.cgi?id=297919
"What if multiple buttons are pressed during mouse move?  And how does the
integer field (button) indicate that no button is pressed?  I think this
should be wontfix -- if people need button information during mouse move events
we need a new way of getting it (buttonSet), not the same way it works for click,
etc."
- IE : couldn't find any reference ...
2014-03-30 20:39:00 +02:00
b734db28dc Css fix + bug fix : double palette created when empty local storage 2014-03-30 16:54:26 +02:00
5b7e07e11e Fixed : spectrum pickers where no destroyed properly 2014-03-30 16:20:58 +02:00
7f17e17cff Minor css fix : adding 5px margin to palettes-list-colors 2014-03-30 15:38:13 +02:00
231ae9e165 Feature : color palette
- Fixed : manager UI is redrawn after save
- the Selected palette is saved as a user preference
- default background is now the dark one
- the selected palette is not reset after closing palette manager
2014-03-30 14:56:31 +02:00
4947cc4820 moved css to avoid img relative path issue after build 2014-03-30 03:11:31 +02:00
0e94606f41 moved css to avoid img relative path issue after build 2014-03-30 03:10:34 +02:00
b0ed5e4a7f Feature : palette color manager
- implemented save all functionality
- minor css update
2014-03-30 01:59:14 +01:00
85b64a9f04 test 2014-03-30 01:12:01 +01:00
d2ec797496 integrate palette list with palette manager 2014-03-30 01:10:00 +01:00
41e52a7a39 minor css fixes 2014-03-29 18:49:31 +01:00
f2da622edb Merge + palette manager 1st drop
- can create palettes
- palettes are persisted to local storage
- can add colors to palettes using spectrum color picker
- can remove created palettes
- can revert changes on unsaved palettes

Merge branch 'master' into feature-color-palette

Conflicts:
	src/css/spectrum/spectrum-overrides.css
2014-03-29 18:35:56 +01:00
f2aceedefd Merge pull request #157 from juliandescottes/feature-colorpicker-hexa
Feature colorpicker hexa
2014-03-26 07:51:36 +01:00
173936d74f Force rgb format, remove extra padding 2014-03-26 07:50:37 +01:00
d4f315e0c1 Color Palette : Added popup mgr + palettes list 2014-03-26 07:41:45 +01:00
1f022fd4a7 Enhancement : Add hint to see Keyboard cheatsheet 2014-03-18 01:45:59 +01:00
8581e4ec65 feature : allow user to input hexa for color 2014-03-16 23:41:38 +01:00
903f6817cf feature : allow to delete current selection
* Users can now use DEL to delete the current selection
* Cheatsheet has been updated accordingly
* Cheatsheet has been refactored to mutualize markup creation code
2014-03-16 23:22:47 +01:00
4b608e98a9 Merge pull request #154 from juliandescottes/feature-change-grid-size
Feature change grid size
2014-03-16 22:56:07 +01:00
4b0b1a4bad doc : Updated JS Doc for ImageResizer 2014-03-16 22:53:10 +01:00
9ae01cb074 feature : change grid size
* removed SHOW_GRID boolean, replaced with GRID_WIDTH
* gridEnabled on a frame is now infered from the grid width setting
* updated template to use a select to pick the grid size
2014-03-16 22:46:43 +01:00
c38300392e Updating README.md 2014-03-16 22:09:48 +01:00
3258f0a383 Updating README.md 2014-03-16 21:25:20 +01:00
87574a2b30 Cleanup project root 2014-03-16 21:15:34 +01:00
50e7d05764 Update README.md 2014-03-15 17:00:11 +01:00
b32d0ddcfe Cleanup README.md
Removed old screenshots, added actual information about the project !
2014-03-15 16:59:16 +01:00
f139a9c130 Fix : Drawer was not opening when clicking on text
- SettingsController : event is stopped after click on icon has been
  processed. This way onBodyClick callback is not triggered
2014-03-13 00:22:15 +01:00
087b8c57c5 UI : Align PNG export with GIF export
- PNG export now has its own panel
- Lots of code duplication between PNG and GIF controller => FIXIT
- Added a link displayed after image upload
2014-03-08 17:23:20 +01:00
0072a2c8b0 UI : Use template for drawing tool markup
Switched to templates instead of string concatenation.
Template for drawing tool LI is defined in drawing-tools template
2014-03-05 00:01:47 +01:00
ab401d3013 UI : Add Keyboard shortcuts on tools tooltips 2014-03-04 23:47:56 +01:00
a430d72415 UI : Color of zoom border minimap
Also UI : Position of selected vertical mirror pen icon
2014-03-04 23:42:32 +01:00
47c6261289 Merge pull request #153 from juliandescottes/feature-local-storage
Feature local storage
2014-03-03 23:10:49 +01:00
cac1fa8ed5 UX : Primary/Secondary colors usability
- Added swap colors icon
- Created SVG icon, source is in resources (Inkscape)
2014-03-03 22:50:08 +01:00
b51620634e UI : update display of palette tool icons 2014-02-20 18:26:35 +01:00
2f1e13ca20 Added private rule to gitignore 2014-02-16 22:37:09 +01:00
0f817ddf58 Increased timeout config for Remote build 2014-02-12 00:14:24 +01:00
5d4ba0b79f Added comment 2014-02-12 00:08:52 +01:00
aae994b3d5 Feature : Saved status and warning msg
Added saved status (*) next to title when a Piskel is updated.
Upon saving, the * disappears.

If the workspace contains an unsaved piskel when leaving the application a
message will be displayed to the user, using onbeforeunload.

This logic should also be used everywhere we display a confirm message
before a navigation.
2014-02-11 23:42:38 +01:00
bd0adda73f Various bug fixes
- Added missing files from previous commit
- Fixed move cursor that would remain after using a Selection tool
- Switched to mousedown for Tool Selection to avoid missed clicks
2014-02-11 22:04:44 +01:00
85084b8279 Added localstorage save + read 2014-02-10 01:00:16 +01:00
676bf1c7fd Fix : Settings drawer close usability bug
+ Settings drawer could not be closed when clicking above or below its
container. This has been fixed by changin the logic used for determining
if the click was inside/outside of the Settings drawer.

+ Added DOM utility to compensate for the limitations of JQuery
contains...
2014-02-09 21:49:08 +01:00
c105619605 Merge pull request #152 from juliandescottes/feature-resize-panel
Feature resize panel
2014-02-09 21:14:42 +01:00
0dc5b2bc31 Merge branch 'feature-save-panel' into feature-resize-panel 2014-02-09 21:12:32 +01:00
a31e3570f3 Merge branch 'feature-save-panel' of https://github.com/juliandescottes/piskel into feature-save-panel 2014-02-09 21:10:09 +01:00
e8d96bf73f Fix : added missing Method on BaseSelect
- TODO : Review usage of hideHighlightedPixel in Tools
2014-02-09 20:56:45 +01:00
9fc971f40b Added resize canvas panel 2013-12-24 12:57:03 +01:00
0d2337221c Merge pull request #151 from juliandescottes/feature-save-panel
Feature save panel
2013-12-24 02:52:37 -08:00
fc19695a4a Misc : start frame index at 1 in PreviewFilm 2013-12-24 11:51:41 +01:00
fbdf1aaf9a added loading over + fixed bug with highlighted pixel removal 2013-12-23 15:04:13 +01:00
f98c2d2cf5 Issue#148:JSError when deleting first frame + preview speed accuracy 2013-12-19 00:15:40 +01:00
4056142b97 Issue#145 : Hide highlighted pixel
+ BaseTool : added new method hideHighlightedPixel
+ DrawingController : mousemove event plugged on mousenter
  and unplugged on mouseleave
+ DrawingController : tool.hideHighlightPixel called on mouseleave and
  when switching the current tool to active (i.e. when user starts
  clicking)
2013-12-18 23:37:17 +01:00
e4cf2ac40b Merged 2013-12-18 23:22:25 +01:00
b77f7057d7 save-panel : added piskel descriptor 2013-12-10 21:25:36 +01:00
8b6958bf0b feature:save-panel : reuse textfield css 2013-12-10 21:22:53 +01:00
b11b16b427 initial 2013-12-06 18:04:04 +01:00
cecadf54e1 Merge pull request #144 from juliandescottes/improve-color-selection-ux
Improve color selection ux
2013-12-05 13:14:00 -08:00
e4c14e234e ok this one is chaos 2013-12-05 22:12:48 +01:00
0109eb81dd spectrum modification : add position information top container 2013-11-28 07:40:28 +01:00
167adaceb0 spectrum modification : add position information top container 2013-11-28 07:24:08 +01:00
8cf588b26d Design attempt 2013-11-27 23:46:07 +01:00
75dc1c5944 Design attempt 2013-11-27 23:43:59 +01:00
42862e188d Design attempt 2013-11-27 23:24:03 +01:00
c04a645991 Design attempt 2013-11-26 23:49:55 +01:00
5bbbdf64d9 Merge from master 2013-11-26 21:40:43 +01:00
569f42b7e2 Fix : fire resize event after loading piskel 2013-11-25 22:24:55 +01:00
46b267c2a4 Merge pull request #143 from juliandescottes/add-keyboard-shortcuts
Add keyboard shortcuts
2013-11-24 06:23:47 -08:00
bb9bafd67c Merge pull request #142 from juliandescottes/reduce-piskel-model-size
Reduce piskel model size
2013-11-24 06:18:05 -08:00
11a3155e38 Merge branch 'master' into improve-color-selection-ux 2013-11-23 19:51:47 +01:00
e852fb7c57 Merge with master after PR zoom-level 2013-11-23 19:50:53 +01:00
3de3c3542e Post merge fixes 2013-11-23 19:33:00 +01:00
ce111be5c8 Merging from master after PR zoom level 2013-11-23 19:25:51 +01:00
e88d8fae07 Merge pull request #141 from juliandescottes/zoom-level
Zoom level
2013-11-23 05:21:37 -08:00
f26b1d4ebc improve : color picker : initial implementation using spectrum 2013-11-21 00:44:46 +01:00
2d3bbc73f1 Forgot to add duplicate frame shortcut to cheatsheet 2013-11-20 23:00:47 +01:00
0a05374af5 feature : add keyboard shortcuts
+ added shortcut to create new frames (n)
+ added shortcut to duplicate frame (shift+n)
2013-11-20 22:58:20 +01:00
6eabf01ffc feature : add keyboard shortcuts
+ decentralized shortcut declaration
+ each service/controller is now responsible for declaring its shorcuts
- documentation (cheatsheet) is still to be maintained manually
- init order matters (shortcutService has to be instanciated before
  everyone else) => should have a standalone KeyboardService singleton
  which is ready as soon as it is loaded
2013-11-19 23:46:33 +01:00
9d0f41362b Fix : typo 2013-11-19 08:15:37 +01:00
7d296f3dc3 Fix : add keyboard shortcuts : forgot misc keys 2013-11-19 08:13:16 +01:00
a0273edb3e feature : add keyboard shortcuts
+ cleanup of color management
+ colors are now stored in palette controller
+ drawing controller has a dependency on palette controller
+ UPDATE COLOR events have been removed (they were used only for
synchronizing palette and drawing controller)
2013-11-19 07:40:35 +01:00
e0b76f5329 feature : add keyboard shortcuts : added help panel displayed on shift+? 2013-11-18 23:53:12 +01:00
c033d65cde fix : tool icon not selected when using shortcut 2013-11-17 22:47:21 +01:00
f0ef016309 feature : add keyboard shortcuts : initial impl
+ added shortcuts for all tools in ToolController
+ modified structure of tools in Controller to Array of descriptors to
allow to declare shortcuts directly when setting up the tool controller
2013-11-17 22:07:26 +01:00
25e6470499 feature : add keyboard shortcuts : keycodes
+ moved keycode translation to KeycodeTranslator
+ made KeycodeTranslator more generic to handle 0-9 and a-z keys
+ small refactor in KeyboardEventService
2013-11-17 21:15:53 +01:00
5d83a39cf0 feature : add keyboard shortcuts : Events cleanup
+ Removed unused events
2013-11-17 20:20:27 +01:00
e68ae7f31d feature : zoom level : code review
+ Switched from BITWISE OR 0 (x | 0) to Math.floor for readability
2013-11-15 00:39:43 +01:00
3af64d3f45 feature : zoom level : code review
+ added explanatory comment for CanvasUtils.disableImageSmoothing
+ detect browser for chosing wheel/mousewheel event in DrawingController
+ create ABSTRACT_FUNCTION constant to be reused forabstract methods
2013-11-15 00:32:18 +01:00
86cd1cdeaa fix : reduce piskel model size
+ moved Serializer and Deserializer to utils.serialization package
+ put all backward code in utils.serialization.backward
+ added static method on Deserializer to make its usage similar to other
  utils in the package
- still not happy with the names used in Deserializer classes
  (deserializer.deserialize ...)
2013-11-15 00:03:05 +01:00
4a1a7b6c2b fix : reduce piskel model size : ImportController
+ ImportController is no longer relying on the deserializer to build a
  piskel instance
+ Static builders have been added to Piskel and Layer to help easily
  create new instances from existing elements
2013-11-14 23:03:29 +01:00
e9a2ccfd1d fix : reduce piskel model size : fix import feature 2013-11-13 23:51:27 +01:00
df4978f6af fix : reduce piskel model size
+ piskel deserialization is now clearly asynchronous
+ added utils.Deserializer (not a singleton though, more a builder/loader)
+ utils.Deserializer constructor expects a callback
+ when all layers are loaded and piskel is ready, the callback provided by
  the client is called with piskel as the first argument
- Deserializer doesn't fit in the utils package, which should be reserved
  to singletons : can move it to service as a PiskelLoaderService, and
  Deserializer could remain with only the purely static methods
- ImportController is realying on the Deserializer to build a Piskel but
  it shouldn't. Find a way to mutualize the code necessary to create a
  Piskel from an array of pskl.model.Frame
- still cleanup to do in app.js
- comments to add as well
2013-11-13 23:39:43 +01:00
781abb735b fix : reduce piskel model size
- added backward compatible implementation for v1 models
2013-11-13 22:57:07 +01:00
4f54715f70 fix : reduce piskel model size
- Initial implementation : working but ...
- MODEL_VERSION has been bumped to 2
- The loading process is now theoretically asynchronous (loading images to
  read the content of the layers), but for now, the asynchronous behaviour
  is hidden behind a nasty hack, which is somehow similar to lazy loading.
  When loading the piskel, a Piskel is created synchronously, with fake
  empty frames, and as the images will get loaded, the fake frames will be
  replaced by the actual frames.

  I really don't like this, and the asynchronous nature of the loading
  should be clearly expressed
- There is no backward compatible deserializer for the previous version of
  the model (1)
- The Serializer utils is just badly designed. Serialization and
  deserialization should be splitted into two different classes
- Saving & loading are still done in app.js and should be moved to
  services

BUT : the size of the piskels is now pretty small. A piskel which was
using 890kB previously is now using only 10kB. Although it should be
noted, that after gzip there is no significant difference between this
version and the existing one. The only gains we can really expect with
this are : less disk space used on appengine, ability to reuse the
layers' pngs directly on piskel-website (but to be honest I can't see any
valid use case for this)
2013-11-08 00:44:24 +01:00
c8a8d470a7 renamed all references to dpi to zoom for consistency (also wtf dpi anyway !) 2013-11-05 22:11:47 +01:00
bd030fdf1f Merge branch 'master' into zoom-level 2013-11-05 00:15:08 +01:00
6e1ce724cb feature : zoom level
- fix : removed duplicated code between ImageResizer and CanvasUtils
  (disabledImageSmoothing utility method)
- added pskl.utils.UserAgent, basic user agent sniffer. I need it to sniff
  out IE10 for frame rendering (and it's not possible to feature detect
  here). Can check isChrome, isFirefox, isIE and get the version for each
  of them
- added resizeNearestNeighbour in ImageResizer. Readapted from piskel
  website, this allows us to 1 - resize without AA on IE10, and 2 - add a
  pixel gap to reenable the GRID
- finally : added back support for GRID !
- also extracted the 'zoomed out background color' as a constant in
  Constant.js
2013-11-05 00:05:49 +01:00
2248f41e68 feature : zoom-level
- Fixed bug with layer rendering when moving drawing offset (bad
  redraw-flag checking)
2013-11-02 13:45:41 +01:00
44722ab88e feature : zoom-level
- Fixed bug with layer rendering when moving drawing offset (bad
  redraw-flag checking)
2013-11-02 11:39:35 +01:00
cd4952cc7b feature : zoom-level
- Minimap usability : mouseup and mousemove events are now plugged on
  document.body instead of the minimap's controller. This way the user can
  move his mouse outside the container to keep moving the map's frame.
  Also the mouseup information is no longer lost if it occurs outside for
  the minimap.
2013-11-02 11:24:02 +01:00
eb559eee0c fix : import-picture-panel
- When imported 1 picture and then importing another one, the picture
  preview was not cleaned and was displaying the two images side by side.
  Fixed in ImportController.js
- Switched all double-quoted strings in ImportController to single-quoted
  strings. Should enforce this using jshint
- Aligned all inputs in the import picture panel
- Renamed 'Preview :' import section to 'Info :'. Mostly it's to make it
  shorter, but also I'd like to display additional information to the
  right of the preview in the future.
2013-11-02 11:02:03 +01:00
e0d63bf295 fix : renderer resize on window resize 2013-11-02 00:00:38 +01:00
8a380b6c78 merged from master 2013-11-01 23:37:09 +01:00
5693f34fb9 fix : LocalStorageService deserialization 2013-11-01 23:30:33 +01:00
2ba451d42c Merge pull request #140 from juliandescottes/import-picture-panel
Import picture panel
2013-11-01 15:28:17 -07:00
bd99027852 feature : zoom
- Added MinimapController that displays a frame on the animated preview
  when zoomed in
- Added bounds for the offset to make sure it doesn't go crazy
- Added new utility Math.js with a minmax function
- TODO : the minimap controller has a lot of dependencies, see if could be
  cleaned up
- TODO : DrawingController knows the size of the picture it has to render
  only indirectly, which makes it hard in some cases (such as boundary
  checking performed during setOffset)
2013-11-01 23:11:11 +01:00
68edbe62c7 Forgot 2 files ! 2013-11-01 17:17:41 +01:00
472906957a feature : zoom :
- Extracted layers rendering logic from DrawingController to dedicated
  class
- Turned RendererManager into Composite renderer (extends
  AbstractRenderer)
- AbstractRenderer no longer contains a render(frame) method, implementing
  the render differs too much between my current renderers to impose a
  single signature, but I should improve this later if too much time on ma
  hands
2013-11-01 17:12:59 +01:00
b7e8310b61 feature : zoom : continued
- simplified Renderer(s) architecture (removed decorator,
  CachedFrameRenderer simply inherits from FrameRenderer now)
- keeping AbstractRenderer to act as interface
- fixed issue with layers : forgot to clone the first frame while merging
  and therefore was modifying the original frame when I just wanted to
  create a tmp frame (FrameUtils.js)
- extracted the mousemove throttling delay used in DrawingController to
  Constants.js and reduced it from 40ms to 10ms
2013-11-01 16:27:23 +01:00
51f86afe6e feature : zoom
- Created AbstractRenderer in rendering package
- Created CachedRenderer and CachedFrameRenderer to extract basic frame
  caching logic from DrawingController
- Created RendererManager to synchronize updates made to several Renderer
  settings
- Moved FrameRenderer from pskl.rendering to pskl.rendering.frame
- Fixed the resize of the drawing area when the window is resized
2013-11-01 15:39:42 +01:00
3ce9aaa843 Added utilities for alpha-composition in FrameUtils, for future usage ... maybe 2013-11-01 11:17:50 +01:00
7490651f83 Zoom initial implementation. No UI, only bound to mousewheel. Everything is broken, to amend ! 2013-10-29 22:16:39 +01:00
2f6f0d14e1 Merge branch 'master' into import-picture-panel 2013-10-28 21:58:28 +01:00
a69b83e9bd Fix : layer : duplicateFrame bug 2013-10-28 21:57:59 +01:00
c332aa2dea import-picture-panel : IE10 CSS fix for input text with text-align:right 2013-10-25 00:32:42 +02:00
b2258a668d import-picture-panel : IE10 CSS fix for input text with text-align:right 2013-10-25 00:31:45 +02:00
a0a1fa7bdf Added preview picture. Added a flow : start with only file input enabled 2013-10-23 23:34:09 +02:00
3dde3504d1 Synchronize resize fields, resize image when importing 2013-10-23 01:01:35 +02:00
6c0f54032d Import panel 2013-10-22 07:40:08 +02:00
61419f0bba import panel : before removal of import from URL option 2013-10-21 23:08:12 +02:00
2509ba80a4 intermediary 2013-10-18 08:01:25 +02:00
07cb37f2bf Merge branch 'master' into import-picture-panel 2013-10-16 23:15:09 +02:00
1156008213 Import from file 2013-10-16 23:14:41 +02:00
a8b42a35da import template basic version 2013-10-16 21:43:47 +02:00
721783ce6c Merge pull request #138 from juliandescottes/piskel-website-adaptations
Piskel website adaptations
2013-10-11 11:27:28 -07:00
f549174424 Import panel:
- added pskl.controller.settings.ImportController (empty atm)
- moved SettingsController under settings namespace
- move settings templates in a dedicated folder
- created import icon (svg is in the resources folder)
- added import button in right-layer
2013-10-11 00:04:40 +02:00
4527846ad6 PR138#commitcomment-4293036 use full namespace when specifying a classtype
See https://github.com/juliandescottes/piskel/pull/138#commitcomment-4293036
2013-10-10 13:35:18 +02:00
55e3607ecc Cleanup of saving/loading process 2013-10-10 00:06:11 +02:00
564f74265a Piskel website adaptations :
M CanvasRenderer : can set the color used to represent transparency
M app.js : modified code responsible for saving when in website mode
M PiskelController.js : just some argument renaming
2013-10-08 23:44:06 +02:00
913a50cb28 Merge pull request #129 from juliandescottes/cleanup-cheap-templates
Refactor : moved cheap-templates.js to lib. Added documentation
2013-10-04 15:07:01 -07:00
93ba8c70a0 Merge pull request #130 from juliandescottes/layers-backward-compatibility
Layers:Added backward compatibility for previous models
2013-10-04 15:03:27 -07:00
17a147c880 grrmml 2013-10-04 23:55:45 +02:00
1e99a051e6 Rollback of initialization sequence 2013-10-04 23:46:19 +02:00
894486fba6 Review : fixes 2013-10-04 23:26:53 +02:00
5502d75ca5 Layers:Added backward compatibility for previous models 2013-10-04 22:59:42 +02:00
a87b09908d Refactor : moved cheap-templates.js to lib. Added documentation 2013-10-04 22:25:47 +02:00
09da75af92 Removing external libs from Closure compiler pass 2013-10-02 00:11:03 +02:00
a075a1c8b3 Merge pull request #128 from juliandescottes/feature-gif-export-panel
Feature gif export panel
2013-09-30 15:51:20 -07:00
2686a2e944 Layers:Review:Removed grid drawing routine : was never drawn 2013-09-30 22:44:02 +02:00
f514b6cd10 Layers:Review:Cleanup of GifExportController 2013-09-30 22:00:31 +02:00
7aa407970f Layers:Review:Rename LayersController to LayersListController 2013-09-30 21:22:58 +02:00
64daa05140 Layers:Review:Rename layers.html to layers-list.html 2013-09-30 21:20:40 +02:00
90f2fac2d3 Layers:Minor style changes 2013-09-29 23:33:40 +02:00
b3d1cc5ea6 Layers:Review:Added todos in cheap-templates.js 2013-09-29 23:27:23 +02:00
4eebff804b Layers:Review:Renamed layers-container to layers-list-container. Extracted URLs to Constant.js 2013-09-29 23:26:09 +02:00
76511058d1 Layers:Review:Rename renderers frame up/down to above/below 2013-09-29 23:16:32 +02:00
4f754c6af2 Layers:Review:Changed FrameRenderer className property to classes (array) 2013-09-29 23:14:10 +02:00
17ba93cc9f Layers:Review:Renamed layers canvases css classes to layers-above/below-canvas 2013-09-29 23:05:24 +02:00
bcf34e6e55 Layers:Review:Only one selector per line 2013-09-29 22:53:05 +02:00
82dda463a8 Dev environment : JSHint will raise error if trailing whitespace 2013-09-29 22:50:24 +02:00
b261884d2b Dev environment : Remove globals 2013-09-29 00:06:07 +02:00
87ba28372c Layers : Deleted js/model/Framesheet.js
No longer used
2013-09-29 00:02:21 +02:00
be9238c9b1 Layers : FRAMESHEET_RESET -> PISKEL_RESET
Framesheet no longer exists.
2013-09-29 00:01:18 +02:00
ca427e0853 Dev environment : closure compiler + jshint update
Fixed error raised by closure compiler
Added es3 option to jshint (detect trailing commas)
Added curly option to jshint (missing curly braces for if/for blocks)
Removed trailing whitespaces (not enforced through jshint though)
2013-09-28 23:52:51 +02:00
b254c582b9 Merge branch 'master' into feature-gif-export-panel 2013-09-28 23:37:12 +02:00
80b336aab5 Merge pull request #127 from juliandescottes/closurecompiler
Basic wiring of Closure compiler
2013-09-28 14:32:59 -07:00
948457a3dc Show closure compiler warnings
- Flush JS binary to temporary file instead of STDOUT
 - Flushing to temp file allow display of warnings (mostly our fake
require/provide)
 - gitignore the temp JS file
 - Clean some comments
2013-09-28 21:28:45 +02:00
38dc1dc9fe Closure Compiler: Fix All The things !
- Adding some small fixes to pass compile step (mostly /** instead of
/*).
  - Adding some closure externs
2013-09-28 21:10:12 +02:00
39d9491aff Plug 'compile' on test
Let's break all the thingz !
2013-09-28 19:11:41 +02:00
f3453918c1 Fix typo + plugin compile step in Travis 2013-09-28 19:06:35 +02:00
2f9b75fe5e Experiment closure compiler - should trigger errors
local compiler.jar
should trigger errors on Travis
2013-09-28 18:51:10 +02:00
2df811b647 Layers : fix : Set button height to 24px 2013-09-27 23:19:08 +02:00
1bc73125dc Fix jscolor : add jscolor.install to Palette Controller init sequence. Fix layer canvas update on DPI change 2013-09-26 22:43:45 +02:00
50ca22d91a Clear layers canvas before redraw 2013-09-26 21:53:37 +02:00
3a8d96f840 Arrow icons update 2013-09-26 07:47:11 +02:00
9395be3034 Layers : add layer icon. Position buttons on top of list. Fix name generation issue 2013-09-25 22:43:21 +02:00
ff5f9273a8 Layers container style update 2013-09-25 21:03:57 +02:00
80a9fe3396 First layer UI. Just functional, UX far from ideal 2013-09-25 00:11:12 +02:00
6528c7724b Issue 24 : Layers
!! NOT STABLE !!
Initial implementation. No UI update yet.
Check js/model/Piskel.js and js/model/Layer.js for an overview of the new
API.

Piskels can be saved on the existing service.

Previous piskels cannot be loaded. This should be fixed soon.
2013-09-22 21:02:43 +02:00
4f6863eb8a Gif export panel first draft 2013-09-07 17:50:43 +02:00
069ccb0735 Merge branch 'master' into feature-gif-export-panel 2013-09-07 13:29:57 +02:00
e91f1fc74b Adding loadFramesheet entrypoint for importing pictures 2013-08-15 20:47:50 +02:00
811524f31a Merge branch 'master' into feature-gif-export-panel 2013-08-12 07:37:10 +02:00
d909cec19d Merge pull request #126 from juliandescottes/add-grunt-task-webserver
Add grunt task webserver
2013-08-11 22:34:35 -07:00
628fd1625b Merge branch 'master' into feature-gif-export-panel 2013-08-12 07:32:04 +02:00
73b98850db Added cheap lazy templates + logic to switch between setting controllers 2013-08-12 07:31:09 +02:00
b4d52cfca8 Merge pull request #125 from juliandescottes/propose-use-iframe-cheap-templates
Propose use iframe cheap templates
2013-08-11 14:47:04 -07:00
879358fae4 Merge pull request #117 from juliandescottes/minify-statics
Added concat and uglify tasks to grunt.
2013-08-11 14:39:33 -07:00
5be8f7e7fb Merge pull request #121 from juliandescottes/enhance-gif-encoding-with-gif.js
Enhance gif encoding with gif.js
2013-08-11 11:55:44 -07:00
d8d6f27462 New grunt task : serve 2013-08-11 20:51:04 +02:00
03711869cd removed useless mongoose exe 2013-08-11 20:30:19 +02:00
6a5b3b6849 updating smoke test to parametrize delay 2013-08-11 20:09:43 +02:00
b3953ea9db adding precommit hook to source control 2013-08-11 20:07:45 +02:00
fd2907cfde Testing pre-commit hook 2013-08-11 13:37:23 +02:00
2e3ddd6ed1 Updating list name in index.html as well. Also fixed indentation in smoke_test.js 2013-08-11 10:45:56 +02:00
750f2fb7b5 darn it man, forgot to update Gruntfile.js with the new script list filename. 2013-08-11 10:31:24 +02:00
9ef22f646e removed renamed script-load-list.js and rolled back useless change in js/Constants.js 2013-08-11 10:04:35 +02:00
2299f35977 Introducing iframe based templates 2013-08-11 01:26:38 +02:00
36c247cb04 Worker blob loader is not working on IE ... 2013-08-11 01:25:18 +02:00
e6080c781b Preload worker in a blob to avoid any subsequent call to server 2013-08-10 18:06:57 +02:00
39287e3400 Switched to gif.js library. It's awesome 1 2013-08-10 17:35:36 +02:00
c23de31e07 Merge from master + bugfixing on b64 2013-08-10 14:47:26 +02:00
509571314a Merge pull request #118 from juliandescottes/fix-size-bugs
Fixed size related issues. Selection Manager no longer depends on the fr...
2013-08-10 05:30:12 -07:00
f468790baa Merge from master + added more jshint checks (undef and latedef). Very helpful to catch post merge issues. 2013-08-10 14:28:10 +02:00
0c2cdc02ae Merge pull request #120 from juliandescottes/add-grunt-leading-indent
Dev environment:force indentation to 2 spaces.
2013-08-10 03:23:28 -07:00
87a68bfe21 Dev environment:force indentation to 2 spaces. Added new grunt module, grunt-leading-indent to check space consistency, and modified jshint options to enforce 2 spaces 2013-08-10 12:11:16 +02:00
dc557bdba8 Fixed png preview orientation when saving 2013-08-06 23:38:56 +02:00
2deaf00911 Additional fix to be inline with what APP Engine expects 2013-08-05 23:57:51 +02:00
21172249a3 Added fix for PreviewFilmController for very big piskels : limit DPI to 1 2013-08-05 23:55:19 +02:00
1977141076 Fixed size related issues. Selection Manager no longer depends on the frameoverlay which is now only manipulated by the tools 2013-08-05 23:34:11 +02:00
b42f896584 Adaptations for APP Engine compatibility 2013-08-04 22:15:45 +02:00
02e261880a Removing built files again 2013-08-04 21:55:47 +02:00
f89cb8146d Trying to get the travis build to pass 2013-08-04 21:47:17 +02:00
54ea427dce Trying to get the travis build to pass 2013-08-04 21:37:07 +02:00
a16e1bab09 added Function.prototype.bind polyfill for PhantomJS. Make Casper happy. 2013-08-04 21:20:25 +02:00
8acd91b4d9 updated smoke test URL to point to debug version 2013-08-04 18:36:43 +02:00
91bacd1dd9 Added concat and uglify tasks to grunt. Piskel on master will only be able to work in debug mode, by passing ?debug in URL. The minified version is built in /build, which has been added to .gitignore 2013-08-04 18:27:32 +02:00
1052 changed files with 44937 additions and 370270 deletions

27
.gitignore vendored
View File

@ -3,10 +3,35 @@
# nodejs local installs
node_modules
npm-debug.log
# node webkit cache
cache
# sublime text stuff (the -project should actually be shared, but then we'd have to share the same disk location)
*.sublime-project
*.sublime-workspace
# netbeans project folder
nbproject
# git stackdumps
*.stackdump
*.stackdump
# diffs
diff.txt
# build destination
dest
build/closure/closure_compiled_binary.js
# spriting artifacts
src/img/icons.png
src/css/icons.css
# plato report directory
report
# marked as private
*.private.*

75
.jscsrc Normal file
View File

@ -0,0 +1,75 @@
{
"requireCurlyBraces": [
"if",
"else",
"for",
"while",
"do",
"try",
"catch"
],
"requireOperatorBeforeLineBreak": true,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"maximumLineLength": {
"value": 80,
"allExcept": ["comments", "regex"]
},
"validateIndentation": 2,
"validateQuoteMarks": "'",
"disallowMultipleLineStrings": true,
"disallowMixedSpacesAndTabs": true,
"disallowTrailingWhitespace": true,
"disallowSpaceAfterPrefixUnaryOperators": true,
"disallowMultipleVarDecl": true,
"disallowKeywordsOnNewLine": ["else"],
"requireSpaceAfterKeywords": [
"if",
"else",
"for",
"while",
"do",
"switch",
"return",
"try",
"catch"
],
"requireSpaceBeforeBinaryOperators": [
"=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
"&=", "|=", "^=", "+=",
"+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
"|", "^", "&&", "||", "===", "==", ">=",
"<=", "<", ">", "!=", "!=="
],
"requireSpaceAfterBinaryOperators": true,
"requireSpacesInConditionalExpression": true,
"requireSpaceBeforeBlockStatements": true,
"requireSpacesInForStatement": true,
"requireLineFeedAtFileEnd": true,
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInAnonymousFunctionExpression": {
"beforeOpeningRoundBrace": false
},
"disallowSpacesInsideObjectBrackets": "all",
"disallowSpacesInsideArrayBrackets": "all",
"disallowSpacesInsideParentheses": true,
"disallowMultipleLineBreaks": true,
"disallowNewlineBeforeBlockStatements": true,
"disallowKeywords": ["with"],
"disallowSpacesInFunctionExpression": null,
"disallowSpacesInFunctionDeclaration": null,
"disallowSpacesInCallExpression": true,
"disallowSpaceAfterObjectKeys": false,
"requireSpaceBeforeObjectValues": true,
"requireCapitalizedConstructors": true,
"requireDotNotation": true,
"requireSemicolons": true,
"validateParameterSeparator": ", ",
"jsDoc": null
}

3
.npmignore Normal file
View File

@ -0,0 +1,3 @@
node_modules/
test/

15
.travis.yml Normal file
View File

@ -0,0 +1,15 @@
language: node_js
node_js:
- "4.1"
before_install:
- npm update -g npm
- npm install -g grunt-cli
- git clone git://github.com/n1k0/casperjs.git ~/casperjs
- cd ~/casperjs
- git checkout tags/1.0.2
- export PATH=$PATH:`pwd`/bin
- cd -
before_script:
- phantomjs --version
- casperjs --version
sudo: false

350
Gruntfile.js Normal file
View File

@ -0,0 +1,350 @@
module.exports = function(grunt) {
// Update this variable if you don't want or can't serve on localhost
var hostname = 'localhost';
var PORT = {
PROD : 9001,
DEV : 9901,
TEST : 9991
};
var DEV_MODE = '?debug';
// create a version based on the build timestamp
var dateFormat = require('dateformat');
var version = '-' + dateFormat(new Date(), "yyyy-mm-dd-hh-MM");
/**
* Helper to prefix all strings in provided array with the provided path
*/
var prefixPaths = function (paths, prefix) {
return paths.map(function (path) {
return prefix + path;
});
};
// get the list of scripts paths to include
var scriptPaths = require('./src/piskel-script-list.js').scripts;
var piskelScripts = prefixPaths(scriptPaths, "src/").filter(function (path) {
return path.indexOf('devtools') === -1;
});
// get the list of styles paths to include
var stylePaths = require('./src/piskel-style-list.js').styles;
var piskelStyles = prefixPaths(stylePaths, "src/");
var getCasperConfig = function (suiteName, delay, host) {
var testPaths = require('./test/casperjs/' + suiteName).tests;
var tests = prefixPaths(testPaths, "test/casperjs/");
return {
filesSrc : tests,
options : {
args : {
baseUrl : 'http://' + host + ':' + PORT.TEST,
mode : DEV_MODE,
delay : delay
},
async : false,
direct : false,
logLevel : 'info',
printCommand : false,
printFilePaths : true
}
};
};
var getConnectConfig = function (base, port, host) {
if (typeof base === 'string') {
base = [base];
}
return {
options: {
port: port,
hostname : host,
base: base
}
};
};
// load all grunt tasks
require('load-grunt-tasks')(grunt);
grunt.initConfig({
clean: {
all: ['dest', 'src/img/icons.png', 'src/css/icons.css'],
prod: ['dest/prod', 'dest/tmp'],
desktop: ['dest/desktop', 'dest/tmp'],
dev: ['dest/dev', 'dest/tmp']
},
/**
* STYLE CHECKS
*/
leadingIndent : {
options: {
indentation : "spaces"
},
css : ['src/css/**/*.css']
},
jscs : {
options : {
"config": ".jscsrc",
"maximumLineLength": 120,
"requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
"validateQuoteMarks": { "mark": "'", "escape": true },
"disallowMultipleVarDecl": "exceptUndefined",
"disallowSpacesInAnonymousFunctionExpression": null
},
js : [ 'src/js/**/*.js' , '!src/js/**/lib/**/*.js' ]
},
jshint: {
options: {
undef : true,
latedef : true,
browser : true,
trailing : true,
curly : true,
globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true, 'Q':true}
},
files: [
'Gruntfile.js',
'package.json',
'src/js/**/*.js',
'!src/js/**/lib/**/*.js' // Exclude lib folder (note the leading !)
]
},
/**
* SERVERS, BROWSER LAUNCHERS
*/
connect: {
prod: getConnectConfig('dest/prod', PORT.PROD, hostname),
test: getConnectConfig(['dest/dev', 'test'], PORT.TEST, hostname),
dev: getConnectConfig(['dest/dev', 'test'], PORT.DEV, hostname)
},
open : {
prod : {
path : 'http://' + hostname + ':' + PORT.PROD + '/'
},
dev : {
path : 'http://' + hostname + ':' + PORT.DEV + '/' + DEV_MODE
}
},
watch: {
prod: {
files: ['src/**/*.*'],
tasks: ['build'],
options: {
spawn: false
}
},
dev: {
files: ['src/**/*.*'],
tasks: ['build-dev'],
options: {
spawn: false
}
}
},
/**
* BUILD STEPS
*/
sprite:{
all : {
src: 'src/img/icons/**/*.png',
retinaSrcFilter: 'src/img/icons/**/*@2x.png',
dest: 'src/img/icons.png',
retinaDest: 'src/img/icons@2x.png',
destCss: 'src/css/icons.css'
}
},
concat : {
js : {
options : {
separator : ';'
},
src : piskelScripts,
dest : 'dest/prod/js/piskel-packaged' + version + '.js'
},
css : {
src : piskelStyles,
dest : 'dest/prod/css/piskel-style-packaged' + version + '.css'
}
},
uglify : {
options : {
mangle : true
},
js : {
files : {
'dest/tmp/js/piskel-packaged-min.js' : ['dest/prod/js/piskel-packaged' + version + '.js']
}
}
},
includereplace: {
all: {
src: 'src/index.html',
dest: 'dest/tmp/index.html',
options : {
globals : {
'version' : version
}
}
}
},
replace: {
// main-partial.html is used when embedded in piskelapp.com
mainPartial: {
options: {
patterns: [{
match: /^(.|[\r\n])*<!--body-main-start-->/,
replacement: "{% raw %}",
description : "Remove everything before body-main-start comment"
},{
match: /<!--body-main-end-->(.|[\r\n])*$/,
replacement: "{% endraw %}",
description : "Remove everything after body-main-end comment"
},{
match: /([\r\n]) /g,
replacement: "$1",
description : "Decrease indentation by one"
}
]
},
files: [
// src/index.html should already have been moved by the includereplace task
{src: ['dest/tmp/index.html'], dest: 'dest/prod/piskelapp-partials/main-partial.html'}
]
},
// remove the fake header from the desktop build
desktop: {
options: {
patterns: [{
match: /<!--standalone-start-->(?:.|[\r\n])*<!--standalone-end-->/,
replacement: "",
description : "Remove everything between standalone-start & standalone-end"
}
]
},
files: [
{src: ['dest/prod/index.html'], dest: 'dest/prod/index.html'}
]
}
},
copy: {
prod: {
files: [
// dest/js/piskel-packaged-min.js should have been created by the uglify task
{src: ['dest/tmp/js/piskel-packaged-min.js'], dest: 'dest/prod/js/piskel-packaged-min' + version + '.js'},
{src: ['dest/tmp/index.html'], dest: 'dest/prod/index.html'},
{src: ['src/logo.png'], dest: 'dest/prod/logo.png'},
{src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/prod/js/lib/gif/gif.ie.worker.js'},
{expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/prod/', filter: 'isFile'},
{expand: true, src: ['css/fonts/**'], cwd: 'src/', dest: 'dest/prod/', filter: 'isFile'}
]
},
dev: {
files: [
// in dev copy everything to dest/dev
{src: ['dest/tmp/index.html'], dest: 'dest/dev/index.html'},
{src: ['src/piskel-script-list.js'], dest: 'dest/dev/piskel-script-list.js'},
{src: ['src/piskel-style-list.js'], dest: 'dest/dev/piskel-style-list.js'},
{expand: true, src: ['js/**'], cwd: 'src/', dest: 'dest/dev/', filter: 'isFile'},
{expand: true, src: ['css/**'], cwd: 'src/', dest: 'dest/dev/', filter: 'isFile'},
{expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/dev/', filter: 'isFile'},
]
}
},
/**
* TESTING
*/
karma: {
unit: {
configFile: 'karma.conf.js'
}
},
ghost : {
'travis' : getCasperConfig('TravisTestSuite.js', 10000, hostname),
'local' : getCasperConfig('LocalTestSuite.js', 50, hostname)
},
/**
* DESKTOP BUILDS
*/
nwjs: {
windows : {
options: {
version : "0.15.4",
build_dir: './dest/desktop/', // destination folder of releases.
win: true,
linux32: true,
linux64: true
},
src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
},
macos : {
options: {
osx64: true,
version : "0.15.4",
build_dir: './dest/desktop/'
},
src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
}
}
});
// Validate
grunt.registerTask('lint', ['jscs:js', 'leadingIndent:css', 'jshint']);
// karma/unit-tests task
grunt.registerTask('unit-test', ['karma']);
// Validate & Test
grunt.registerTask('test-travis', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:travis']);
// Validate & Test (faster version) will NOT work on travis !!
grunt.registerTask('test-local', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:local']);
grunt.registerTask('test-local-nolint', ['unit-test', 'build-dev', 'connect:test', 'ghost:local']);
grunt.registerTask('test', ['test-travis']);
grunt.registerTask('precommit', ['test-local']);
grunt.registerTask('build-index.html', ['includereplace']);
grunt.registerTask('merge-statics', ['concat:js', 'concat:css', 'uglify']);
grunt.registerTask('build', ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'copy:prod']);
grunt.registerTask('build-dev', ['clean:dev', 'sprite', 'build-index.html', 'copy:dev']);
// Validate & Build
grunt.registerTask('default', ['lint', 'build']);
// Build stand alone app with nodewebkit
grunt.registerTask('desktop', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:windows']);
grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos']);
// Start webserver and watch for changes
grunt.registerTask('serve', ['build', 'connect:prod', 'open:prod', 'watch:prod']);
// Start webserver on src folder, in debug mode
grunt.registerTask('serve-dev', ['build-dev', 'connect:dev', 'open:dev', 'watch:dev']);
grunt.registerTask('serve-debug', ['serve-dev']);
grunt.registerTask('play', ['serve-dev']);
};

202
LICENSE Normal file
View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

89
README.md Normal file
View File

@ -0,0 +1,89 @@
Piskel
======
[![Travis Status](https://api.travis-ci.org/juliandescottes/piskel.png?branch=master)](https://travis-ci.org/juliandescottes/piskel) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
A simple web-based tool for Spriting and Pixel art.
![Piskel editor screenshot](https://screenletstore.appspot.com/img/8f03e768-ac59-11e3-b2a1-7f5a1b97c420.jpeg "Piskel editor screenshot")
You can try the standalone editor at **http://juliandescottes.github.io/piskel** or see it integrated in **http://piskelapp.com**.
Piskel is mainly developped by :
* **[@juliandescottes](https://github.com/juliandescottes)**
* **[@grosbouddha](https://github.com/grosbouddha)**
## What's the point ?
You can use Piskel to do two things :
* **spriting** : create retro-style sprites for games
![Megaman spritesheet](http://piskel-imgstore-a.appspot.com/img/c8081287-ac58-11e3-bd8c-b3c4036c0eee.png "Megaman spritesheet")
* **pixelart** : create crazy/pretty pixelart animations for fun !
![Rabbit jumping](http://piskel-imgstore-a.appspot.com/img/947f2dab-ac58-11e3-949a-b3c4036c0eee.gif "Rabit jumping")
Integrated in **[piskelapp.com](http://piskelapp.com)**, you can share everything you work on with others as easily as you share a link.
## Requirements
Piskel supports the following browsers :
* **Chrome** (latest)
* **Firefox** (latest)
* **Internet Explorer** 11+
... and a fairly recent computer.
We don't plan/want/could be forced into supporting older IEs. For Opera and Safari, we've never tested them but the gap shouldn't be huge.
## Offline version
Offline builds are available. More details in the [dedicated wiki page](https://github.com/juliandescottes/piskel/wiki/Desktop-applications).
## Built with
The Piskel editor is purely built in **JavaScript, HTML and CSS**. It uses Canvas extensively for displaying all them pretty sprites.
We also use the following **libraries** :
* [spectrum](https://github.com/bgrins/spectrum) : awesome standalone colorpicker
* [gifjs](http://jnordberg.github.io/gif.js/) : generate animated GIFs in javascript, using webworkers
* [supergif](https://github.com/buzzfeed/libgif-js) : modified version of SuperGif to parse and import GIFs
* [jszip](https://github.com/Stuk/jszip) : create, read and edit .zip files with Javascript
* [canvas-toBlob](https://github.com/eligrey/canvas-toBlob.js/) : shim for canvas toBlob
* [jquery](http://jquery.com/) : used sporadically in the application
* [bootstrap-tooltip](http://getbootstrap.com/javascript/#tooltips) : nice tooltips
As well as some **icons** from the [Noun Project](http://thenounproject.com/) :
* Folder by Simple Icons from The Noun Project
* (and probably one or two others)
## Contributing ?
Help is always welcome !
* **Issues** : Found a problem when using the application, want to request a feature, [open an issue](https://github.com/juliandescottes/piskel/issues).
* **Participate** : Have a look at the [wiki](https://github.com/juliandescottes/piskel/wiki) to set up the development environment
## License
Copyright 2016 Julian Descottes
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
## Mobile/Tablets
There is no support for mobile for now.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 851 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,28 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="icomoon" horiz-adv-x="512">
<font-face units-per-em="512" ascent="480" descent="-32" />
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
<glyph unicode="&#xe600;" d="M256 192l128 128h-96v128h-64v-128h-96zM372.363 244.364l-35.87-35.871 130.040-48.493-210.533-78.509-210.533 78.509 130.040 48.493-35.871 35.871-139.636-52.364v-128l256-96 256 96v128z" />
<glyph unicode="&#xe601;" d="M327.755 416.174l-24.759-21.971-1.481 8.030-14.159-4.099v-27.379l0.914-19.404 26.988 23.949c-0.347-4.934-0.51-10.141-0.166-15.921 0.543-9.151 3.055-17.374 8.057-23.811s11.74-10.557 19.211-13.967c14.942-6.822 33.56-18.012 56.377-36.978 43.203-35.907 48.548-53.828 56.334-85.404 7.412-41.045-4.368-70.606-21.368-95.68-12.144-17.918-27.179-33.815-60.225-40.518s-63.992-8.866-86.123-8.866v-22.304c23.555 0 55.469 2.195 90.553 9.313s69.693 18.531 90.832 40.649c22.885 23.941 44.76 67.328 31.672 135.162l-0.055 0.223c-5.829 27.055-23.529 67.689-92.729 97.775-28.624 12.445-44.153 20.477-55.829 25.809-5.837 2.666-9.197 6.119-11.030 8.475s-3.034 5.246-3.401 11.43c-0.827 13.918 1.198 24.507 3.318 31.505s3.904 9.702 3.904 9.702l-16.84 14.276zM303.444 372.291c0 0-16.082 4.204-16.082-1.173 0-29.786-0.407-35.048 9.808-56.095s23.399-42.701 43.302-61.078c37.637-34.753 34.591-40.033 40.837-57.911 2.3-6.582 3.27-21.87 1.673-33.875s-6.074-27.851-11.959-36.856c-9.25-14.152-16.702-28.62-34.395-38.447-18.488-10.269-34.432-12.486-49.265-12.486v-22.304c18.579 0 39.728 4.476 62.060 13.494s43.831 22.548 56.848 42.462c8.719 13.341 17.897 33.653 19.924 49.887s6.051 30.237-4.534 52.106c-16.294 33.661-37.961 43.77-64.413 66.162-16.375 13.863-31.099 30.183-40.029 48.578s-13.219 37.077-13.772 47.536zM300.488 357.961l-13.128-1.2c0.667-12.589 0-38.494 0-63.093 0-11.679 1.942-25.867 3.768-35.663 3.517-18.873 9.378-31.122 13.056-42.974 2.921-9.421 6.195-22.61 8.376-27.676 5.897-13.728 6.717-30.505 0.674-49.822-6.121-19.563-15.663-38.313-31.608-44.469l5.736-18.915c23.072 8.907 55.35 34.019 64.177 62.238 7.959 25.431 2.932 48.415-4.32 65.295-4.397 10.236-8.579 17.284-13.263 25.818-5.764 10.5-18.011 23.661-21.517 34.382-3.19 9.75-6.983 21.54-7.96 33.601-1.955 24.118-3.242 48.871-3.986 62.479zM248.405 416.148l24.758-21.971 1.481 8.029 14.159-4.099v-27.379l-0.914-19.403-26.988 23.949c0.347-4.933 0.51-10.141 0.166-15.92-0.543-9.152 0.548-18.276-4.452-24.711s-10.838-15.063-18.308-18.475c-14.942-6.823-32.661-18.010-55.476-36.978-43.203-35.907-42.239-45.718-50.025-77.294-2.905-41.947-5.284-41.359 4.244-70.447 5.757-17.579 19.97-34.716 53.016-50.429 30.453-14.481 76.609-26.889 98.737-26.889v-22.304c-23.555 0-55.469 2.195-90.553 9.309s-69.692 18.531-90.832 40.649c-22.885 23.94-44.76 67.329-31.671 135.162l0.055 0.223c5.829 27.055 23.529 67.689 92.731 97.775 28.623 12.445 44.153 20.477 55.826 25.808 5.839 2.665 9.197 6.119 11.034 8.474s3.034 5.246 3.401 11.43c0.827 13.918-1.198 24.507-3.318 31.505s-3.903 9.702-3.903 9.702l16.84 14.274zM281.987 374.814l8.031-11.395c-0.667-12.589 0-38.494 0-63.093 0-11.68 3.154-27.141 1.329-36.938-3.517-18.873-3.009-25.387-6.684-37.239-2.921-9.421-6.195-25.794-8.376-30.864-5.897-13.728-7.354-45.161-1.31-64.478 6.121-19.563 9.928-44.689 19.498-59.125l3.56-36.712c-21.161 28.662-42.512 61.597-51.342 89.814-7.958 25.431-7.393 70.082-0.139 86.961 4.398 10.236 8.578 20.472 13.263 29.004 5.764 10.5 9.043 20.958 11.649 32.578 2.245 10.010 6.192 26.31 7.168 38.372 1.955 24.121 2.604 49.509 3.351 63.117z" horiz-adv-x="576" />
<glyph unicode="&#xe602;" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" />
<glyph unicode="&#xe603;" d="M256 448c-70.692 0-134.688-28.66-181.016-74.989l-74.984 74.989v-192h192l-71.766 71.761c34.748 34.746 82.746 56.239 135.766 56.239 106.034 0 192-85.962 192-192 0-57.348-25.146-108.818-65.009-144l42.333-48c53.151 46.908 86.676 115.538 86.676 192 0 141.385-114.615 256-256 256z" />
<glyph unicode="&#xe604;" d="M0 192c0-76.462 33.524-145.092 86.675-192l42.333 48c-39.863 35.182-65.008 86.652-65.008 144 0 106.038 85.965 192 192 192 53.021 0 101.019-21.493 135.765-56.239l-71.765-71.761h192v192l-74.985-74.989c-46.327 46.329-110.322 74.989-181.015 74.989-141.385 0-256-114.615-256-256z" />
<glyph unicode="&#xe605;" d="M0 288h512v192zM512 0v192h-512z" />
<glyph unicode="&#xe606;" d="M288 480v-512h192zM0-32h192v512z" />
<glyph unicode="&#xe607;" d="M96-32h320l32 352h-384zM320 416v64h-128v-64h-160v-96l32 32h384l32-32v96h-160zM288 416h-64v32h64v-32z" />
<glyph unicode="&#xe608;" d="M400 416h-288c-26.51 0-48-21.49-48-48v-16h384v16c0 26.51-21.49 48-48 48zM316.16 448l7.058-50.5h-134.436l7.057 50.5h120.321zM320 480h-128c-13.2 0-25.495-10.696-27.321-23.769l-9.357-66.962c-1.827-13.073 7.478-23.769 20.678-23.769h160c13.2 0 22.505 10.696 20.679 23.769l-9.357 66.962c-1.827 13.073-14.122 23.769-27.322 23.769v0zM408 320h-304c-17.6 0-30.696-14.341-29.103-31.869l26.206-288.263c1.593-17.527 17.297-31.868 34.897-31.868h240c17.6 0 33.304 14.341 34.897 31.868l26.205 288.263c1.594 17.528-11.502 31.869-29.102 31.869zM192 32h-48l-16 224h64v-224zM288 32h-64v224h64v-224zM368 32h-48v224h64l-16-224z" />
<glyph unicode="&#xe609;" d="M448 224h-80l-112-112-112 112h-80l-64-128v-32h512v32l-64 128zM0 32h512v-32h-512v32zM288 320v128h-64v-128h-112l144-144 144 144h-112z" />
<glyph unicode="&#xe60a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
<glyph unicode="&#xe60b;" d="M496 288h-176v176c0 8.836-7.164 16-16 16h-96c-8.836 0-16-7.164-16-16v-176h-176c-8.836 0-16-7.164-16-16v-96c0-8.836 7.164-16 16-16h176v-176c0-8.836 7.164-16 16-16h96c8.836 0 16 7.164 16 16v176h176c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16z" />
<glyph unicode="&#xe60c;" d="M256.001 480l-256.001-256h160v-255.999l192-0.001v256h160z" />
<glyph unicode="&#xe60d;" d="M256-32l256 256h-160v255.999l-192 0.001v-256h-160z" />
<glyph unicode="&#xe60e;" d="M438.627 278.627l-160 160c-12.496 12.497-32.757 12.497-45.254 0l-160-160c-12.497-12.497-12.497-32.758 0-45.255 12.497-12.498 32.758-12.498 45.255 0l105.372 105.373v-306.745c0-17.673 14.327-32 32-32s32 14.327 32 32v306.745l105.373-105.373c6.248-6.248 14.438-9.372 22.627-9.372s16.379 3.124 22.627 9.373c12.497 12.497 12.497 32.757 0 45.254z" />
<glyph unicode="&#xe60f;" d="M73.373 169.373l160-160c12.496-12.497 32.758-12.497 45.255 0l160 160c12.496 12.497 12.496 32.758 0 45.255-12.497 12.497-32.758 12.497-45.255 0l-105.373-105.373v306.745c0 17.673-14.327 32-32 32s-32-14.327-32-32v-306.745l-105.373 105.373c-6.248 6.248-14.438 9.372-22.627 9.372s-16.379-3.124-22.627-9.372c-12.497-12.497-12.497-32.758 0-45.255z" />
<glyph unicode="&#xe610;" d="M432 480c44.182 0 80-35.817 80-80 0-18.010-5.955-34.629-16-48l-32-32-112 112 32 32c13.371 10.045 29.989 16 48 16zM32 112l-32-144 144 32 296 296-112 112-296-296zM357.789 298.211l-224-224-27.578 27.578 224 224 27.578-27.578z" />
<glyph unicode="&#xe611;" d="M507.331 68.67c-0.002 0.002-0.004 0.004-0.006 0.005l-155.322 155.325 155.322 155.325c0.002 0.002 0.004 0.003 0.006 0.005 1.672 1.673 2.881 3.627 3.656 5.708 2.123 5.688 0.912 12.341-3.662 16.915l-73.373 73.373c-4.574 4.573-11.225 5.783-16.914 3.66-2.080-0.775-4.035-1.984-5.709-3.655 0-0.002-0.002-0.003-0.004-0.005l-155.324-155.326-155.324 155.325c-0.002 0.002-0.003 0.003-0.005 0.005-1.673 1.671-3.627 2.88-5.707 3.655-5.69 2.124-12.341 0.913-16.915-3.66l-73.374-73.374c-4.574-4.574-5.784-11.226-3.661-16.914 0.776-2.080 1.985-4.036 3.656-5.708 0.002-0.001 0.003-0.003 0.005-0.005l155.325-155.324-155.325-155.326c-0.001-0.002-0.003-0.003-0.004-0.005-1.671-1.673-2.88-3.627-3.657-5.707-2.124-5.688-0.913-12.341 3.661-16.915l73.374-73.373c4.575-4.574 11.226-5.784 16.915-3.661 2.080 0.776 4.035 1.985 5.708 3.656 0.001 0.002 0.003 0.003 0.005 0.005l155.324 155.325 155.324-155.325c0.002-0.001 0.004-0.003 0.006-0.004 1.674-1.672 3.627-2.881 5.707-3.657 5.689-2.123 12.342-0.913 16.914 3.661l73.373 73.374c4.574 4.574 5.785 11.227 3.662 16.915-0.776 2.080-1.985 4.034-3.657 5.707z" />
</font></defs></svg>

Before

Width:  |  Height:  |  Size: 8.6 KiB

View File

@ -1,13 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="icomoon" horiz-adv-x="512">
<font-face units-per-em="512" ascent="480" descent="-32" />
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
<glyph unicode="&#xe600;" d="M548.568 479.997c-230.956 1.035-548.568-255.999-548.568-255.999s288.019-255.998 548.568-255.998c229.744 0 548.568 255.999 548.568 255.999s-319.896 254.974-548.568 255.999zM543.082 398.397c100.382 0 181.713-81.33 181.713-181.713s-81.331-181.713-181.713-181.713c-100.382 0-181.827 81.331-181.827 181.713s81.445 181.713 181.827 181.713zM543.197 331.312c-65.289 0-118.285-52.996-118.285-118.285s52.996-118.171 118.285-118.171c65.289 0 118.17 52.882 118.17 118.171s-52.882 118.285-118.17 118.285z" horiz-adv-x="1097" />
<glyph unicode="&#xe601;" d="M333.139 442.196l-28.111-24.945-1.682 9.117-16.077-4.654v-31.086l1.038-22.032 30.642 27.192c-0.394-5.602-0.579-11.514-0.189-18.076 0.616-10.389 3.469-19.727 9.148-27.036s13.329-11.986 21.812-15.858c16.965-7.745 38.105-20.45 64.012-41.986 49.053-40.769 55.122-61.117 63.962-96.969 8.416-46.603-4.959-80.166-24.261-108.637-13.789-20.344-30.859-38.395-68.38-46.004s-72.657-10.067-97.784-10.067v-25.324c26.745 0 62.98 2.493 102.815 10.574s79.13 21.041 103.132 46.154c25.984 27.183 50.821 76.445 35.96 153.464l-0.063 0.253c-6.619 30.719-26.716 76.854-105.285 111.015-32.5 14.131-50.132 23.25-63.389 29.304-6.628 3.027-10.442 6.947-12.524 9.622s-3.445 5.956-3.862 12.978c-0.939 15.803 1.36 27.825 3.767 35.771s4.432 11.015 4.432 11.015l-19.12 16.209zM305.535 392.371c0 0-18.259 4.773-18.259-1.332 0-33.82-0.462-39.793 11.136-63.691s26.568-48.483 49.166-69.349c42.733-39.459 39.275-45.454 46.367-65.753 2.611-7.473 3.713-24.832 1.899-38.462s-6.896-31.623-13.579-41.846c-10.502-16.069-18.963-32.495-39.053-43.653-20.991-11.659-39.094-14.177-55.936-14.177v-25.324c21.094 0 45.108 5.082 70.464 15.322s49.766 25.601 64.546 48.212c9.899 15.147 20.321 38.209 22.622 56.641s6.87 34.332-5.148 59.162c-18.5 38.219-43.101 49.697-73.135 75.121-18.592 15.74-35.31 34.27-45.45 55.156s-15.009 42.098-15.636 53.973zM302.18 376.1l-14.906-1.362c0.757-14.293 0-43.707 0-71.637 0-13.26 2.204-29.37 4.278-40.492 3.993-21.428 10.649-35.336 14.823-48.794 3.317-10.697 7.035-25.671 9.51-31.424 6.695-15.587 7.627-34.636 0.765-56.569-6.95-22.212-17.785-43.502-35.888-50.49l6.513-21.476c26.197 10.113 62.845 38.626 72.867 70.666 9.036 28.875 3.329 54.971-4.906 74.137-4.993 11.622-9.74 19.624-15.059 29.314-6.544 11.921-20.45 26.866-24.431 39.038-3.621 11.070-7.929 24.458-9.038 38.151-2.22 27.384-3.681 55.489-4.526 70.94zM243.043 442.167l28.111-24.945 1.682 9.117 16.077-4.654v-31.086l-1.038-22.031-30.642 27.192c0.394-5.601 0.579-11.514 0.189-18.076-0.616-10.391 0.623-20.75-5.055-28.057s-12.305-17.102-20.787-20.976c-16.965-7.747-37.083-20.449-62.988-41.986-49.053-40.769-47.959-51.909-56.799-87.761-3.299-47.627-5.999-46.959 4.819-79.986 6.537-19.959 22.674-39.417 60.195-57.258 34.577-16.442 86.982-30.531 112.107-30.531v-25.324c-26.745 0-62.98 2.493-102.815 10.57s-79.129 21.041-103.132 46.154c-25.983 27.182-50.821 76.447-35.959 153.464l0.063 0.253c6.618 30.719 26.715 76.854 105.288 111.015 32.499 14.131 50.131 23.25 63.386 29.302 6.629 3.026 10.442 6.948 12.528 9.622s3.445 5.956 3.862 12.978c0.939 15.803-1.36 27.825-3.767 35.771s-4.431 11.015-4.431 11.015l19.12 16.207zM281.173 395.236l9.119-12.938c-0.757-14.293 0-43.707 0-71.637 0-13.261 3.582-30.816 1.509-41.939-3.993-21.428-3.416-28.824-7.589-42.282-3.317-10.697-7.035-29.287-9.51-35.043-6.695-15.587-8.351-51.277-1.488-73.21 6.95-22.212 11.272-50.74 22.139-67.131l4.043-41.683c-24.026 32.543-48.269 69.938-58.294 101.975-9.036 28.875-8.394 79.572-0.158 98.736 4.993 11.622 9.74 23.244 15.059 32.931 6.544 11.922 10.268 23.796 13.227 36.99 2.548 11.365 7.031 29.873 8.139 43.568 2.22 27.387 2.957 56.213 3.804 71.663z" horiz-adv-x="576" />
<glyph unicode="&#xe602;" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" />
</font></defs></svg>

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 672 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 606 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 617 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 565 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 960 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 851 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 537 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1016 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1008 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 563 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 963 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 827 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1015 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 741 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 580 B

Some files were not shown because too many files have changed in this diff Show More