aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
Commit message (Collapse)AuthorAge
* Removed unused SubSelect ToolJohn Mayhew2012-05-08
|
* Fixed missing quote from last mergeJohn Mayhew2012-05-07
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | more work on making subtool styling/layout consistentJohn Mayhew2012-05-07
| |
* | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* | First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
|/ | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | preparation for montage converting to the new "prototype" format fully
* 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.
| * 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>
* | render the pen path with local coordinates, but use stage world coordinates ↵Pushkar Joshi2012-04-02
|/ | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working
* Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\ | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | PI for pen and brush strokesPushkar Joshi2012-03-14
| |
* | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
|/
* bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code)
* brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
|
* implement stroke hardness such that it is percentage of the stroke width ↵Pushkar Joshi2012-03-07
| | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options
* Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵Pushkar Joshi2012-03-02
| | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
* Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
| | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
* fixing the Text tool toggle buttonsValerio Virgillito2012-02-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-14
|\ | | | | | | integration
| * Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
| |\
| * | Fixed binding to font size dropdownArmen Kesablyan2012-02-13
| | |
| * | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵Armen Kesablyan2012-02-13
| | | | | | | | | | | | and numbered now bound to text tool
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-09
| |\| | | | | | | | | | feature-branch
| | * More Text Tool UpdatesArmen Kesablyan2012-02-09
| | |
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Armen Kesablyan2012-02-07
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
| | * | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | | |
| | * | Initial Text tool completion.Armen Kesablyan2012-02-07
| | | |
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\| | |
| * | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| * \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | |_|/ | |/| |
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ | | | | | | | | | | Pi bugs fixes for 964, 616, 1084
| | * | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | |/ | | |/| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Added ability to toggle combobox's visibility so we can show/hide materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| |/ / | | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵Nivesh Rajbhandari2012-02-02
| |/ | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 02:45:43 +0000