aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-04-30
| | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge cleanupValerio Virgillito2012-04-27
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\
| * Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| |\ | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\
| | * | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \
| | * | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-24
| | |\ \ \
| | * | | | Added a body controllerValerio Virgillito2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | serialization
| | * | | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully
* | | | | | Merge pull request #181 from imix23ways/TimelineUberValerio Virgillito2012-04-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Timeline uber
| * | | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Brushtool
| * | | | | | track the dragging plane based on the hit record so that the file IO works ↵Pushkar Joshi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | again (bug fix)
| * | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-04-25
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | render the calligraphic brush stroke in realtime on a rotated canvasPushkar Joshi2012-04-25
| | | | | | |
| * | | | | | allow the realtime drawing of brush strokes drawn off the standard XY plane ↵Pushkar Joshi2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | by passing in the transformation matrix
* | | | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets.
| * | | | | | We don't currently support perspective values on individual elements, so ↵Nivesh Rajbhandari2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | * | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | * | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | | | |
| | | | | * | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | | | |
| | | | | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
| | | | | |\ \
| | | | | | * \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
|/| | | | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer bug
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| |\| | | | | |
| * | | | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | | | | | | |
| * | | | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | | | | | |
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-24
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 19:29:33 +0000