aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/default-animation-presets.js
Commit message (Collapse)AuthorAge
* Undoing mistakes 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
| |
* | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
|/ | | | temporary fix for aggregating animations (from timeline/presets)
* Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
|\
| * Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| |
| * Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
| |
| * Presets - Animation updateEric Guzman2012-03-20
| |
* | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
|/ | | | panel code
* Presets Panel - Adding Animations TabEric Guzman2012-03-16