Commit Graph

413 Commits

Author SHA1 Message Date
Julian Descottes
a3d313dda7 Merge pull request #37 from juliandescottes/fix-stroke-tool
oh well ...
2012-09-05 15:43:13 -07:00
juliandescottes
9a09f11650 oh well ... 2012-09-06 00:40:27 +02:00
juliandescottes
59c32e5328 Merge branch 'master' into gh-pages 2012-09-06 00:37:45 +02:00
Julian Descottes
d991441b5b Merge pull request #36 from juliandescottes/fix-stroke-tool
Fix stroke tool
2012-09-05 15:37:26 -07:00
juliandescottes
5a36f8a3a8 forgot to render the overlay 2012-09-06 00:36:45 +02:00
juliandescottes
03c56407d3 using clearOverlay 2012-09-06 00:35:02 +02:00
juliandescottes
b433dea1cf Merge branch 'master' into gh-pages 2012-09-06 00:25:46 +02:00
juliandescottes
8332b31fa7 fixed add button 2012-09-06 00:23:24 +02:00
juliandescottes
8a7245bfea onMouseUp triggering releaseToolAt unnecessarily 2012-09-06 00:14:32 +02:00
juliandescottes
d715c59966 Merge branch 'master' into gh-pages 2012-09-06 00:01:50 +02:00
Julian Descottes
870cecc989 Merge pull request #34 from juliandescottes/fix-rectangletool
Passed correct reference of drawingController when releasing tool
2012-09-05 15:00:44 -07:00
juliandescottes
070a83fd03 Passed correct reference of drawingController when releasing tool 2012-09-05 23:59:53 +02:00
juliandescottes
e7e2920aae Merge branch 'master' into gh-pages 2012-09-05 11:25:29 +02:00
juliandescottes
a73eb7d514 Changed eraser icon to fugue icon 2012-09-05 11:24:07 +02:00
juliandescottes
7f90caf1fc Merge branch 'master' into gh-pages 2012-09-05 08:19:42 +02:00
Julian Descottes
547d4affd1 Merge pull request #29 from captainbrosset/del-first-frame-bug
fixed bug where deleting first frame was failing
2012-09-04 23:19:09 -07:00
Patrick Brosset
2430e8f2ab fixed bug where deleting first frame was failing 2012-09-05 07:59:58 +02:00
Julian Descottes
3b70ce1c17 Merge pull request #27 from juliandescottes/extract-rendering
Extract rendering
2012-09-04 22:30:42 -07:00
juliandescottes
89be121dd1 Fixed animation preview when deleting 2012-09-05 00:42:25 +02:00
Julian Descottes
d4a326051a Merge pull request #26 from captainbrosset/draft-ui
series of tiny improvements to the ui
2012-09-04 15:20:29 -07:00
juliandescottes
53436009e3 Changed main-canvas to drawing-canvas 2012-09-05 00:13:45 +02:00
juliandescottes
1de9ee41b2 Finished first step of refactor. 2012-09-05 00:09:42 +02:00
Patrick Brosset
d4faba810d series of tiny improvements to the ui 2012-09-04 23:48:02 +02:00
juliandescottes
a567992a1d moved Frame and FrameSheet to model package 2012-09-04 22:40:54 +02:00
juliandescottes
69a03a3416 Previews are fixed. Removed drawing methods from piskel .js 2012-09-04 22:18:00 +02:00
juliandescottes
c261c370ad Removed old debugging method. 2012-09-04 21:27:49 +02:00
juliandescottes
4c4faa88e6 Moved drawing logic outside of tools. Previews and animations are broken. Performance is somehow degraded 2012-09-04 14:10:16 +02:00
juliandescottes
561c35c882 Adding Frame Renderer utility 2012-09-04 08:35:58 +02:00
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