mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity
516 Commits 6 Branches 32 Tags 22 MiB
6e1ce724cb
Commit Graph

307 Commits

Author SHA1 Message Date
Vince
8b265bdb9b Adding overflow markers for preview frame scroller 2013-06-13 22:55:19 +02:00
Vince
2a32a7f9fe Fix user messages 
I fixed the local storage service, user messages were jsut working fine.
I updated the UXD, they are now sticky to the right-bottom corner.
 2013-06-13 20:07:12 +02:00
Vince
9f940c5b26 Fix Travis 2 2013-06-13 18:00:16 +02:00
Vince
93da547cb1 Fix Travis 2013-06-13 17:56:44 +02:00
Vince
9478055658 Move 'add frame button' to preview frames 
and change UXD
 2013-06-13 17:39:59 +02:00
Vince
d1f292bd69 Fix save/upload buttons UX 
- new look and feel
- upload for png spritesheet & animated gif
- remove host code (window.open) from spritesheetRenderer
 2013-06-13 17:39:59 +02:00
Vince
f08f58328e Fix selected state for tools on load 2013-06-13 17:39:59 +02:00
Vince
5b0a8f157d Fixing DnD, removing LESS, cleaning code 
- Updating DnD to use Sortable instead of draggable/dropppable
(updating deps as well).
- much simpler logic for DnD
- Remove LESS for now since it's a bit yet overkill
- fix moveFrame function
 2013-06-13 00:04:39 +02:00
Vince
31062a70a9 proto init implementation + less 2013-06-12 14:53:47 +02:00
grosbouddha
fba6693426 Make jshint quiet now 2013-05-27 23:42:53 +02:00
jdescottes
bba1bb202b extra comma 2013-04-09 07:26:37 +02:00
jdescottes
9b40b11703 Support secondary color for color picker 2013-04-09 07:24:07 +02:00
grosbouddha
afe75c56bf Clean comments 2013-04-09 01:37:30 +02:00
grosbouddha
1441dcd67a Adding simple color picker 
Left click colorpicker tool:
- Create PRIMARY/SECONDARY_COLOR_SELECTED/UPDATED events
- remove isPrimary arguments
 2013-04-09 01:32:30 +02:00
jdescottes
198bbaa65d fixed FPS for gif version 2013-04-07 21:26:51 +02:00
jdescottes
7c25c54d2c Export to GIF 2013-04-07 20:16:47 +02:00
juliandescottes
0df366157f Merge branch 'gh-pages' into add-fpspersistence 2012-09-20 23:58:10 +02:00
juliandescottes
c7a8233adc Saving and reading FPS from model 2012-09-20 23:57:26 +02:00
juliandescottes
019df61cdc Fixed layout issue when hovering on non 32x32 tile previews 2012-09-20 23:01:49 +02:00
juliandescottes
9aba931b0a Cleanup of SpritesheetRenderer 2012-09-20 01:10:13 +02:00
juliandescottes
562d669ae1 Basic export - opening new window with concatenated spritesheet in PNG format 2012-09-20 00:43:39 +02:00
juliandescottes
0f0938b91b Changed case of PixelUtils 2012-09-19 23:12:55 +02:00
juliandescottes
10a7fd4890 Merge branch 'master' into gh-pages 2012-09-19 13:17:44 +02:00
juliandescottes
916ba6ae6f removed extra comma 2012-09-16 23:47:37 +02:00
juliandescottes
016649bb46 Fixed overlap between drawing canvas and preview. 2012-09-16 23:34:00 +02:00
juliandescottes
f2d174e33e Merge branch 'master' into gh-pages 2012-09-16 23:28:52 +02:00
juliandescottes
8bee1fe4f3 Merge branch 'master' into add-dynamicsize 2012-09-16 23:27:00 +02:00
juliandescottes
0d1775b24c Dynamic size for frame 2012-09-16 18:48:32 +02:00
grosbouddha
f18a9114fc Merge pull request #90 from grosbouddha/clean-framesheet-reset 
Fix broken palette when switching tiles
 2012-09-16 08:31:42 -07:00
Vince
a4036e0f65 fix for real palette bug 2012-09-16 17:25:51 +02:00
Vince
e519eb1feb renaming + bug fixing (0 considered as false …) 2012-09-16 16:42:21 +02:00
Vince
324c2b464e Fix broken palette when swithcing tiles 2012-09-16 16:16:09 +02:00
Vince
b75640c6f3 Merge branch 'master' into highlight-tool-pixels 2012-09-16 15:54:01 +02:00
Vince
6369fb4656 adding comments 2012-09-16 15:47:39 +02:00
juliandescottes
9acb59af6d Merge branch 'master' into gh-pages 2012-09-16 15:46:47 +02:00
Vince
e235e34e0f Removing dead code 2012-09-16 15:36:45 +02:00
Vince
31d2f90bfe highlight target tool pixel - intial commit 2012-09-16 15:35:30 +02:00
Vince
362d8ef262 Prototypization of NotificationController 2012-09-16 14:41:47 +02:00
Vince
6d0b2eb9e2 merging with master 2012-09-16 14:24:03 +02:00
Vince
ca08d4b56a move notification to controller directory 2012-09-16 13:53:41 +02:00
Vince
5b9bc6edb1 Prototypization of PaletteController 
I love new words
 2012-09-16 13:50:40 +02:00
Vince
b671d46dbf moving palette.js to controller directory 2012-09-16 13:28:53 +02:00
Vince
12680b7b8b fix keyboard eventservice 2012-09-16 13:27:00 +02:00
Vince
c4084cf9b6 move keyManager.js to KeyboardEventService.js 2012-09-16 13:19:31 +02:00
Vince
95bfc599e8 fix keyManager 2012-09-16 13:11:26 +02:00
Vince
d6f1496763 Clean KeyManager.js (private semantics) 2012-09-16 13:11:10 +02:00
Vince
7d529aeaaa Move HistoryManager to a service 2012-09-16 13:10:05 +02:00
Vince
de3fa1ea01 Refactoring localStorageService into a prototype based class 2012-09-16 12:59:19 +02:00
juliandescottes
5ca0dbdc94 Merge branch 'master' into gh-pages 2012-09-16 07:57:19 +02:00
juliandescottes
339ab39ce6 Removed checks against 0 when moving/shifting frames. They didnt bring anything and were making the behavior sloppy 2012-09-16 07:56:22 +02:00
Julian Descottes
3e7d576f7e Merge pull request #87 from grosbouddha/fix-pen-tools 
UI cleanup
 2012-09-15 22:50:26 -07:00
Vince
cfd5050901 UI cleanup 2012-09-16 04:33:26 +02:00
grosbouddha
01a522d485 Merge pull request #86 from grosbouddha/mirror-tool 
Vertical mirror tool baby
 2012-09-15 19:15:04 -07:00
Vince
b761750766 Renaming to VerticalMirrorPen 2012-09-16 00:52:39 +02:00
Vince
1a143ad5e3 Vertical mirror pen - initial implementation 2012-09-16 00:49:52 +02:00
Vince
3afbf1c0e9 Comment & todo about rendering order of tool's icons 2012-09-16 00:48:53 +02:00
Vince
36476d5871 clean comments 2012-09-16 00:47:41 +02:00
Vince
2e0826f714 Fix variable scope on simplePen 2012-09-16 00:47:24 +02:00
juliandescottes
b6d8768963 Merge branch 'master' into gh-pages 2012-09-15 23:45:59 +02:00
juliandescottes
2d8db76a5e Context menu needs to also be deactivated on the palette, to easily pick a previously used color as a secondary color. 2012-09-15 23:44:28 +02:00
juliandescottes
fd95abb1c7 Merge branch 'master' into gh-pages 2012-09-15 23:38:54 +02:00
Vince
df8f0a1996 Change ToolSelector to controller directory 2012-09-15 20:50:02 +02:00
Vince
dbae35c5a5 Turn ToolSelector into a prototype class (was closure based) 2012-09-15 20:48:01 +02:00
Vince
9a6ad78f63 fix travis 2012-09-15 20:30:32 +02:00
Vince
440a6391e9 Generate tool's markup automatically 2012-09-15 20:25:45 +02:00
Vince
277fd979e9 master conflict merge 2012-09-15 02:24:06 +02:00
Vince
a88826aa1f Remove code duplication between select tools 2012-09-15 02:02:02 +02:00
Vince
28835f96f3 Cleaning a bit pixel utils + fix empty paste bug 2012-09-15 01:01:47 +02:00
juliandescottes
207e402ef5 Merge branch 'master' into gh-pages 2012-09-15 00:25:08 +02:00
Vince
697f270d78 Injecting framesheet model in SelectionManager singleton 2012-09-15 00:17:08 +02:00
juliandescottes
26dc185bca Fixed jshint warnings 2012-09-14 23:47:05 +02:00
juliandescottes
2edda09f08 Finalized first implementation of Circle tool 2012-09-14 23:43:49 +02:00
juliandescottes
f7d235b116 Adding Circle tool - reusing Rectangle implementation for now 2012-09-14 22:20:34 +02:00
juliandescottes
813b60b854 Simplified Rectangle.js and pixelUtils 2012-09-14 22:20:00 +02:00
Vince
7613bb18b3 Fixing ShapeSelection 2012-09-14 20:18:26 +02:00
Vince
841885939d Basic lasso tool 2012-09-14 20:12:21 +02:00
juliandescottes
ef3e4a5f7a Merge branch 'master' into gh-pages 2012-09-14 01:13:22 +02:00
juliandescottes
741d145d42 Selection tool broken with previous commit. Fixed it. Need tests, cannot manually test all features. 2012-09-14 01:11:24 +02:00
juliandescottes
ba6879875c Fixed dynamic dpi update for drawing canvas, added throttle on resize event. 2012-09-14 00:33:46 +02:00
juliandescottes
62ae3f17a1 History manager is firing events to trigger redraw of listeners 2012-09-14 00:03:27 +02:00
Vince
e85fe32f02 Basic rectangular select tool basic 2012-09-13 22:57:32 +02:00
Vince
2aaab74b80 Fix ctrl/meta for macosx shortcuts 2012-09-12 21:32:18 +02:00
Vince
991b66b67c Basic cut implementation 
SelectionManager implmentaiton
Rectangular seleciton impl
Utils refacoring
Event manager refactoring
basic cut implmentation
 2012-09-12 12:01:47 +02:00
Vince
efbeaf3d50 Initial work + merge 2012-09-11 19:59:00 +02:00
Vince
4c90db44b2 Initial work 2012-09-11 19:55:03 +02:00
juliandescottes
9bc435a13c Merge branch 'master' into gh-pages 2012-09-11 01:07:37 +02:00
juliandescottes
3c9595c174 Display preview on init 2012-09-11 01:07:03 +02:00
juliandescottes
f8395bcb8d merged from master 2012-09-11 00:59:52 +02:00
juliandescottes
11dda9da9c fixed jshint complaints 2012-09-11 00:54:06 +02:00
juliandescottes
a8394d22b1 fixed jshint complaints 2012-09-11 00:52:09 +02:00
juliandescottes
feadca9d1f Added clear method to pskl.model.Frame 2012-09-10 23:34:12 +02:00
juliandescottes
99e9cf8856 Fixed FilmPreview bugs. Simplified piskel.js, removed refernce to drawingController from tools 2012-09-10 23:34:11 +02:00
juliandescottes
e1af86b647 Fixed initialization bug + performance issue with jquery pub sub 2012-09-10 23:34:10 +02:00
juliandescottes
12c9fececb Removed 2 useless instance variables in AnimatedPreviewController 2012-09-10 23:34:09 +02:00
juliandescottes
68c2cae658 Cleaned FrameRenderer.js FrameRenderer should also keep a reference on the frame it is updating - initially I wanted the renderer to be frame independant, but it doesnt bring much 2012-09-10 23:34:08 +02:00
Patrick Brosset
873a10caa2 Fix the duplication in the overlay when grid toggl 
When the grid was toggled, the overlay would actually
draw the main drawing frame instead of just redrawing
itself with transparent pixels.
This was due to the drawingcontroller passing the ref
to the same frame object when initialiwing both
renders.

By the way, the overlay should probably be treated a
bit differently as redrawing all its transprent pixels
in that case is useless.
 2012-09-10 23:34:06 +02:00
juliandescottes
7b90873324 Fixed initialization bug + performance issue with jquery pub sub 2012-09-10 19:53:34 +02:00
juliandescottes
8982a5b479 Removed 2 useless instance variables in AnimatedPreviewController 2012-09-09 11:37:52 +02:00
juliandescottes
d18c3cd5f7 Cleaned FrameRenderer.js FrameRenderer should also keep a reference on the frame it is updating - initially I wanted the renderer to be frame independant, but it doesnt bring much 2012-09-09 02:34:54 +02:00
Patrick Brosset
2c1657f301 Merge branch 'master' of git://github.com/juliandescottes/piskel into fix-grid-duplicate-frame 2012-09-09 01:38:22 +02:00
Patrick Brosset
809fc8b688 Fix the duplication in the overlay when grid toggl 
When the grid was toggled, the overlay would actually
draw the main drawing frame instead of just redrawing
itself with transparent pixels.
This was due to the drawingcontroller passing the ref
to the same frame object when initialiwing both
renders.

By the way, the overlay should probably be treated a
bit differently as redrawing all its transprent pixels
in that case is useless.
 2012-09-09 01:35:29 +02:00
juliandescottes
63d8cd7eb7 Slight performance improvement, previewfilmcontroller still buggy 2012-09-09 01:12:54 +02:00
juliandescottes
2fa95fa1bc Added DrawingLoop.js and plugged basic rendering on each controller 2012-09-09 00:40:05 +02:00
juliandescottes
6e7545a1d2 Added drawing loop, unplugged traditional renderers 2012-09-08 23:59:44 +02:00
Vince
1a99fed64d pull/merge from master 2012-09-08 23:59:13 +02:00
Vince
f169a90644 Checkbox crappy styling and fixing overlayproxy grid 2012-09-08 23:53:59 +02:00
Vince
df945e10dd Add grid checkbox 2012-09-08 23:43:16 +02:00
juliandescottes
e4373ad133 Small updates to FrameRenderer for fun 2012-09-08 23:10:05 +02:00
Vince
6b9904935f Adding grid 2012-09-08 22:26:27 +02:00
Vince
82da78abf1 Adding grid 2012-09-08 22:26:17 +02:00
Vince
2cda69b000 Fixing remove and duplicate actions from previewfilm 2012-09-08 19:00:03 +02:00
Vince
6e8142bb3a Removing commented outdated code 2012-09-08 18:45:18 +02:00
Vince
9dc7afee61 Moving drawing canvas code from piskel.js to drawingController.js 2012-09-08 18:44:06 +02:00
juliandescottes
df405d917f Clone pixels pug 2012-09-08 18:15:53 +02:00
juliandescottes
869f3d2e00 fixed bug when resizing 2012-09-08 17:57:21 +02:00
juliandescottes
ed2e65508a fixed small bug during resize 2012-09-08 17:54:41 +02:00
juliandescottes
07369af9df Fixed bug on clonePixels_ need to stop commiting and pushing without testing ... 2012-09-08 17:44:55 +02:00
juliandescottes
93e479fa11 Fixed bug with removed _clonePixels method in Frame.js 2012-09-08 17:41:09 +02:00
juliandescottes
506b54e27b removed commented code 2012-09-08 17:31:48 +02:00
juliandescottes
a9b01cd7c2 Resize is now bound to height and width, and also avoids overlap with preview 2012-09-08 17:31:19 +02:00
juliandescottes
6a822f1299 Merge branch 'master' of https://github.com/juliandescottes/piskel 2012-09-08 17:30:44 +02:00
Vincent
bcd8cf07e6 Merge pull request #57 from grosbouddha/fix-dnd-canvas 
Fixing DnD when dragging from canvas elements
 2012-09-08 07:58:24 -07:00
Vince
5f451e3cf8 Fixing DnD when dragging from canvas elements 2012-09-08 16:56:07 +02:00
juliandescottes
6bf1c773c8 Fixed undo/redo bug 2012-09-08 16:50:29 +02:00
Vince
ba5500b4b0 Dynamic DPIs ! 2012-09-08 16:32:28 +02:00
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
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
1c1e0398e7 Drag'n drop fix when dropping outside the list 2012-09-07 23:25:38 +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
022773d3ab forgot unstaged files 2012-09-07 01:21:05 +02:00
juliandescottes
71348c2d3c merge from master 2012-09-07 01:18:02 +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
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
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
f2b1e433c0 realigned cursros hotspots 2012-09-06 01:09:02 +02:00
juliandescottes
f723d4bbaf Removed debugging logs from event callbacks. 2012-09-06 00:45:49 +02:00
juliandescottes
9a09f11650 oh well ... 2012-09-06 00:40:27 +02: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
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
070a83fd03 Passed correct reference of drawingController when releasing tool 2012-09-05 23:59:53 +02:00