aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/shapes-controller.js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
|\
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\
| * | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| * | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
* | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
|\ \ \ | | |/ | |/|
| * | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
* | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
|\| |
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\|
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \
| * \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ \ \
| * | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| * | | | | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | |_|_|_|/ | |/| | | |
| * | | | | Fixed several typos in Materials import/export code to support toggling betwe...Nivesh Rajbhandari2012-02-08
| | |_|_|/ | |/| | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-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
| * | | | 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/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ...Nivesh Rajbhandari2012-02-02
| |/
* | 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
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27