aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | Revert "Creating NinjaTemplate to HTML function"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | 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 ↵hwc4872012-02-21
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | integration
| * | | | | | | Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to use SnapManager code if elementFromPoint returns the viewport. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \ \ \
| * | | | | | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Get color from canvas and images.Nivesh Rajbhandari2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \ \ \ \
| * | | | | | | | Check if eyedropper is over border or background.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Fixed issue with tools not drawing their handles when mousing up.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Fixed eyedropper tool to use new color routines.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Merge pull request #57 from joseeight/CloudFixValerio Virgillito2012-02-20
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Cloud URL localStorage Fix
| * | | | | | | | Cloud URL localStorage FixJose Antonio Marquez2012-02-20
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load.
* | | | | | | | Merge pull request #55 from mencio/nested-selectionValerio Virgillito2012-02-17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Re-adding stage mouse wheel scrolling
| * | | | | | | Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | Merge pull request #54 from joseeight/TabPreviewValerio Virgillito2012-02-17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Tab preview
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into TabPreviewJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #53 from joseeight/FileIOValerio Virgillito2012-02-17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | File IO local files webRequest redirect
| | * | | | | | | | 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 bug
| | * | | | | | | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | initial commit of the Ninja readme fileValerio Virgillito2012-02-17
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to add logic to resolve file's actual URL dynamically.
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #51 from mencio/componentsValerio Virgillito2012-02-16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixing the components not instantianting in the user document
| * | | | | | | Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Fixing the component loading error.Valerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the deserializedFromTemplate which was causing the component not to load. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\ \ \ \ \ \ \