aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-06
|\ | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js
| * Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| |\ | | | | | | Panels - removing repetition from the panel container and using a static list of panels.
| | * Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | |\ | | |/ | |/|
| * | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | |
| | * Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | |\ | | |/ | |/|
| * | Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | | | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Adding drag and dropValerio Virgillito2012-03-05
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * remove console logValerio Virgillito2012-03-05
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| |/ | | | | | | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #93 from imix23ways/TimelineValerio Virgillito2012-03-02
| |\ | | | | | | Timeline: Critical bug fixes
| | * Timeline Fix timing functionJonathan Duran2012-03-02
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Merge pull request #92 from mqg734/WebGLFixesValerio Virgillito2012-03-02
| |\ \ | | | | | | | | Selection Tool Fixes for elements flying off into space when they overlap
| | * | Fixing flying off into space bug for translate tool too.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Don't draw transform handles if the stage is the target element.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-01
| | |\ \
| | * | | Fixed logic error when resizing with the top-left transform handles.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Re-fixing IKNinja-940 - Can't select objects when in side/top view.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Last-used material (instead of FlatMaterial) is applied to shape when ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge pull request #94 from ericguzman/PresetsPanelValerio Virgillito2012-03-02
| |\ \ \ \ | | |_|/ / | |/| | | Presets Panel - Fix single-click activation, and transition cut-off bug.
| | * | | Presets Panel - Fix single-click activation, and transition cut-off bug.Eric Guzman2012-03-02
| |/ / / | | | | | | | | | | | | Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one.
* | | | IOhwc4872012-03-06
| | | |
* | | | Updated buildShapeModel to set PI and selection values too and also avoid ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | fill material for lines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | update the shapeModel after importhwc4872012-03-06
| | | |
* | | | Authortime import of 2d & 3d canvaseshwc4872012-03-06
| | | |
* | | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into ↵hwc4872012-03-06
|\ \ \ \ | | | | | | | | | | | | | | | integration
| * | | | Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed math rounding so that animation durations won't round to full seconds anymore. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Timeline Fix timing functionJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add default webkit css properties to allow animations with integer iteration counts. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Remove console logJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | CleanupJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove commented lines Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Start looping over tweened properties genericallyJonathan Duran2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer hard coding for top and left properties. Instead, looping over all tweened properties generically and building keyframe strings. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Timeline bug fixes and cleanupJonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deselect tweens on every selection change. Replace JS alerts with console logs. Cleanup obsolete models and references. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix for selection change event handlerJonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event handler wasn't being executed because of incorrect handler function name Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
| | | | | | | | | | | | | | | | | | | | Redefine collapser to use property binding instead of events.
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge pull request #91 from mayhewinator/WorkingBranchmayhewinator2012-03-01
| | |\ \ | | | | | | | | | | updated name in our manifest and incremented base build number
| | | * | updated name in our manifest and incremented base build numberJohn Mayhew2012-03-01
| | |/ /
| | * | Merge pull request #90 from mencio/stage-fixesValerio Virgillito2012-03-01
| | |\ \ | | | | | | | | | | Stage fixes
| | | * \ Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| | | |\ \ | | | |/ / | | |/| |
| | * | | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | | |/ | | |/| | | | | | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixesValerio Virgillito2012-03-01
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/TagTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | | |/ | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * stage and elements fixesValerio Virgillito2012-03-01
| | |/ | | | | | | | | | | | | | | | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
| |\ \