aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Added all materials back inhwc4872012-02-22
* Adding all the shaders back inhwc4872012-02-22
* Adding bug fixes.hwc4872012-02-22
* Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr...hwc4872012-02-21
|\
| * Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\
| * | Fix for not being able to select an element in Top/Side view.Nivesh Rajbhandari2012-02-14
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \
| * | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| * | | Get color from canvas and images.Nivesh Rajbhandari2012-02-14
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \
| * | | | Check if eyedropper is over border or background.Nivesh Rajbhandari2012-02-13
| * | | | Fixed issue with tools not drawing their handles when mousing up.Nivesh Rajbhandari2012-02-13
| * | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| * | | | Fixed eyedropper tool to use new color routines.Nivesh Rajbhandari2012-02-13
| * | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
* | | | | Merge pull request #57 from joseeight/CloudFixValerio Virgillito2012-02-20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Cloud URL localStorage FixJose Antonio Marquez2012-02-20
|/ / / /
* | | | Merge pull request #55 from mencio/nested-selectionValerio Virgillito2012-02-17
|\ \ \ \
| * | | | Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
* | | | | Merge pull request #54 from joseeight/TabPreviewValerio Virgillito2012-02-17
|\ \ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into TabPreviewJose Antonio Marquez2012-02-17
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #53 from joseeight/FileIOValerio Virgillito2012-02-17
|\ \ \ \ \ \
| | * | | | | Chrome PreviewJose Antonio Marquez2012-02-17
| |/ / / / /
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'refs/heads/stage-matrix-issue'Valerio Virgillito2012-02-17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge pull request #52 from mencio/stage-matrix-fixValerio Virgillito2012-02-16
| |\ \ \ \ \
| | * | | | | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| |/ / / / /
| | * | | | Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | fixed typoValerio Virgillito2012-02-17
* | | | | | initial commit of the Ninja readme fileValerio Virgillito2012-02-17
|/ / / / /
| * | | | Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #51 from mencio/componentsValerio Virgillito2012-02-16
|\ \ \ \ \
| * | | | | Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| * | | | | Fixing the component loading error.Valerio Virgillito2012-02-16
| * | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #50 from mencio/canvas-dataValerio Virgillito2012-02-16
|\ \ \ \ \ \
| * | | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| * | | | | | Support for data attributes and adding a random string generatorValerio Virgillito2012-02-16
* | | | | | | Merge pull request #49 from mayhewinator/WorkingBranchmayhewinator2012-02-16
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-16
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Updated the update url in our manifest file to point to our internal server.John Mayhew2012-02-16
| | | * | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| | | |\ \ \ \ \
| | | * | | | | | Adding more components piValerio Virgillito2012-02-15
| | | * | | | | | Adding the button and the dropdown control.Valerio Virgillito2012-02-15
| | | * | | | | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| | | * | | | | | Completing the anchor elementValerio Virgillito2012-02-14
| | | * | | | | | Adding all the components to the panelValerio Virgillito2012-02-14