aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Timeline : Selection FixJonathan Duran2012-02-27
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Order of tweens and corresponding layers taken care overJonathan Duran2012-02-25
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline : Adding Tweens PropertiesJonathan Duran2012-02-25
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/Timeline-local' into TimelineJonathan Duran2012-02-25
|\
| * Timeline: Add grids to property tracks. First take on clearTimeline method ↵Jon Reid2012-02-24
| | | | | | | | on TimelinePanel class.
| * Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵Jon Reid2012-02-24
| | | | | | | | a layer, and fix serialization variable problem.
| * Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-24
| |\
| * \ Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| |\ \
| * \ \ Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * | | | | Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
| | | | | |
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-25
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge pull request #69 from mayhewinator/WorkingBranchmayhewinator2012-02-24
| |\ \ \ \ | | | | | | | | | | | | Removing tabs permissions
| | * | | | Removing tabs permissions until we make a final decision on whether or not ↵John Mayhew2012-02-24
| |/ / / / | | | | | | | | | | | | | | | we will require it.
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| |\ \ \ \
| | * \ \ \ Merge pull request #68 from mqg734/ToolFixesValerio Virgillito2012-02-24
| | |\ \ \ \ | | | |_|/ / | | |/| | | Tool fixes - Adding back the InkBottle tool. Also Fixed some typos in 3d helper classes.
| | | * | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-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 Rajbhandari2012-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 Rajbhandari2012-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 Rajbhandari2012-02-24
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * / / / Adding some missing copyrightsValerio Virgillito2012-02-24
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | / - added flag for timeline to identify new file flowJonathan Duran2012-02-24
| |_|/ |/| | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-24
|\| | | |/ |/|
| * Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| |\ | | | | | | Timeline : Fix for the split and element model error
| | * Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-23
| |\ \
| | * \ 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 the selection tool properties icons.Valerio Virgillito2012-02-23
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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
* | | | add back layer selectionJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Remove unneeded selection codeJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Move element selection to click handlerJonathan Duran2012-02-23
| |/ / |/| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 05:18:51 +0000