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
560 Commits 6 Branches 32 Tags 22 MiB
e4cf2ac40b
Commit Graph

346 Commits

Author SHA1 Message Date
jdescottes
f468790baa Merge from master + added more jshint checks (undef and latedef). Very helpful to catch post merge issues. 2013-08-10 14:28:10 +02:00
jdescottes
87a68bfe21 Dev environment:force indentation to 2 spaces. Added new grunt module, grunt-leading-indent to check space consistency, and modified jshint options to enforce 2 spaces 2013-08-10 12:11:16 +02:00
jdescottes
dc557bdba8 Fixed png preview orientation when saving 2013-08-06 23:38:56 +02:00
jdescottes
2deaf00911 Additional fix to be inline with what APP Engine expects 2013-08-05 23:57:51 +02:00
jdescottes
21172249a3 Added fix for PreviewFilmController for very big piskels : limit DPI to 1 2013-08-05 23:55:19 +02:00
jdescottes
1977141076 Fixed size related issues. Selection Manager no longer depends on the frameoverlay which is now only manipulated by the tools 2013-08-05 23:34:11 +02:00
jdescottes
b42f896584 Adaptations for APP Engine compatibility 2013-08-04 22:15:45 +02:00
jdescottes
a16e1bab09 added Function.prototype.bind polyfill for PhantomJS. Make Casper happy. 2013-08-04 21:20:25 +02:00
jdescottes
91bacd1dd9 Added concat and uglify tasks to grunt. Piskel on master will only be able to work in debug mode, by passing ?debug in URL. The minified version is built in /build, which has been added to .gitignore 2013-08-04 18:27:32 +02:00
jdescottes
218dbbc8b9 put appEngineToken on pskl namespace, fix private convention 2013-07-19 00:37:47 +02:00
jdescottes
032c8c4485 Added logic to switch behavior between appengine and static mode. Removed piskel on window in favor of pskl.app 2013-07-14 23:04:42 +02:00
Julian Descottes
66d19cf9ca Merge pull request #112 from juliandescottes/fix-canvas-size-with-grid 
Fix canvas size when grid display is active
 2013-06-19 22:23:55 -07:00
jdescottes
a01afe2cfd Changed sortable items selector to a more robust one 2013-06-20 00:32:53 +02:00
jdescottes
07ced5a3b2 Exclude add-frame-button from sortable items in preview-film 2013-06-20 00:05:23 +02:00
Vince
4618cb643a Fix canvas size when grid display is active 
- Dynamic resizing of canvas when display_grid is activated/deactivated
 - Adding a main-wrapper to get a perfect alignement at the top and
bottom the application screen
 - fix DPI update on page load (independent of grid option).
 - fix available width for DPI calculation (using margin-box, was using
only content before)
 2013-06-19 19:01:12 +02:00
jdescottes
6cb145ae34 Merge branch 'master' into user-settings 2013-06-19 07:38:13 +02:00
Vince
7bbcbe1861 Review comments 2013-06-19 01:51:53 +02:00
jdescottes
0fe2e981b0 Reverted back to onchange due to lack of support of input range in firefox 21 2013-06-19 00:29:07 +02:00
Vince
73aae69425 Fix Travis: convert tabs to spaces 2013-06-17 23:22:30 +02:00
Vince
5913b19641 Plug canvas background settings on UserSettings storage 
Canvas background class are now manager at the FrameRenderer level
instead of CSS classes at the top of the DOM.
 2013-06-17 23:10:35 +02:00
Vince
9eac3414a3 Clean grid code: semantic names and tiny refactor using UserSettings 2013-06-17 23:06:17 +02:00
Vince
2691b23c09 Fix cache typo in UserSettings 2013-06-17 21:23:21 +02:00
Vince
9a3a87bd57 Fix travis 2013-06-17 21:03:22 +02:00
Vince
1d4ff1d2de Create an event based UserSettings and use it for the grid diplay state. 2013-06-17 20:24:27 +02:00
Vince
889d5c0d53 Add basic UserSettings persistence static utility. 
Based on localStorage for now.
 2013-06-17 19:54:43 +02:00
Vince
403105aae4 Adding TODOs related to namespace cleaning 2013-06-17 11:42:53 +02:00
Vince
97ddc6ecc1 Adding simple backgorund picker (without persistence) 2013-06-17 11:36:56 +02:00
Vince
453f77cdd6 Nit: fix indentation 2013-06-17 10:37:08 +02:00
Vince
458f56f1ec Move toggling code to settingscontroller 2013-06-16 10:36:26 +02:00
Vince
3ac2c5e922 Remove bad/deprecated TODOs 2013-06-16 10:18:22 +02:00
Vince
955a49d2dd Adding SettingsController 2013-06-16 10:17:50 +02:00
Vince
765f75f255 Fix preview frames scrollers 
They were not properly updated when content was re-becoming smaller
than the scroller.
 2013-06-16 09:38:31 +02:00
Patrick Brosset
f6f02c7c1f correct slider init value and better FX slider event handling 2013-06-15 21:27:08 +02:00
Vince
4208e40c24 Adding drawer prototype 2013-06-15 19:35:55 +02:00
Vince
13de7cbcfb New layout: application actions sticking to the right edge 2013-06-15 19:04:36 +02:00
Vince
92561db1c6 Fix contextmenu right click (active only above drawing canvas) 2013-06-14 13:18:26 +02:00
Vince
460c391326 Code cleanup + unsued images removal 2013-06-14 13:17:20 +02:00
Vince
d34f24141a Add canvas background switcher 
A quick integration to make our minds on different backgrounds and ask
for feedback
 2013-06-14 13:16:18 +02:00
Vince
2b18165f86 Fix scroller overflows apparitions 2013-06-13 23:20:51 +02:00
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