aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* took out bad merge line and use different function for converting points from...Pushkar Joshi2012-04-17
* Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\
| * Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\
| | * Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| * | Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
| |\ \
| | * | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ...Nivesh Rajbhandari2012-04-13
| | |/
| * | Fixing the shape borderValerio Virgillito2012-04-13
| * | collapsing the history panel by default and commenting out the undo for the 3...Valerio Virgillito2012-04-13
| * | fixed stage rotationValerio Virgillito2012-04-13
| * | clear console logValerio Virgillito2012-04-13
| * | CleanupValerio Virgillito2012-04-13
| * | fixing the transform handlesValerio Virgillito2012-04-13
| * | removing _undo array and _targets array and use object instead of matching ar...Valerio Virgillito2012-04-13
| * | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| |\|
| | * Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| | * Borders are not factored into offset calculations by the browser, so we have ...Nivesh Rajbhandari2012-04-12
| | * offsets should be calculated on offsetParent instead of parentElement.Nivesh Rajbhandari2012-04-11
| | * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| | |\
| | * | Single perspective fix.Nivesh Rajbhandari2012-04-09
| * | | some code cleanupValerio Virgillito2012-04-10
| * | | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| * | | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| * | | adding a history panelValerio Virgillito2012-04-09
| | |/ | |/|
| * | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\|
| | * Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
| | * -webkit-transform-style needs to be set to preserve-3d for shapes regardless ...Nivesh Rajbhandari2012-04-05
| | * Fix for line tool not working because PI requests fill color for line as well...Nivesh Rajbhandari2012-04-05
| | * Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
| | * Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
| | * Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| | * Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | * Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | * Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | * Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | * Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | * Commenting out console logs.Nivesh Rajbhandari2012-04-05
| | * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | |\
| | | * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | |\
| | | | * We should require VecUtils instead of referring to the global reference since...Nivesh Rajbhandari2012-04-04
| | | | * 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 Sna...hwc4872012-03-29
| | | | | |\
| | | | | * | merge from mainhwc4872012-03-29
| | | | * | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | * | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | * | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | * | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets deactivate...Nivesh Rajbhandari2012-04-03
| | | | * | | IKNinja-1376 - 3D values reverted when using Selection tool to move the objec...Nivesh Rajbhandari2012-04-02
| | | | * | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | | | * | | Switching to Linear/RadialGradient materials will set the corresponding color...Nivesh Rajbhandari2012-04-02