Commit Graph

1596 Commits

Author SHA1 Message Date
Vince
bca16a3964 Creating renderingOptions object for FrameRenderer
Contains dpi, grid info, etc
2012-09-08 15:34:13 +02:00
Vince
cc22a26933 Fix overlayFrame reference 2012-09-08 15:21:22 +02:00
Vince
9d5e2dc2d3 Merging dragndrop 2012-09-08 15:17:19 +02:00
Vince
eb7511c721 Encapsulate canvas element in FrameRenderer
From this change set, the HTML canvas element, which is the frame view,
is encapsulated inside the FrameRenderer.
You won't need to give the view handle from the controller layer
anymore.
It will make view alteration implementations much easier (like grid for
instance)
2012-09-08 15:08:00 +02:00
Vincent
807582e472 Merge pull request #53 from grosbouddha/implement-dnd
Implement Drag n Drop for film preview section
2012-09-08 05:47:45 -07:00
Vince
9411b2e3ae Moving (rendering related) DPI into FrameRenderer domain object 2012-09-08 12:24:55 +02:00
Vince
c66ce4c9ad Implementing interstitial tiles
Interstitial tiles are fake slides and allow us to insert drag n drop
tiles between two other.
2012-09-08 02:50:59 +02:00
Vince
39b85e6092 Removing duplicate CSS rules 2012-09-07 23:43:38 +02:00
Vince
1c1e0398e7 Drag'n drop fix when dropping outside the list 2012-09-07 23:25:38 +02:00
Vince
6a0ba8acfe Small css cleaning for preview film 2012-09-07 23:24:48 +02:00
juliandescottes
b74020c93d Added simple piskel/all.html 2012-09-07 23:17:46 +02:00
Vince
b824207d1d Dragndrop preview film tiles
- import go jquery-ui
- Basic implementation without styling
- only swapping is possible (no insertion)
2012-09-07 23:14:25 +02:00
juliandescottes
3768a29891 Merge branch 'master' into gh-pages 2012-09-07 01:21:39 +02:00
juliandescottes
022773d3ab forgot unstaged files 2012-09-07 01:21:05 +02:00
juliandescottes
c6e6fdc935 Merge branch 'master' into gh-pages 2012-09-07 01:19:48 +02:00
Julian Descottes
d370cf8130 Merge pull request #43 from juliandescottes/add-movetool
Add movetool
2012-09-06 16:18:30 -07:00
juliandescottes
71348c2d3c merge from master 2012-09-07 01:18:02 +02:00
juliandescottes
5f6fd068eb added proper icon 2012-09-07 01:14:51 +02:00
Julian Descottes
71962cf982 Merge pull request #42 from juliandescottes/add-historymgr
Added undo/redo feature
2012-09-06 16:14:11 -07:00
juliandescottes
f06f03a7f7 Added simple move tool 2012-09-07 01:08:25 +02:00
juliandescottes
14bf3f97c5 fixed bug when reaching stage 0 2012-09-07 00:56:31 +02:00
juliandescottes
17bf7b3807 Added undo/redo feature
* new file : HistoryManager.js
* can undo (ctrl-z) and redo (ctrl-y) changes performed through the
tools
* history states are recorded per frame
* a new state is recorder each time a tool is released (introduced
TOOL_RELEASED event for this purpose)
* a duplicated frame doesn't inherit the history states of the original
frame
* there is no limit to the number of states that can be stored per frame
* actions such as creating/duplicating/deleting a frame are not
concerned by this update
2012-09-07 00:18:59 +02:00
juliandescottes
8e3ee6f108 Merge branch 'master' into gh-pages 2012-09-06 23:13:37 +02:00
juliandescottes
9f36462d96 Fixed small bug with transparent color in palette 2012-09-06 23:12:35 +02:00
juliandescottes
0a2e2217c9 Fixed regression on color-picker 2012-09-06 23:10:02 +02:00
juliandescottes
f664ea4a7c Merge branch 'master' into gh-pages 2012-09-06 23:04:05 +02:00
Julian Descottes
1c12e92ce3 Merge pull request #40 from juliandescottes/add-secondarycolor
Added secondary color support.
2012-09-06 14:03:18 -07:00
juliandescottes
4c1c96095f Added secondary color support.
Added :
- second color picker
- removed automatic switch to eraser when using right click
- colors are automatically added to palette when selected
2012-09-06 22:37:19 +02:00
juliandescottes
b1a26ad3df Merge branch 'master' into gh-pages 2012-09-06 01:10:40 +02:00
juliandescottes
f2b1e433c0 realigned cursros hotspots 2012-09-06 01:09:02 +02:00
juliandescottes
5f0bdc34c0 Merge branch 'master' into gh-pages 2012-09-06 00:46:20 +02:00
juliandescottes
f723d4bbaf Removed debugging logs from event callbacks. 2012-09-06 00:45:49 +02:00
juliandescottes
e6449aa7e6 Merge branch 'master' into gh-pages 2012-09-06 00:43:42 +02:00
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