Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | Merge pull request #183 from mqg734/data-id | Valerio Virgillito | 2012-04-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ... | Nivesh Rajbhandari | 2012-04-30 | |
* | | | | | | | | | | | | | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 | |
|/ / / / / / / / / / / / | ||||
* / / / / / / / / / / / | converting the layout folder to use data-montage-id | Valerio Virgillito | 2012-04-30 | |
|/ / / / / / / / / / / | ||||
* | | | | | | | | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 | |
* | | | | | | | | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja... | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 | |
| | * | | | | | | | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ... | Valerio Virgillito | 2012-04-26 | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Added a body controller | Valerio Virgillito | 2012-04-24 | |
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ... | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | Removing all "module" declarations and replaced with "prototype" in preparati... | John Mayhew | 2012-04-26 | |
* | | | | | | | | | | | | | Merge pull request #181 from imix23ways/TimelineUber | Valerio Virgillito | 2012-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | track the dragging plane based on the hit record so that the file IO works ag... | Pushkar Joshi | 2012-04-26 | |
| * | | | | | | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-04-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | render the calligraphic brush stroke in realtime on a rotated canvas | Pushkar Joshi | 2012-04-25 | |
| * | | | | | | | | | | | | allow the realtime drawing of brush strokes drawn off the standard XY plane b... | Pushkar Joshi | 2012-04-24 | |
* | | | | | | | | | | | | | Merge pull request #178 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | We don't currently support perspective values on individual elements, so remo... | Nivesh Rajbhandari | 2012-04-26 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-04-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Fixing the eye dropper shortcut. | Valerio Virgillito | 2012-04-26 | |
| | | | | * | | | | | | | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 | |
| | | | | * | | | | | | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 | |
| | | | | * | | | | | | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 | |
| | | | | * | | | | | | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 2012-04-26 | |
| | | | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-26 | |
| | | | | |\ \ \ \ \ \ \ | ||||
| | | | | | * \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
| | | | | | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge pull request #179 from joseeight/FileIO | Valerio Virgillito | 2012-04-26 | |
|/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-26 | |
| |\| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Fixing duplicate layer error | Jose Antonio Marquez | 2012-04-26 | |
| * | | | | | | | | | | | | Fixing duplicate layer bug | Jose Antonio Marquez | 2012-04-26 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-28 | |
| | |