aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1Valerio Virgillito2012-07-23
|\
| * Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-23
| |\
| | * Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninjaValerio Virgillito2012-07-22
| | |\
| | * \ Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
| | |\ \
| | * | | Binding view: fixed mouse move event outside the hudValerio Virgillito2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the variable event to 'e' Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \
| | * | | | The zoom slider resets.Commented some codeKruti Shah2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-20
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-19
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | FIx 3D animation workflowJonathan Duran2012-07-19
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-18
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninja ↵Valerio Virgillito2012-07-22
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | into v0.7.1
| * | | | | | | Unifying the banner and animation template display of ninja-contentValerio Virgillito2012-07-20
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the banner and animation template the stage element now shows div in both the pi and breadcrumb. IKNINJA: 1776 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja into v0.7.1Valerio Virgillito2012-07-20
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | If no material was defined, use Flat material when switching from 2d to ↵Nivesh Rajbhandari2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL shape. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape ↵Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with gradient color or no color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action.Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding ↵Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel causes error. Canvas sizes were not updated when using the splitter to toggle collapse/expansion of panels. This was fixed by the StageDrawingFixes pull request. We should also guard agains null value in stage's getElement routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Binding view: fixed mouse move event outside the hudValerio Virgillito2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced event with 'e' Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninja into ↵Valerio Virgillito2012-07-20
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | v0.7.1
| * | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-20
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
| | |\ \ \ \ \
| * | | | | | | fixing logical error which was a side-effect of ↵Ananya Sen2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SHA:819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b recently Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | copy/paste from external apps - removed unnecessary selection change to fix ↵Ananya Sen2012-07-19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PI redraw issue Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/controllers/clipboard-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | revert manifest version back to 0.7.1Valerio Virgillito2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninja into v0.7.1Valerio Virgillito2012-07-19
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja into v0.7.1Valerio Virgillito2012-07-19
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| | | | | |
| * | | | | Re-added Radial Blur and Raiders materialshwc4872012-07-19
| | |/ / / | |/| | |
* | | | | Merge branch 'StageDrawingFixes' of https://github.com/mqg734/ninja into v0.7.1Valerio Virgillito2012-07-19
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Squashed commit of the following:Nivesh Rajbhandari2012-07-19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |