aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
|\
| * Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| |\ | | | | | | Pentool
| | * 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
| | |\ \
| | * \ \ Merge branch 'master' into pentoolPushkar Joshi2012-02-02
| | |\ \ \
| | | * | | Fixing the bread-crumb backgroundValerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-01-31
| | |\| | |
| | | * | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | |/ / /
* | / / / Switching the components panel to use the new ninja tree component.Valerio Virgillito2012-02-09
|/ / / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | / Tree Components - css fixesEric Guzman2012-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>
* | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
|\ \ \ \ | |/ / / |/| | | Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
| * | | 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>
| * | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | 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/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| |\ \ \ | | | |/ | | |/|
| * | | Add enabled property for ComboBox to support enabling/disabling materials ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| |/ / |/| |
* | | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | |
* | | Tree Components - Adding the tree componentsEric Guzman2012-02-06
|/ /
* | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
|\ \ | | | | | | Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
| * | 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>
| * | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-01-30
| |/ | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing the bread-crumb backgroundValerio Virgillito2012-02-01
| | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-01
|/ | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>