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
326 Commits 6 Branches 32 Tags 22 MiB
70f46649a8
Commit Graph

326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Brosset
ed177d92e6 Merge branch 'master' of git://github.com/juliandescottes/piskel 2012-09-09 00:09:35 +02:00
Patrick Brosset
0fe9ade870 added subl project artefacts to gitignore 2012-09-09 00:09:18 +02:00
Julian Descottes
0163221ac9 Merge pull request #59 from grosbouddha/add-grid-for-real 
Add grid for real
 2012-09-08 15:00:21 -07: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
4fe72043ab Merge branch 'master' into gh-pages 2012-09-08 17:45:33 +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
e2960ecdfb Merge branch 'master' into gh-pages 2012-09-08 17:42:17 +02:00
juliandescottes
93e479fa11 Fixed bug with removed _clonePixels method in Frame.js 2012-09-08 17:41:09 +02:00
juliandescottes
914df75faa Merge branch 'master' into gh-pages 2012-09-08 17:35:36 +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
Julian Descottes
c16eba0eb9 Merge pull request #56 from grosbouddha/add-grid-on-drawing-canvas 
FrameRenderer refactoring + dynamic DPI
 2012-09-08 07:48:04 -07:00
Vince
ba5500b4b0 Dynamic DPIs ! 2012-09-08 16:32:28 +02:00
juliandescottes
8202528f5a Merge branch 'master' into gh-pages 2012-09-08 16:27:42 +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
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