Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 307d63f
Author: Luigi Rosso <[email protected]>
Date:   Mon Jul 8 21:20:38 2019 -0700

    Squashed commit of the following:

    commit 6f6000f
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Jul 8 21:19:43 2019 -0700

        Squashed commit of the following:

        commit f24a688
        Author: Luigi Rosso <[email protected]>
        Date:   Mon Jul 8 21:18:32 2019 -0700

            Squashed commit of the following:

            commit 085a15c
            Author: Luigi Rosso <[email protected]>
            Date:   Mon Jul 8 21:17:28 2019 -0700

                Squashed commit of the following:

                commit 56cea07
                Author: Luigi Rosso <[email protected]>
                Date:   Mon Jul 8 21:15:07 2019 -0700

                    Updating stable to latest flare_flutter from dev.

                commit 28846c5
                Merge: e1a55f9 52d5e6e
                Author: Luigi Rosso <[email protected]>
                Date:   Sat Jul 6 11:06:01 2019 -0700

                    Merge pull request #121 from 2d-inc/master

                    Merging intrinsic_size_experiment changes

                commit e1a55f9
                Merge: 5533e73 15682ac
                Author: Luigi Rosso <[email protected]>
                Date:   Sat Jul 6 10:28:42 2019 -0700

                    Merge pull request #119 from 2d-inc/master

                    Check for null children before iterating for initialization.

                commit 5533e73
                Merge: 01387cd a17469b
                Author: Luigi Rosso <[email protected]>
                Date:   Wed Jul 3 10:40:12 2019 -0700

                    Merge pull request #116 from 2d-inc/master

                    Remove console spam.

                commit 01387cd
                Merge: 0ee2efe 525613e
                Author: Luigi Rosso <[email protected]>
                Date:   Tue Jul 2 18:13:31 2019 -0700

                    Merge pull request #115 from 2d-inc/master

                    Instance shape node from actor.

                commit 0ee2efe
                Merge: 8f04aa6 0230aab
                Author: Luigi Rosso <[email protected]>
                Date:   Thu Jun 20 16:27:00 2019 -0700

                    Merge pull request #108 from 2d-inc/master

                    Fixing rectangle and clips.

                commit 8f04aa6
                Merge: 6606b73 865e090
                Author: Luigi Rosso <[email protected]>
                Date:   Thu Jun 13 16:07:43 2019 -0700

                    Merge pull request #102 from 2d-inc/master

                    Updating dev branch.

                commit 6606b73
                Merge: 396cd88 f147157
                Author: Luigi Rosso <[email protected]>
                Date:   Tue Jun 4 11:59:29 2019 -0700

                    Merge branch 'master' into dev

                commit 396cd88
                Merge: 006d85b 9db2d97
                Author: Luigi Rosso <[email protected]>
                Date:   Mon May 20 10:56:46 2019 -0700

                    Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

                commit 006d85b
                Merge: c51192d 850ea83
                Author: Luigi Rosso <[email protected]>
                Date:   Mon May 20 10:45:58 2019 -0700

                    Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

                commit c51192d
                Merge: 4aebb0f 4e9961b
                Author: Luigi Rosso <[email protected]>
                Date:   Thu May 9 11:44:40 2019 -0700

                    Merge pull request #89 from 2d-inc/master

                    Update indices to 16 bit unsigned, compatibility with flutter master.

                commit 4aebb0f
                Merge: 113d791 63c1d05
                Author: Luigi Rosso <[email protected]>
                Date:   Fri Apr 26 13:42:11 2019 -0700

                    Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

                commit 113d791
                Merge: 2ec15af 4416a67
                Author: Luigi Rosso <[email protected]>
                Date:   Fri Apr 26 12:33:04 2019 -0700

                    Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

                commit 2ec15af
                Merge: d8defc4 2dbb7ab
                Author: Luigi Rosso <[email protected]>
                Date:   Wed Apr 24 12:07:45 2019 -0700

                    Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

                commit d8defc4
                Author: Luigi Rosso <[email protected]>
                Date:   Wed Apr 24 10:15:51 2019 -0700

                    Fixing relative path for flare_dart.

                commit 2e1fcaa
                Author: Luigi Rosso <[email protected]>
                Date:   Wed Apr 24 10:14:38 2019 -0700

                    Updating flare_dart dependency to dev branch of Flare-Flutter.

        commit 28846c5
        Merge: e1a55f9 52d5e6e
        Author: Luigi Rosso <[email protected]>
        Date:   Sat Jul 6 11:06:01 2019 -0700

            Merge pull request #121 from 2d-inc/master

            Merging intrinsic_size_experiment changes

        commit e1a55f9
        Merge: 5533e73 15682ac
        Author: Luigi Rosso <[email protected]>
        Date:   Sat Jul 6 10:28:42 2019 -0700

            Merge pull request #119 from 2d-inc/master

            Check for null children before iterating for initialization.

        commit 5533e73
        Merge: 01387cd a17469b
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Jul 3 10:40:12 2019 -0700

            Merge pull request #116 from 2d-inc/master

            Remove console spam.

        commit 01387cd
        Merge: 0ee2efe 525613e
        Author: Luigi Rosso <[email protected]>
        Date:   Tue Jul 2 18:13:31 2019 -0700

            Merge pull request #115 from 2d-inc/master

            Instance shape node from actor.

        commit 0ee2efe
        Merge: 8f04aa6 0230aab
        Author: Luigi Rosso <[email protected]>
        Date:   Thu Jun 20 16:27:00 2019 -0700

            Merge pull request #108 from 2d-inc/master

            Fixing rectangle and clips.

        commit 8f04aa6
        Merge: 6606b73 865e090
        Author: Luigi Rosso <[email protected]>
        Date:   Thu Jun 13 16:07:43 2019 -0700

            Merge pull request #102 from 2d-inc/master

            Updating dev branch.

        commit 6606b73
        Merge: 396cd88 f147157
        Author: Luigi Rosso <[email protected]>
        Date:   Tue Jun 4 11:59:29 2019 -0700

            Merge branch 'master' into dev

        commit 396cd88
        Merge: 006d85b 9db2d97
        Author: Luigi Rosso <[email protected]>
        Date:   Mon May 20 10:56:46 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 006d85b
        Merge: c51192d 850ea83
        Author: Luigi Rosso <[email protected]>
        Date:   Mon May 20 10:45:58 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit c51192d
        Merge: 4aebb0f 4e9961b
        Author: Luigi Rosso <[email protected]>
        Date:   Thu May 9 11:44:40 2019 -0700

            Merge pull request #89 from 2d-inc/master

            Update indices to 16 bit unsigned, compatibility with flutter master.

        commit 4aebb0f
        Merge: 113d791 63c1d05
        Author: Luigi Rosso <[email protected]>
        Date:   Fri Apr 26 13:42:11 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 113d791
        Merge: 2ec15af 4416a67
        Author: Luigi Rosso <[email protected]>
        Date:   Fri Apr 26 12:33:04 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 2ec15af
        Merge: d8defc4 2dbb7ab
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 12:07:45 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit d8defc4
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 10:15:51 2019 -0700

            Fixing relative path for flare_dart.

        commit 2e1fcaa
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 10:14:38 2019 -0700

            Updating flare_dart dependency to dev branch of Flare-Flutter.

    commit 085a15c
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Jul 8 21:17:28 2019 -0700

        Squashed commit of the following:

        commit 56cea07
        Author: Luigi Rosso <[email protected]>
        Date:   Mon Jul 8 21:15:07 2019 -0700

            Updating stable to latest flare_flutter from dev.

        commit 28846c5
        Merge: e1a55f9 52d5e6e
        Author: Luigi Rosso <[email protected]>
        Date:   Sat Jul 6 11:06:01 2019 -0700

            Merge pull request #121 from 2d-inc/master

            Merging intrinsic_size_experiment changes

        commit e1a55f9
        Merge: 5533e73 15682ac
        Author: Luigi Rosso <[email protected]>
        Date:   Sat Jul 6 10:28:42 2019 -0700

            Merge pull request #119 from 2d-inc/master

            Check for null children before iterating for initialization.

        commit 5533e73
        Merge: 01387cd a17469b
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Jul 3 10:40:12 2019 -0700

            Merge pull request #116 from 2d-inc/master

            Remove console spam.

        commit 01387cd
        Merge: 0ee2efe 525613e
        Author: Luigi Rosso <[email protected]>
        Date:   Tue Jul 2 18:13:31 2019 -0700

            Merge pull request #115 from 2d-inc/master

            Instance shape node from actor.

        commit 0ee2efe
        Merge: 8f04aa6 0230aab
        Author: Luigi Rosso <[email protected]>
        Date:   Thu Jun 20 16:27:00 2019 -0700

            Merge pull request #108 from 2d-inc/master

            Fixing rectangle and clips.

        commit 8f04aa6
        Merge: 6606b73 865e090
        Author: Luigi Rosso <[email protected]>
        Date:   Thu Jun 13 16:07:43 2019 -0700

            Merge pull request #102 from 2d-inc/master

            Updating dev branch.

        commit 6606b73
        Merge: 396cd88 f147157
        Author: Luigi Rosso <[email protected]>
        Date:   Tue Jun 4 11:59:29 2019 -0700

            Merge branch 'master' into dev

        commit 396cd88
        Merge: 006d85b 9db2d97
        Author: Luigi Rosso <[email protected]>
        Date:   Mon May 20 10:56:46 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 006d85b
        Merge: c51192d 850ea83
        Author: Luigi Rosso <[email protected]>
        Date:   Mon May 20 10:45:58 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit c51192d
        Merge: 4aebb0f 4e9961b
        Author: Luigi Rosso <[email protected]>
        Date:   Thu May 9 11:44:40 2019 -0700

            Merge pull request #89 from 2d-inc/master

            Update indices to 16 bit unsigned, compatibility with flutter master.

        commit 4aebb0f
        Merge: 113d791 63c1d05
        Author: Luigi Rosso <[email protected]>
        Date:   Fri Apr 26 13:42:11 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 113d791
        Merge: 2ec15af 4416a67
        Author: Luigi Rosso <[email protected]>
        Date:   Fri Apr 26 12:33:04 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 2ec15af
        Merge: d8defc4 2dbb7ab
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 12:07:45 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit d8defc4
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 10:15:51 2019 -0700

            Fixing relative path for flare_dart.

        commit 2e1fcaa
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 10:14:38 2019 -0700

            Updating flare_dart dependency to dev branch of Flare-Flutter.

commit f24a688
Author: Luigi Rosso <[email protected]>
Date:   Mon Jul 8 21:18:32 2019 -0700

    Squashed commit of the following:

    commit 085a15c
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Jul 8 21:17:28 2019 -0700

        Squashed commit of the following:

        commit 56cea07
        Author: Luigi Rosso <[email protected]>
        Date:   Mon Jul 8 21:15:07 2019 -0700

            Updating stable to latest flare_flutter from dev.

        commit 28846c5
        Merge: e1a55f9 52d5e6e
        Author: Luigi Rosso <[email protected]>
        Date:   Sat Jul 6 11:06:01 2019 -0700

            Merge pull request #121 from 2d-inc/master

            Merging intrinsic_size_experiment changes

        commit e1a55f9
        Merge: 5533e73 15682ac
        Author: Luigi Rosso <[email protected]>
        Date:   Sat Jul 6 10:28:42 2019 -0700

            Merge pull request #119 from 2d-inc/master

            Check for null children before iterating for initialization.

        commit 5533e73
        Merge: 01387cd a17469b
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Jul 3 10:40:12 2019 -0700

            Merge pull request #116 from 2d-inc/master

            Remove console spam.

        commit 01387cd
        Merge: 0ee2efe 525613e
        Author: Luigi Rosso <[email protected]>
        Date:   Tue Jul 2 18:13:31 2019 -0700

            Merge pull request #115 from 2d-inc/master

            Instance shape node from actor.

        commit 0ee2efe
        Merge: 8f04aa6 0230aab
        Author: Luigi Rosso <[email protected]>
        Date:   Thu Jun 20 16:27:00 2019 -0700

            Merge pull request #108 from 2d-inc/master

            Fixing rectangle and clips.

        commit 8f04aa6
        Merge: 6606b73 865e090
        Author: Luigi Rosso <[email protected]>
        Date:   Thu Jun 13 16:07:43 2019 -0700

            Merge pull request #102 from 2d-inc/master

            Updating dev branch.

        commit 6606b73
        Merge: 396cd88 f147157
        Author: Luigi Rosso <[email protected]>
        Date:   Tue Jun 4 11:59:29 2019 -0700

            Merge branch 'master' into dev

        commit 396cd88
        Merge: 006d85b 9db2d97
        Author: Luigi Rosso <[email protected]>
        Date:   Mon May 20 10:56:46 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 006d85b
        Merge: c51192d 850ea83
        Author: Luigi Rosso <[email protected]>
        Date:   Mon May 20 10:45:58 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit c51192d
        Merge: 4aebb0f 4e9961b
        Author: Luigi Rosso <[email protected]>
        Date:   Thu May 9 11:44:40 2019 -0700

            Merge pull request #89 from 2d-inc/master

            Update indices to 16 bit unsigned, compatibility with flutter master.

        commit 4aebb0f
        Merge: 113d791 63c1d05
        Author: Luigi Rosso <[email protected]>
        Date:   Fri Apr 26 13:42:11 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 113d791
        Merge: 2ec15af 4416a67
        Author: Luigi Rosso <[email protected]>
        Date:   Fri Apr 26 12:33:04 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit 2ec15af
        Merge: d8defc4 2dbb7ab
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 12:07:45 2019 -0700

            Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

        commit d8defc4
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 10:15:51 2019 -0700

            Fixing relative path for flare_dart.

        commit 2e1fcaa
        Author: Luigi Rosso <[email protected]>
        Date:   Wed Apr 24 10:14:38 2019 -0700

            Updating flare_dart dependency to dev branch of Flare-Flutter.
  • Loading branch information
luigi-rosso committed Jul 16, 2019
1 parent 56cea07 commit 629866a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions flare_dart/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
## [1.4.3] - 2019-07-06 11:08:53

Some cleanup done while fixing issue #104 (using intrinsic artboard size as an option).
Some cleanup done while fixing issue #104 (using intrinsic artboard size as an option).

## [1.4.2] - 2019-06-20 16:30:37
## [1.4.2] - 2019-06-20 16:30:37

Fixing issue with rounded rectangles not rendering correctly #107
Fixing issue with rounded rectangles not rendering correctly #107
Shapes that are collapsed are not when building up the clip path..

## [1.4.1] - 2019-05-20 10:40:04
Expand Down
2 changes: 1 addition & 1 deletion flare_flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- Fixing an intialization error when a node has null children.
- FlareActor widget can now size itself via the sizeFromArtboard named parameter, based on feedback from issue #104.

## [1.5.2] - 2019-06-20 16:33:52
## [1.5.2] - 2019-06-20 16:33:52

Using latest version of flare_dart which has fixes for rounded rectangles and clipping paths.

Expand Down

0 comments on commit 629866a

Please sign in to comment.