aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
|\
| * Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| |\ | | | | | | Styles controller updates
| | * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | |\ | | |/ | |/|
| * | Merge pull request #17 from joseeight/SnapFixValerio Virgillito2012-02-06
| |\ \ | | | | | | | | Attempt to fix initialization bug for snap-manager
| | * | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| |/ /
| * | Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ \ | | | | | | | | Tree components
| | * | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | |
| | * | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | |
| | * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | |
| | * | Tree Controller - Initial addEric Guzman2012-02-06
| | | |
| | | * Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | | |
| | | * TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | |
| | | * Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | |
| | | * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | |
| | | * Tree Controller - Initial addEric Guzman2012-02-06
| | | |
| | | * Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | | |
| | | * Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | | |
| | | * Styles Controller - Add code to remove cache items from history (not just ↵Eric Guzman2012-02-06
| | | | | | | | | | | | | | | | nullifying them)
| | | * Styles Controller - First stab at group stylingEric Guzman2012-02-06
| | |/ | |/| | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style.
* | | Force layout canvas and SelectionController to update their info when a 2d ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Support toggling between 2d and 3d canvas context. This requires us to ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | 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>
* | | Allow users to switch between 2d and webGL mode. Note that this doesn't ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
|/ / | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
|\ \ | | | | | | Adding, deleting and modifying elements now keep the element planes and PI in sync.
| * | Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-06
| |\|
| * | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Removed border special-casing from PI since the mediator now handles this ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | |\ \
| * | \ \ Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \ \
| * | | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Merge pull request #14 from mencio/IKNINJA-854Valerio Virgillito2012-02-06
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | IKNINJA-854 - removed cons and replaced it with var
| * | | | | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | / / / updating the versions file after the montage integration. Bumped ninja ↵Valerio Virgillito2012-02-03
| |/ / / |/| | | | | | | | | | | | | | | | | | | version to 0.5.5 in preparation to a stable build. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
|\ \ \ \
| * \ \ \ Merge pull request #11 from joseeight/MontageV6ColorValerio Virgillito2012-02-02
| |\ \ \ \ | | | | | | | | | | | | Fixed the color popups to work with m-js v6
| | * | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| |/ / / / | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
| * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>