aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | | Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-27
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| | * | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-24
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Moved all color updating routines to a single function.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | 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>
| * | | | | | | 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
| |\ \ \ \ \ \ \
| | * | | | | | | - 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 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
| | |/ / / / / / | |/| | | | | |
| * | | | | | | 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>
* | | | | | | | Updating legal copyJose Antonio Marquez2012-02-27
| | | | | | | |
* | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
|\ \ \ \ \ \ \ \
| * | | | | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | | | | | | |
| * | | | | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | | | | | | |
| * | | | | | | Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up URL getter for app in cleaning string code.
| * | | | | | | Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| | | | | | | |
| * | | | | | | Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions.
| * | | | | | | Adding prettify code to I/OJose Antonio Marquez2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a possible set of methods to be used to prettify code. Added temporarily until approved.
| * | | | | | | Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | FileIO branch pull request
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | 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 import/export of RDGE dataJose Antonio Marquez2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated.
* | | | | | |