Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
* 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs: Parallel is now derived from CompoundEffect Add CompoundEffect which allows bead to determine how compound effects are handled. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ed752518 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ed752518 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ed752518 Branch: refs/heads/develop Commit: ed7525180af24bb44a2d46823ceb249ad2d4aa13 Parents: 3d5f631 ee4fa77 Author: Harbs <[email protected]> Authored: Mon Jan 30 15:13:01 2017 +0200 Committer: Harbs <[email protected]> Committed: Mon Jan 30 15:13:01 2017 +0200 ---------------------------------------------------------------------- .../org/apache/flex/effects/CompoundEffect.as | 210 +++++++++++++++++++ .../org/apache/flex/effects/ICompoundEffect.as | 117 +++++++++++ .../flex/org/apache/flex/effects/Parallel.as | 153 +++----------- .../flex/effects/beads/ParallelPlayBead.as | 71 +++++++ .../src/main/resources/basic-manifest.xml | 3 +- 5 files changed, 429 insertions(+), 125 deletions(-) ----------------------------------------------------------------------
