aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fixed various rendering bugs.hwc4872012-02-27
|
* bug fixes for canvas 2d shape drawing.hwc4872012-02-23
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-23
|\ | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
| * Merge pull request #65 from mqg734/NiveshColorValerio Virgillito2012-02-23
| |\ | | | | | | Fix to read back colors when re-opening files.
| | * Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing app mode check.Valerio Virgillito2012-02-23
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #64 from imix23ways/TimelineValerio Virgillito2012-02-23
| |\ | | | | | | Timeline
| | * Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * New DocJonathan Duran2012-02-23
| | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline Track Open docJonathan Duran2012-02-23
| | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline: Create new PropertyTrack subcomponent, and use it in the ↵Jonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Unterminated linesJonathan Duran2012-02-23
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Redo timeline resize codeJonathan Duran2012-02-23
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| |/ | | | | | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fixing the breadcrumb button - removing toolbutton class since it is not a ↵Valerio Virgillito2012-02-23
| | | | | | | | | | | | tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #60 from mqg734/WebGLMaterialsValerio Virgillito2012-02-23
| |\ | | | | | | Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
| | * Updating textfield to only use nj-skinned class and updating input-group to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | check for nj-skinned class instead of textfield class for styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Adding back the local storage check in the cloudpopup.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | |\ | | |/ | |/|
| * | Merge pull request #63 from dhg637/new-tool-iconsValerio Virgillito2012-02-22
| |\ \ | | | | | | | | New tool icons
| | * | Removed Sass CacheArmen Kesablyan2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Removed Sass CacheArmen Kesablyan2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #62 from mayhewinator/WorkingBranchValerio Virgillito2012-02-22
| |\ \ \ | | | | | | | | | | Fix for bug that keeps Ninja from launching over HTTP....
| | * | | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ↵John Mayhew2012-02-22
| |/ / / | | | | | | | | | | | | extension specific code in an if (window.chrome.app.isInstalled) check.
| | * | Added Shape Panel IconsArmen Kesablyan2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Tool Button FixesArmen Kesablyan2012-02-16
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Tool IconsArmen Kesablyan2012-02-16
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Latest Montage Updates 0.6 FixesArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Tool Icons : New layoutArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | | |\
| | | | * Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Do not use color object for stage's border since we don't allow users to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify the stage's border; we only need the border-width. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
| | | * | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | GL save and reload.hwc4872012-02-22
| | | | |
* | | | | Runtime classeshwc4872012-02-22
| | | | |
* | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| |\| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 07:20:02 +0000