aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Revert "Merge from /joseeight/ninja-internal/tree/FileIO"Ananya Sen2012-02-10
* Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| |\
| * | Fixed several typos in Materials import/export code to support toggling betwe...Nivesh Rajbhandari2012-02-08
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ | | |/ | |/|
| * | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ | | |/ | |/|
| | * Styles Controller - Added array of dirty stylesheets and event dispatch when ...Eric Guzman2012-02-08
| * | 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
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| |\|
| * | 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
| * | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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
| |/
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\ \
| * \ Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ \ | | |/ | |/|
| | * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | * Tree Controller - Initial addEric Guzman2012-02-06
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| |
| * | 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/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| |
| * | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| * | Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ...Nivesh Rajbhandari2012-02-02
| * | Fixing 3d section of the PI.Nivesh Rajbhandari2012-01-31
| * | Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
| |/
| * Updated canvas controller to override setProperties so we don't set styles wh...Nivesh Rajbhandari2012-01-27
* | Updated canvas controller to override setProperties so we don't set styles wh...Nivesh Rajbhandari2012-01-29
* | Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27