aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-07
|\
| * id's must start with a letter, so our workaround for using uuid for RDGE canv...Nivesh Rajbhandari2012-02-07
| * Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
| * Supporting switching materials in the PI. Also, moved makeFillMaterial and ma...Nivesh Rajbhandari2012-02-07
| * Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| * Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| |\
| | * 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 nul...Eric Guzman2012-02-06
| | * Styles Controller - First stab at group stylingEric Guzman2012-02-06
| * | Force layout canvas and SelectionController to update their info when a 2d ca...Nivesh Rajbhandari2012-02-06
| * | Support toggling between 2d and 3d canvas context. This requires us to create...Nivesh Rajbhandari2012-02-06
| * | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| * | Allow users to switch between 2d and webGL mode. Note that this doesn't curre...Nivesh Rajbhandari2012-02-06
* | | test code for deformation shaderhwc4872012-02-07
* | | Enhanced the overlap test for the selection tool marquee select.hwc4872012-02-06
* | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-06
|\| |
| * | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| |/
| * Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
| |\
| | * Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | * We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| * | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
* | | Removed an unnecessary (and incorrect) snapping calculation.hwc4872012-02-06
* | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-03
|\ \ \ | | |/ | |/|
| * | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| * | Handle delete of multiple objects. Also, have deletion go through the mediato...Nivesh Rajbhandari2012-02-03
| * | Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| * | Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \
| | * | Removed border special-casing from PI since the mediator now handles this gen...Nivesh Rajbhandari2012-02-01
| | * | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | * | Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | * | 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
| * | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
* | | | | Added a counter to the renderer that tracks the number of unloaded texture maps.hwc4872012-02-03
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-02-03
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\ \ \ \
| | * | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | * | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-01
| | * | | | Fixes for montage integrationValerio Virgillito2012-02-01
| | * | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-01