Commit Graph

1758 Commits

Author SHA1 Message Date
Guillaume Martigny
9cd3fa03a0 Merge branch 'master' into 362-MultiSizePreview 2017-01-11 12:28:20 +01:00
Guillaume Martigny
d4b4192d45 Final : Specific tooltip while preview size selection disabled 2017-01-11 12:23:49 +01:00
juliandescottes
d5199d38aa remove css variables from built css (edge :( ) 2017-01-11 01:13:56 +01:00
juliandescottes
ab082b9f4a set nwjs downloadURL to https 2017-01-09 09:27:49 +01:00
juliandescottes
2ec6c4b848 upgrade nwjs to 0.19.4 2017-01-09 09:19:12 +01:00
juliandescottes
2cdc999875 Fix bug when opening save panel for sprite with performance problem 2017-01-09 09:10:20 +01:00
Julian Descottes
4c6d2c1e48 Merge pull request #607 from juliandescottes/controller-tests
Add first integration tests
2017-01-09 00:43:46 +01:00
juliandescottes
95256071e1 add missing EOF new lines 2017-01-08 20:43:15 +01:00
juliandescottes
b86ec72a4e use evalLine in integration/settings/test-resize 2017-01-08 20:42:00 +01:00
juliandescottes
70085bc056 Add integration tests for resize content and resize from other origin 2017-01-08 20:38:12 +01:00
Julian Descottes
a328e4d20e add resize test checking frame content
Moved shared methods to a head.js file
2017-01-08 19:56:53 +01:00
Julian Descottes
569b508fd5 mutualize casperjsOptions in gruntfile 2017-01-08 16:39:55 +01:00
Julian Descottes
d30f6a05d1 add integration tests 2017-01-08 16:09:03 +01:00
Julian Descottes
76ae797a9e nits: typos and case 2017-01-08 11:55:09 +01:00
Julian Descottes
61c76f980a Merge pull request #605 from Sal0hcine/fix-reset-default-colours
Pressing "d" for default colors doesn't fully work. #601
2017-01-05 11:44:49 +01:00
Nick Garland
5bd113b38f Removed reset from SelectedColorsService and implemented the reset in PaletteController 2017-01-04 18:28:58 +00:00
Julian Descottes
aa5d4d4090 Merge branch 'master' of https://github.com/juliandescottes/piskel 2017-01-02 23:35:07 +01:00
Julian Descottes
398d93557a remove unused argument in FileDropperService constructor 2017-01-02 23:34:54 +01:00
Julian Descottes
0733a5a142 Merge pull request #600 from zoeesilcock/363-firefox-dnd-bug
Workaround for incorrect frame selection after re-ordering on Firefox
2017-01-02 23:27:33 +01:00
Julian Descottes
835cee37aa Merge pull request #599 from zoeesilcock/563-color-format-preference
Add a setting for changing the color format shown in the color picker
2017-01-02 23:09:19 +01:00
Zoee Silcock
2dea7faea0 Workaround for incorrect frame selection after re-ordering on Firefox
This commit is related to the following issue: #363

When a frame is dropped both `mouseup` and `click` events are triggered on Firefox. This is somwhat expected behaviour but other browsers do not trigger the `click` event.

One would expect jquery-ui to work the same across all browsers but when they got a bug report they decided to not change anything:
https://bugzilla.mozilla.org/show_bug.cgi?id=787944

The most comon workaround appears to be to use the `clone` helper in jquery-ui sortable. Unfortunately this doesn't work because the cloned frame doesn't keep the contents of the canvas. This seemed like the cleanest workaround, here are a few others:
http://stackoverflow.com/questions/947195/jquery-ui-sortable-how-can-i-cancel-the-click-event-on-an-item-thats-dragged
2016-12-29 10:09:05 +01:00
Zoee Silcock
809737908c Add a setting for changing the color format shown in the color picker 2016-12-29 08:08:13 +01:00
Julian Descottes
e43cee3c94 Merge pull request #598 from juliandescottes/disable-gallery
Disable gallery
2016-12-27 01:04:25 +01:00
Julian Descottes
b869d63211 remove useless comment 2016-12-27 00:56:18 +01:00
Julian Descottes
c0f7e7be52 jshint cleanup, move HTML to a template, add css classes 2016-12-27 00:56:18 +01:00
Julian Descottes
98527c6ded update notification style to use piskel theme colors 2016-12-27 00:56:17 +01:00
Julian Descottes
9518d570e6 display save to gallery warning if performance issue detected 2016-12-27 00:52:32 +01:00
Julian Descottes
01b9898181 improve serialization error detection for firefox 2016-12-27 00:52:32 +01:00
juliandescottes
184b2e48aa disable gallery save when if spritesheet size too big (WIP) 2016-12-27 00:52:32 +01:00
juliandescottes
e97a641e95 add constant for the max datastore accepted size 2016-12-27 00:52:32 +01:00
Julian Descottes
7eea5d672a fix hover image for minimap popup preview 2016-12-25 10:20:57 +01:00
Julian Descottes
537234b1d1 update minimap crop style 2016-12-24 11:09:12 +01:00
Julian Descottes
57936d90b1 fix jshint issue 2016-12-24 10:26:40 +01:00
Julian Descottes
ef8060c07d remove unused resizeNearestNeighbor util 2016-12-24 10:24:23 +01:00
Julian Descottes
8551a8546a fix #369 improve perf of grid rendering 2016-12-23 23:41:41 +01:00
Julian Descottes
eb84e87a13 add gold border on textfield:focus 2016-12-23 21:09:05 +01:00
Julian Descottes
ca3b789747 add user setting for seamless mode opacity 2016-12-22 23:27:00 +01:00
Julian Descottes
22dd474799 add border radius to settings export tabs 2016-12-22 22:33:04 +01:00
Julian Descottes
16151e8e95 remove text-shadow from settings panels 2016-12-22 22:21:32 +01:00
Julian Descottes
2f62be4927 simplify buttons styling 2016-12-22 14:21:21 +01:00
Julian Descottes
fbaccb03f2 introduce css variables 2016-12-22 13:06:01 +01:00
juliandescottes
dd9b1e0189 add test to check deserialized piskel contains valid frames 2016-12-21 17:20:54 +01:00
juliandescottes
dda566a218 fix broken serializer 2016-12-21 17:20:54 +01:00
Julian Descottes
2bcd354342 Merge pull request #595 from juliandescottes/unsupported-browser-popup
add a warning popup when detecting an unsupported browser
2016-12-21 15:52:45 +01:00
Julian Descottes
6cc41ee07b add a warning popup when detecting an unsupported browser 2016-12-21 15:44:04 +01:00
juliandescottes
eca9191f29 increase drawing test timeout to 30 seconds 2016-12-21 15:38:31 +01:00
Julian Descottes
83c7e950f0 Merge pull request #593 from juliandescottes/save-split
Save split
2016-12-21 12:25:54 +01:00
juliandescottes
32070efcc1 save split: add comments and cleanup 2016-12-21 12:22:50 +01:00
juliandescottes
c743334a31 Switch back to line layout 2016-12-21 11:45:34 +01:00
juliandescottes
84419a1550 split saved piskel in chunks when serialization fails 2016-12-21 02:28:11 +01:00