aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Fixing duplicate layer bug
| | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| | | |\| | | |
| | | * | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | | | | | | |
| | | * | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Changing canvas-2d gradient drawing to more closely match div's ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background-image gradient support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
| | | * | | | | Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes.
* | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
|\| | | | |
| * | | | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
| | | | | |
* | | | | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
|/ / / / /
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
|\| | | |
| * | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | re-compute and store the center of the subpath in local coordinates upon ↵Pushkar Joshi2012-04-24
| | | | | | | | | | | | | | | | | | | | file open
| * | | | allow the addition of the pen tool to the timelinePushkar Joshi2012-04-23
| | | | |
| * | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js
| * | | | | get the canvas plane matrix before multiplying it with the translation due ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | to shift in center of rotation
| * | | | | correctly maintain canvas position when drawing subpaths off the XY plane ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | (was a bug with starting drawing in those planes)
| * | | | | for subpaths that have not been initialized with a canvas yet (i.e. no local ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | coordinates), use stage world mouse positions to translate the anchor points while dragging
| * | | | | store the canvas center (in local space) per each subpath, instead of ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | tracking it by the pen tool. This fixes the bug where the canvas transform was incorrectly applied when the stroke width was changed
| * | | | | turn off snapping for the pen tool (with an option to turn it back on if we ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | decide to, later)
| * | | | | fix a bug with closing the subpathPushkar Joshi2012-04-18
| | | | | |
| * | | | | re-enable dragging and editing of anchor point handles for bezier path ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | editing in 3D
| * | | | | compute the translation to new center of bounding of the subpath --- this ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | preserves the correct transformation applied to the subpath. This is a good snapshot of the polyline drawing in 3D (with some minor bugs).
| * | | | | allow drawing polylines in YZ and XZ planes as well as XY. In those planes, ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | still have bug with shift when the bbox of the path grows (due to missing translation)
| * | | | | Fairly stable version of polyline drawing code that works for paths on XY, ↵Pushkar Joshi2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YZ, XZ planes. Current bugs: if the new point increases the bbox of the canvas, the entire canvas is shifted (due to inconsistency with center of rotation) AND the first two points added to planes other than XY have incorrect local coordinates (due to missing local coordinates)
| * | | | | took out bad merge line and use different function for converting points ↵Pushkar Joshi2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | from local to global coords (the latter should be a temporary change as I will significantly change this)
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| * | | | | | Snapshot for pen tool before merging with master....can draw polylines (no ↵Pushkar Joshi2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | prev, next) handles and hit testing in 3D. Update of the canvas with a transformation on it will modify the canvas incorrectly, and will be completed after merging with master
| * | | | | | re-enable some hit testing and change the code for obtaining 3D (stage ↵Pushkar Joshi2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | world) point when there is no canvas yet
| * | | | | | limit the size of the subpath canvas by ignoring the last point added that ↵Pushkar Joshi2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tool the canvas size over the specified limit
| * | | | | | Allow the path stroke width to be changed without causing a drift in the ↵Pushkar Joshi2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas position AND some code cleanup (remove canvas left and top tracking for each subpath) AND add flags for the specifying in what coordinate space we're sampling the subpath
| * | | | | | Still buggy version of pen tool that can create polylines in 3D space ↵Pushkar Joshi2012-04-13
| | | | | | | | | | | | | | | | | | | |