aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/transitions-presets.reel
Commit message (Collapse)AuthorAge
* Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * merge from mainhwc4872012-03-29
| |
* | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
|/ | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | | panel code
* 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.
* Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Presets - Modify application of preset classes for new json structureEric Guzman2012-02-15
|
* Presets Panel - Initial commit with panel contentEric Guzman2012-02-07