Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Reset translation values as well when double-clicking to reset the rotation ↵ | Nivesh Rajbhandari | 2012-02-27 |
| | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-24 |
|\ | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-24 |
| |\ | |||
| * | | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Moved all color updating routines to a single function. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | snapping routine when selecting only if the active tool allows snapping. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Adjusting fill and ink bottle cursors to match the tips of the icons. | Nivesh Rajbhandari | 2012-02-24 |
| |/ |/| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Javascript does not evaluate a return with its expression in a new line. The ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Removing duplicate get/setElementPlanes method. | Nivesh Rajbhandari | 2012-02-24 |
|/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge pull request #67 from ntfx47/PullRequest-Timeline | Valerio Virgillito | 2012-02-23 |
|\ | | | | | Timeline : Fix for the split and element model error | ||
| * | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 |
| | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | Merge pull request #65 from mqg734/NiveshColor | Valerio Virgillito | 2012-02-23 |
|\ \ | | | | | | | Fix to read back colors when re-opening files. | ||
| * | | Fix to read back colors when re-opening files. | Nivesh Rajbhandari | 2012-02-23 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Fixing app mode check. | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 |
|/ / | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* / | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 |
|/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-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 Doc | Jonathan Duran | 2012-02-23 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline Track Open doc | Jonathan Duran | 2012-02-23 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-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 Duran | 2012-02-23 |
| | | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Unterminated lines | Jonathan Duran | 2012-02-23 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Redo timeline resize code | Jonathan Duran | 2012-02-23 |
| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-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 Virgillito | 2012-02-23 |
| | | | | | | tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Updating textfield to only use nj-skinned class and updating input-group to ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-02-22 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Buttons in the rectangle properties in the tools options need to float left. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
|\ | |||
| * | Merge branch 'refs/heads/master' into new-tool-icons | Armen Kesablyan | 2012-02-22 |
| |\ | |||
| | * | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ↵ | John Mayhew | 2012-02-22 |
| | | | | | | | | | | | | extension specific code in an if (window.chrome.app.isInstalled) check. | ||
| * | | Tool Button Fixes | Armen Kesablyan | 2012-02-16 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | New Icons: Last set had imperfections | Armen Kesablyan | 2012-02-15 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Tool Icons : New layout | Armen Kesablyan | 2012-02-15 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
|\ \ \ | |||
| * | | | Removing unused method that was using snapManager. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 |
| |\ \ \ | | | |/ | | |/| | |||
| * | | | Fixing eyedropper tool to get color from image data. This required us to ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Some more tweaks to not being able to select elements in top/side view. | Nivesh Rajbhandari | 2012-02-20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | PulseMaterial and RadialBlurMaterial had typos in their import code. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d. | ||
* | | | | Color chips expect a color object, not a css value. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | user document main reel listener moved to the html-document class. | Valerio Virgillito | 2012-02-21 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> |