aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-12
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-11
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
| * | Timeline: Change Master Layer configuration menu to be on click; bug fix:Jon Reid2012-04-11
| | | | | | | | | | | | | | | Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature.
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-12
|\ \ \
| * \ \ Merge pull request #161 from mqg734/PerspectiveFixValerio Virgillito2012-04-11
| |\ \ \ | | | | | | | | | | IKNinja-812 - Perspective fix
| | * \ \ Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUberJonathan Duran2012-04-12
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Timeline:Changing function nameKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | More Absolute vs Relative changes and cleanupJonathan Duran2012-04-11
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Timeline: Bug fix: Drag and Drop now working again.Jon Reid2012-04-10
| | | |
* | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-10
|\ \ \ \
| * | | | Abs. vs. Rel. animation postion functionsJonathan Duran2012-04-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| | |\ \ \ | | | | |/ | | | |/| 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
| | | * | Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other shape types will be handled separately for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | -webkit-transform-style needs to be set to preserve-3d for shapes regardless ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of whether they are 2d shapes or WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fix for line tool not working because PI requests fill color for line as ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well and line shape doesn't have getFillColor method. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Updated canvas-runtime.js to support gradients for rectangle and oval in ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas2d shape mode. Also fixed some typos. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Changing .default to ["default"] to avoid WebStorm errors.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Commenting out console logs.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | We should require VecUtils instead of referring to the global reference ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we will eventually remove that from the window object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | | | |\ \
| | | | | | * | Snapping fixes.hwc4872012-04-02
| | | | | | | |
| | | | | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-29
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping
| | | | | | * | | merge from mainhwc4872012-03-29
| | | | | | | | |
| | | | | * | | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deactivated or becomes non-functional to the shape. Need to set elementModel.isIn2DSnapCache to false when replacing element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | | | IKNinja-1392 - Unable to view Oval canvas2D with Inner Radius in the ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |