juliandescottes
5e3748c97d
Merge branch 'master' into gh-pages
2012-09-03 23:53:28 +02:00
juliandescottes
bd9f8f4489
Merge branch 'master' into extract-rendering
2012-09-03 23:33:46 +02:00
Julian Descottes
e4699da346
Merge pull request #22 from grosbouddha/create-palette-component
...
Create palette component
2012-09-03 14:32:16 -07:00
Vince
640d8346b7
Merge branch 'create-palette-component'
2012-09-03 22:49:42 +02:00
Julian Descottes
d8129d1fd3
Merge pull request #21 from juliandescottes/misc-eraserinherit
...
Eraser now inherits from SimplePen. Added a superclass property attached...
2012-09-03 13:35:13 -07:00
juliandescottes
3e02037b58
Removed all references to normalizeCOlor
2012-09-03 22:31:56 +02:00
Vince
4c611d80c5
Create palette component
...
Create Palette component (was inside the ToolSelector before)
Fix the palette generation as well.
2012-09-03 22:30:53 +02:00
juliandescottes
ad1fc2ecc2
Eraser now inherits from SimplePen. Added a superclass property attached in the inherit util
2012-09-03 22:22:24 +02:00
juliandescottes
dbfe7cd1a7
Merge branch 'master' into gh-pages
2012-09-03 21:48:26 +02:00
juliandescottes
d92c99ccf8
Renamed frameSheetModel to Uppercase
2012-09-03 21:47:08 +02:00
Julian Descottes
6a65f22b82
Merge pull request #20 from grosbouddha/fix-transparent-color-default-value
...
Integration (with myself) fixes
2012-09-03 12:45:11 -07:00
Vince
2a20cc90ea
Integration (with myself) fixes
...
- Adding default value in empty frames to avoid artifact when paint
bucketing (you may have issues with previously stored model before this
commit, no migration plan for papybrossette :D)
- Fix issue: Model does not show up when loading a remote GAE model
- Removing FRAMESHEET_UPDATED events (remains of history manager
implementation)
2012-09-03 20:45:25 +02:00
juliandescottes
a1e17716f7
changed case of FrameSheetModel
2012-09-03 12:40:50 +02:00
juliandescottes
c43a01a64f
Merge branch 'master' into gh-pages
2012-09-03 12:35:08 +02:00
Julian Descottes
c6d338507e
Merge pull request #16 from grosbouddha/piskel-cleanup
...
Piskel.js cleanup
2012-09-03 03:34:07 -07:00
Julian Descottes
a05fb7c6b4
Merge pull request #15 from grosbouddha/interpolate-simplepen-tool
...
Interpolate simple pen tool
2012-09-03 03:33:49 -07:00
Julian Descottes
015f4cebf3
Merge pull request #14 from grosbouddha/rectangle-tool
...
Rectangle tool
2012-09-03 03:33:39 -07:00
Julian Descottes
865780024d
Merge pull request #13 from grosbouddha/add-transparent-color
...
Add transparent color
2012-09-03 03:33:09 -07:00
Julian Descottes
6922049c7d
Merge pull request #12 from grosbouddha/add-stroke-tool
...
Add stroke tool
2012-09-03 03:31:54 -07:00
Julian Descottes
d1baf543c3
Merge pull request #11 from grosbouddha/ca04f8db4dec4f3e3b88da15f884e6bf82a5a2ba
...
Tool plugin architecture
2012-09-03 03:31:09 -07:00
Vince
f91308405d
Fix previous init animation
2012-09-03 01:39:21 +02:00
Vince
35736949d8
Shit merge
2012-09-03 01:34:11 +02:00
Vince
d7044dc44d
Cleanup of piskel.js
...
Partial cleanup of piskel:
new events and constant
move palette and color picker in ToolSelector
create Notifcation.js and move user message in it
create LocalStorageService and move LS stuff in it
2012-09-03 01:24:55 +02:00
Vince
9758aa62d9
Add interpolation when using the pen tool quickly
2012-09-02 17:49:28 +02:00
Vince
946444a16b
Adding rectangle tool
2012-09-02 13:19:20 +02:00
Vince
4622cf67a7
Adding support for transparent color
2012-09-02 01:41:49 +02:00
Vince
700c6ab144
Stroke tool
...
Add stroke tool
new icons for tools
started some refactoring to help having a big redraw loop
2012-09-02 00:44:55 +02:00
Vince
6b7294e8c5
Shit merge
2012-09-01 02:17:24 +02:00
Vince
ca04f8db4d
Tool plugin architecture with eraser/pen/paintbucket tools.
2012-09-01 01:21:58 +02:00
juliandescottes
7cbe90f463
Merge branch 'master' into gh-pages
2012-08-30 17:00:52 +02:00
Julian Descottes
03b5db0bac
Merge pull request #10 from juliandescottes/add-loadmsg
...
Add loadmsg
2012-08-30 08:00:01 -07:00
juliandescottes
509ffcea2a
Added message when loading an animation from Service
2012-08-30 16:30:22 +02:00
juliandescottes
110bc050b2
removed preview folder, coming from gh-pages, not needed
2012-08-30 15:58:55 +02:00
Julian Descottes
0f382286de
Update README.md
2012-08-30 13:18:57 +03:00
Julian Descottes
9aaaa380a7
Merge branch 'master' into gh-pages
2012-08-30 01:56:20 +02:00
Julian Descottes
70ad2760df
fixed fps slider
2012-08-30 01:55:14 +02:00
Julian Descottes
370ae7b109
delete artifact
2012-08-30 01:33:22 +02:00
Julian Descottes
a320c3b450
merge from master
2012-08-30 01:32:03 +02:00
Julian Descottes
d3d9ee5361
Merge pull request #9 from juliandescottes/add-crossdomain
...
Add crossdomain
2012-08-29 16:30:57 -07:00
Julian Descottes
bd8b72f3d5
merged from master
2012-08-30 01:30:26 +02:00
Julian Descottes
a1872d3521
support post
2012-08-30 01:26:14 +02:00
Julian Descottes
aaf254cc3f
post
2012-08-30 01:16:13 +02:00
Vince
52a9d7b379
Adding query 1.8.0 and pubsub bus
2012-08-30 00:48:22 +02:00
Vince
04bcb09496
Merge branch 'gh-pages' of https://github.com/juliandescottes/piskel
2012-08-29 23:58:25 +02:00
Julian Descottes
baa5ea5dc9
Merge pull request #8 from grosbouddha/localstorage-basic
...
Adding localstorage support
2012-08-29 14:39:03 -07:00
Vince
c227687df8
Creating init method for localstorage
2012-08-29 23:32:51 +02:00
Vince
6cc8534041
Adding localstorage support
2012-08-29 23:01:04 +02:00
Julian Descottes
c43e25e3bf
merged after pull from remote
2012-08-29 20:43:07 +02:00
Julian Descottes
9fcd9a22b5
merged from master
2012-08-29 20:40:34 +02:00
Julian Descottes
c764976ed3
Merge pull request #7 from juliandescottes/fix-drawinglogic
...
per pixel redraw
2012-08-29 11:35:42 -07:00