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
f0d18ae48e
Merge branch 'master' into gh-pages
2012-09-15 00:49:47 +02:00
juliandescottes
cb9227e4c6
compressed a bit the transparent background png (48kB before)
2012-09-15 00:39:50 +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
Julian Descottes
76838e64b9
Merge pull request #78 from juliandescottes/add-circletool
...
Add circletool
2012-09-14 14:51:33 -07: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
Julian Descottes
9e03290df5
Merge pull request #72 from juliandescottes/fix-dynamicdpi
...
Fixed dynamic dpi update for drawing canvas, added throttle on resize ev...
2012-09-13 16:12:51 -07: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
Julian Descottes
2a4077eaad
Merge pull request #71 from juliandescottes/fix-historymanager
...
History manager is firing events to trigger redraw of listeners
2012-09-13 15:06:47 -07:00
juliandescottes
62ae3f17a1
History manager is firing events to trigger redraw of listeners
2012-09-14 00:03:27 +02:00
Julian Descottes
456bf4b55c
Merge pull request #70 from grosbouddha/selecttool
...
Basic rectangular select tool
2012-09-13 14:50:09 -07: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
Julian Descottes
e9c61285af
Merge pull request #67 from juliandescottes/add-renderingloop
...
Add renderingloop
2012-09-10 15:55:33 -07: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
5666733f98
adding Makefile
2012-09-11 00:34:48 +02:00
juliandescottes
fb8d8c7ce2
adding a first package.json file
2012-09-11 00:31:50 +02:00
juliandescottes
2fbd59b71b
adding a first package.json file
2012-09-11 00:29:52 +02:00
juliandescottes
c817465260
adding a first travis.yml file
2012-09-11 00:14:38 +02:00
juliandescottes
ab7d1b4a89
merged from master
2012-09-10 23:46:49 +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
Julian Descottes
9484837a32
Merge pull request #63 from juliandescottes/fix-overlayrendering
...
Cleaned FrameRenderer.js
2012-09-08 17:36:16 -07: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
Julian Descottes
6708bf1ce1
Merge pull request #62 from captainbrosset/fix-grid-duplicate-frame
...
Fix grid duplicate frame
2012-09-08 17:19:07 -07: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
Vincent
a423bf0e1c
Merge pull request #61 from juliandescottes/add-renderingloop
...
Add renderingloop
2012-09-08 16:35:38 -07:00
