aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* cleanupJonathan Duran2012-03-07
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Bigfixes and cleanup from optimizationJonathan Duran2012-03-07
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Bugfixes from optimizationJonathan Duran2012-03-07
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Optimize Timeline serializationJonathan Duran2012-03-07
| | | | | | Change all serialized properties into one big object to reduce bindings Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Optimize serialization bindings for Tween componentJonathan Duran2012-03-07
| | | | | | Move all serialized properties of Tween component into on data object with one binding instead of multiple properties with individual bindings Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * Timeline:Storing HashTable for switching docsKruti Shah2012-03-06
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * Timeline: Fixing the layer switchingKruti Shah2012-03-05
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * Timeline: Removing Events for Adding and Deleting Layer, Taking care of ↵Kruti Shah2012-03-05
| | | | | | | | | | | | BreadCrumb Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * Merge branch 'refs/heads/TimelineUber' into Timeline-b4-latestKruti Shah2012-03-05
| |\
* | \ Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
|\ \ \
| * \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| |\ \ \
| | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | |\ \ \
| | | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
| | | |\ \ \
| | | | * \ \ 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
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | | | |\ \ \
| | | | | * | | | 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>
| | | * | | | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | / / / Fixing WebGL not available bugJose Antonio Marquez2012-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>
| | | * | | 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.
* | | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
| | | | | | | |
* | | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
|\| | | | | | |
| * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| |\ \ \ \ \ \ \
| | * | | | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |