Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 212cdf23eacb6ee06966b9214ecc8acc60dad249
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 18:29:35 2023 +0100

    Player settings le retour

commit 5d30ca00d9809bcf565be1c48e82bbabe3d944b1
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 18:27:30 2023 +0100

    Player settings unity

commit bacfb62c227e89c9b4d31198e8c398111c1790ec
Merge: 986f380 91afb58
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 17:44:01 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit 986f380a0f17cf43e8f3bd8eec5d82125f229f99
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 17:43:46 2023 +0100

    Fading introduction

commit ea432a631f9bf4ab44ad3ddea6a3263e785803f8
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 17:31:55 2023 +0100

    Bug fixed

commit 91afb5876448036f297899d8d1fea18cca4c5e85
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Thu Dec 7 17:31:29 2023 +0100

    Fix Last Bug

commit 3c9715b67ac215950eb15421ef07c485377d1ba7
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 15:52:41 2023 +0100

    Squashed commit of the following:

    commit 8df7cbbec0af6b1266b22d4b94d31073d2bcafe8
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 15:52:23 2023 +0100

        Merging Emmanuel into Ilan

    commit 4f277f1b5dff0a8d25220b21dbf6bebb2a869f29
    Merge: ec38821 8f20a1d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 15:46:43 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit ec38821e653547db06a0fee21f59edf1d16efec6
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 15:42:35 2023 +0100

        Noot noot introduction

    commit 3ddc713af5a46d34e75aa22455e1b1dff9ed1d95
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 14:54:27 2023 +0100

        Menu states presence

    commit aa301089e15b0a04d63781f2c7f1a2b76bdf9fe4
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 13:46:46 2023 +0100

        Transition cochon

    commit fb560ec42f97858e68526048162e0d1c0e4378ab
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 11:48:24 2023 +0100

        3 Hearts

    commit 7de6b1c57e8f2d5c740c5bfefb190b52841a9caa
    Merge: 7236d72 fe95eea
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 11:46:35 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 7236d72be523e2086b8c1488acfb55074a58fa0a
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 11:38:31 2023 +0100

        Indicateur

    commit 866a5027b935f5df6d928674534e46c40d56fb7d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:40:28 2023 +0100

        Commit

    commit d778a33ee2f5cc59f7c2eca3a825e9d13ac986f2
    Merge: 9583b37 02a77ba
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:14:40 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 9583b377e28014930f1a481dd059291a62223ce8
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:04:36 2023 +0100

        Opacity flocons

    commit 7954ecbd67cecf9dda518efee7c0354fe0b3b9b9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 09:56:18 2023 +0100

        UI starting game

    commit c111e16618d05277c21afdd39247bfd2e47baeb9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 09:07:21 2023 +0100

        menu selection

    commit 9c916ba6e47521596e67c93232280499de45ba08
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 13:34:39 2023 +0100

        integration ui

    commit 922acf46209d4bb3c32013d5f02c4ff80c0b3572
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 11:09:45 2023 +0100

        Merge Emmanuel into Ilan

    commit fa3207be4a2984f7b0b44699ef1e9a8164580b83
    Merge: b5ee5f4 cbead29
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:59:46 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit b5ee5f4deb1f47b71e80937a47c4345ba7710467
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:58:14 2023 +0100

        Integration

    commit f05d51472aa20ba65154a3013f039f289d6ee4fe
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:38:48 2023 +0100

        obstacles added and background

    commit 5b3b947638ecb729cac4f1bc8bb42d7b721876ac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:01:20 2023 +0100

        Squashed commit of the following:

        commit fe3b5fcaad1ac6fff5bcd3b9a97c768189ad39e7
        Merge: adeafa6 933d42a
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Wed Dec 6 08:45:49 2023 +0100

            Merge branch 'Ilan' into Emmanuel

        commit adeafa6bfb8065a5e40263bc5718aabd84eb7be3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:41:25 2023 +0100

            Fix array of don't destroy on load

        commit 88528eec0cae7140e396bba6ec121c209ed015c5
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:37:27 2023 +0100

            Change Object for don't destroyonload

        commit fb537aa24ed585365503405c372b6635e8bd6ed7
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:35:41 2023 +0100

            Create temporary prefab

        commit 1f43ae5b787991b7fc9ea955a4a94f63b622f3af
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 22:06:52 2023 +0100

            Add HeartSystem

        commit f0dcede49ca212e02b532b04221226e775c52db3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 21:09:33 2023 +0100

            Make Transition between Game scene and GameOver Scene

        commit 6e0d20057fc86b7b02910fcaafaae960635cce70
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:33:30 2023 +0100

            Squashed commit of the following:

            commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:32:57 2023 +0100

                Merging Emmanuel into Ilan

            commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
            Merge: 0f89400 1a856ab
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 0f89400afd8a33ecf4648945ad17908136eb60f4
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:30:18 2023 +0100

                Assets import

            commit 148483c043d6293756452cfc55ab628d2041bbc9
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:36:37 2023 +0100

                Merging Emmanuel into Ilan

            commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
            Merge: 83c53e0 d3d2a67
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:25:27 2023 +0100

                remove socket in game

            commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:24:54 2023 +0100

                ui in game

            commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 13:16:09 2023 +0100

                Integration penguin et background

            commit 959a8a028032d86f5eab3fce762dc429b716945d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:37:26 2023 +0100

                merging Emmanuel into Ilan

            commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
            Merge: 017f035 609c980
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:24:19 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 017f035681850ce7d311a2a17157cc088a7cf82d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:21:22 2023 +0100

                Level manager

            commit 21fc848510fa271102798c2259b2a7f1e379d364
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 14:02:08 2023 +0100

                Merge Emmanuel to Ilan

            commit 2de1c56726516851fca86e438b7b499f0bc92e35
            Merge: 87f560e 78e7ae2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:52:04 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 87f560e33f0a040709f30223c87cd377d8beedb2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:36:18 2023 +0100

                commit

            commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 10:53:40 2023 +0100

                level manager states system

            commit a6f84061c8db544d15d427834f218bf15f9b2322
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:59 2023 +0100

                Merge Emmanuel

            commit 9e6203406629ceef0938dc730f7df5ae4d756438
            Merge: d85593d 373e765
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:43 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit d85593d939e8e5edd6fdfef894b8d1936e791acc
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:45:59 2023 +0100

                layers prefab

            commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
            Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
            Date:   Wed Nov 29 21:43:42 2023 +0100

                Update .gitignore

commit 8df7cbbec0af6b1266b22d4b94d31073d2bcafe8
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 15:52:23 2023 +0100

    Merging Emmanuel into Ilan

commit 4f277f1b5dff0a8d25220b21dbf6bebb2a869f29
Merge: ec38821 8f20a1d
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 15:46:43 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit ec38821e653547db06a0fee21f59edf1d16efec6
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 15:42:35 2023 +0100

    Noot noot introduction

commit 3ddc713af5a46d34e75aa22455e1b1dff9ed1d95
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 14:54:27 2023 +0100

    Menu states presence

commit 8f20a1dcbc71e0f51722af0ebce25fcf70975c34
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Thu Dec 7 14:10:58 2023 +0100

    Animation End Data

commit aa301089e15b0a04d63781f2c7f1a2b76bdf9fe4
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 13:46:46 2023 +0100

    Transition cochon

commit c6f7b0bdd12b81dde768b6929071c4158acf46d4
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Thu Dec 7 12:00:39 2023 +0100

    Fix bug GameOver Scene

commit 5bd11540e7b74bca6ed87febfa09f6d3efd4b77d
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 11:48:45 2023 +0100

    Squashed commit of the following:

    commit fb560ec42f97858e68526048162e0d1c0e4378ab
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 11:48:24 2023 +0100

        3 Hearts

    commit 7de6b1c57e8f2d5c740c5bfefb190b52841a9caa
    Merge: 7236d72 fe95eea
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 11:46:35 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 7236d72be523e2086b8c1488acfb55074a58fa0a
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 11:38:31 2023 +0100

        Indicateur

    commit 866a5027b935f5df6d928674534e46c40d56fb7d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:40:28 2023 +0100

        Commit

    commit d778a33ee2f5cc59f7c2eca3a825e9d13ac986f2
    Merge: 9583b37 02a77ba
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:14:40 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 9583b377e28014930f1a481dd059291a62223ce8
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:04:36 2023 +0100

        Opacity flocons

    commit 7954ecbd67cecf9dda518efee7c0354fe0b3b9b9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 09:56:18 2023 +0100

        UI starting game

    commit c111e16618d05277c21afdd39247bfd2e47baeb9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 09:07:21 2023 +0100

        menu selection

    commit 9c916ba6e47521596e67c93232280499de45ba08
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 13:34:39 2023 +0100

        integration ui

    commit 922acf46209d4bb3c32013d5f02c4ff80c0b3572
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 11:09:45 2023 +0100

        Merge Emmanuel into Ilan

    commit fa3207be4a2984f7b0b44699ef1e9a8164580b83
    Merge: b5ee5f4 cbead29
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:59:46 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit b5ee5f4deb1f47b71e80937a47c4345ba7710467
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:58:14 2023 +0100

        Integration

    commit f05d51472aa20ba65154a3013f039f289d6ee4fe
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:38:48 2023 +0100

        obstacles added and background

    commit 5b3b947638ecb729cac4f1bc8bb42d7b721876ac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:01:20 2023 +0100

        Squashed commit of the following:

        commit fe3b5fcaad1ac6fff5bcd3b9a97c768189ad39e7
        Merge: adeafa6 933d42a
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Wed Dec 6 08:45:49 2023 +0100

            Merge branch 'Ilan' into Emmanuel

        commit adeafa6bfb8065a5e40263bc5718aabd84eb7be3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:41:25 2023 +0100

            Fix array of don't destroy on load

        commit 88528eec0cae7140e396bba6ec121c209ed015c5
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:37:27 2023 +0100

            Change Object for don't destroyonload

        commit fb537aa24ed585365503405c372b6635e8bd6ed7
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:35:41 2023 +0100

            Create temporary prefab

        commit 1f43ae5b787991b7fc9ea955a4a94f63b622f3af
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 22:06:52 2023 +0100

            Add HeartSystem

        commit f0dcede49ca212e02b532b04221226e775c52db3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 21:09:33 2023 +0100

            Make Transition between Game scene and GameOver Scene

        commit 6e0d20057fc86b7b02910fcaafaae960635cce70
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:33:30 2023 +0100

            Squashed commit of the following:

            commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:32:57 2023 +0100

                Merging Emmanuel into Ilan

            commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
            Merge: 0f89400 1a856ab
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 0f89400afd8a33ecf4648945ad17908136eb60f4
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:30:18 2023 +0100

                Assets import

            commit 148483c043d6293756452cfc55ab628d2041bbc9
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:36:37 2023 +0100

                Merging Emmanuel into Ilan

            commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
            Merge: 83c53e0 d3d2a67
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:25:27 2023 +0100

                remove socket in game

            commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:24:54 2023 +0100

                ui in game

            commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 13:16:09 2023 +0100

                Integration penguin et background

            commit 959a8a028032d86f5eab3fce762dc429b716945d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:37:26 2023 +0100

                merging Emmanuel into Ilan

            commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
            Merge: 017f035 609c980
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:24:19 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 017f035681850ce7d311a2a17157cc088a7cf82d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:21:22 2023 +0100

                Level manager

            commit 21fc848510fa271102798c2259b2a7f1e379d364
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 14:02:08 2023 +0100

                Merge Emmanuel to Ilan

            commit 2de1c56726516851fca86e438b7b499f0bc92e35
            Merge: 87f560e 78e7ae2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:52:04 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 87f560e33f0a040709f30223c87cd377d8beedb2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:36:18 2023 +0100

                commit

            commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 10:53:40 2023 +0100

                level manager states system

            commit a6f84061c8db544d15d427834f218bf15f9b2322
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:59 2023 +0100

                Merge Emmanuel

            commit 9e6203406629ceef0938dc730f7df5ae4d756438
            Merge: d85593d 373e765
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:43 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit d85593d939e8e5edd6fdfef894b8d1936e791acc
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:45:59 2023 +0100

                layers prefab

            commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
            Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
            Date:   Wed Nov 29 21:43:42 2023 +0100

                Update .gitignore

commit fb560ec42f97858e68526048162e0d1c0e4378ab
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 11:48:24 2023 +0100

    3 Hearts

commit 7de6b1c57e8f2d5c740c5bfefb190b52841a9caa
Merge: 7236d72 fe95eea
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 11:46:35 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit fe95eeaf4ea86f8b21d83dae1ca41f81931eb7b5
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Thu Dec 7 11:45:00 2023 +0100

    new Stat Scene

commit 7236d72be523e2086b8c1488acfb55074a58fa0a
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 11:38:31 2023 +0100

    Indicateur

commit c6e708915f354b7637e30cc3adb8b6dc77dcad32
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 10:42:30 2023 +0100

    Squashed commit of the following:

    commit 866a5027b935f5df6d928674534e46c40d56fb7d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:40:28 2023 +0100

        Commit

    commit d778a33ee2f5cc59f7c2eca3a825e9d13ac986f2
    Merge: 9583b37 02a77ba
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:14:40 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 9583b377e28014930f1a481dd059291a62223ce8
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 10:04:36 2023 +0100

        Opacity flocons

    commit 7954ecbd67cecf9dda518efee7c0354fe0b3b9b9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 09:56:18 2023 +0100

        UI starting game

    commit c111e16618d05277c21afdd39247bfd2e47baeb9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Thu Dec 7 09:07:21 2023 +0100

        menu selection

    commit 9c916ba6e47521596e67c93232280499de45ba08
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 13:34:39 2023 +0100

        integration ui

    commit 922acf46209d4bb3c32013d5f02c4ff80c0b3572
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 11:09:45 2023 +0100

        Merge Emmanuel into Ilan

    commit fa3207be4a2984f7b0b44699ef1e9a8164580b83
    Merge: b5ee5f4 cbead29
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:59:46 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit b5ee5f4deb1f47b71e80937a47c4345ba7710467
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:58:14 2023 +0100

        Integration

    commit f05d51472aa20ba65154a3013f039f289d6ee4fe
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:38:48 2023 +0100

        obstacles added and background

    commit 5b3b947638ecb729cac4f1bc8bb42d7b721876ac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:01:20 2023 +0100

        Squashed commit of the following:

        commit fe3b5fcaad1ac6fff5bcd3b9a97c768189ad39e7
        Merge: adeafa6 933d42a
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Wed Dec 6 08:45:49 2023 +0100

            Merge branch 'Ilan' into Emmanuel

        commit adeafa6bfb8065a5e40263bc5718aabd84eb7be3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:41:25 2023 +0100

            Fix array of don't destroy on load

        commit 88528eec0cae7140e396bba6ec121c209ed015c5
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:37:27 2023 +0100

            Change Object for don't destroyonload

        commit fb537aa24ed585365503405c372b6635e8bd6ed7
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:35:41 2023 +0100

            Create temporary prefab

        commit 1f43ae5b787991b7fc9ea955a4a94f63b622f3af
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 22:06:52 2023 +0100

            Add HeartSystem

        commit f0dcede49ca212e02b532b04221226e775c52db3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 21:09:33 2023 +0100

            Make Transition between Game scene and GameOver Scene

        commit 6e0d20057fc86b7b02910fcaafaae960635cce70
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:33:30 2023 +0100

            Squashed commit of the following:

            commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:32:57 2023 +0100

                Merging Emmanuel into Ilan

            commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
            Merge: 0f89400 1a856ab
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 0f89400afd8a33ecf4648945ad17908136eb60f4
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:30:18 2023 +0100

                Assets import

            commit 148483c043d6293756452cfc55ab628d2041bbc9
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:36:37 2023 +0100

                Merging Emmanuel into Ilan

            commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
            Merge: 83c53e0 d3d2a67
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:25:27 2023 +0100

                remove socket in game

            commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:24:54 2023 +0100

                ui in game

            commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 13:16:09 2023 +0100

                Integration penguin et background

            commit 959a8a028032d86f5eab3fce762dc429b716945d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:37:26 2023 +0100

                merging Emmanuel into Ilan

            commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
            Merge: 017f035 609c980
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:24:19 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 017f035681850ce7d311a2a17157cc088a7cf82d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:21:22 2023 +0100

                Level manager

            commit 21fc848510fa271102798c2259b2a7f1e379d364
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 14:02:08 2023 +0100

                Merge Emmanuel to Ilan

            commit 2de1c56726516851fca86e438b7b499f0bc92e35
            Merge: 87f560e 78e7ae2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:52:04 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 87f560e33f0a040709f30223c87cd377d8beedb2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:36:18 2023 +0100

                commit

            commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 10:53:40 2023 +0100

                level manager states system

            commit a6f84061c8db544d15d427834f218bf15f9b2322
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:59 2023 +0100

                Merge Emmanuel

            commit 9e6203406629ceef0938dc730f7df5ae4d756438
            Merge: d85593d 373e765
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:43 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit d85593d939e8e5edd6fdfef894b8d1936e791acc
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:45:59 2023 +0100

                layers prefab

            commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
            Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
            Date:   Wed Nov 29 21:43:42 2023 +0100

                Update .gitignore

commit 866a5027b935f5df6d928674534e46c40d56fb7d
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 10:40:28 2023 +0100

    Commit

commit d778a33ee2f5cc59f7c2eca3a825e9d13ac986f2
Merge: 9583b37 02a77ba
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 10:14:40 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit 02a77ba4e6ab3bf10d0028dad966485c5a8ec744
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Thu Dec 7 10:12:48 2023 +0100

    Add Stat Animation and Obstacle counter

commit 9583b377e28014930f1a481dd059291a62223ce8
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 10:04:36 2023 +0100

    Opacity flocons

commit 7954ecbd67cecf9dda518efee7c0354fe0b3b9b9
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 09:56:18 2023 +0100

    UI starting game

commit c111e16618d05277c21afdd39247bfd2e47baeb9
Author: Nay <ilan.outyey@gmail.com>
Date:   Thu Dec 7 09:07:21 2023 +0100

    menu selection

commit 9c916ba6e47521596e67c93232280499de45ba08
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 13:34:39 2023 +0100

    integration ui

commit 48eea59dbb46724d64e0ae38a893e1f76b7335c2
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 11:09:56 2023 +0100

    Squashed commit of the following:

    commit 922acf46209d4bb3c32013d5f02c4ff80c0b3572
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 11:09:45 2023 +0100

        Merge Emmanuel into Ilan

    commit fa3207be4a2984f7b0b44699ef1e9a8164580b83
    Merge: b5ee5f4 cbead29
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:59:46 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit b5ee5f4deb1f47b71e80937a47c4345ba7710467
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 10:58:14 2023 +0100

        Integration

    commit f05d51472aa20ba65154a3013f039f289d6ee4fe
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:38:48 2023 +0100

        obstacles added and background

    commit 5b3b947638ecb729cac4f1bc8bb42d7b721876ac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 09:01:20 2023 +0100

        Squashed commit of the following:

        commit fe3b5fcaad1ac6fff5bcd3b9a97c768189ad39e7
        Merge: adeafa6 933d42a
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Wed Dec 6 08:45:49 2023 +0100

            Merge branch 'Ilan' into Emmanuel

        commit adeafa6bfb8065a5e40263bc5718aabd84eb7be3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:41:25 2023 +0100

            Fix array of don't destroy on load

        commit 88528eec0cae7140e396bba6ec121c209ed015c5
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:37:27 2023 +0100

            Change Object for don't destroyonload

        commit fb537aa24ed585365503405c372b6635e8bd6ed7
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Dec 6 08:35:41 2023 +0100

            Create temporary prefab

        commit 1f43ae5b787991b7fc9ea955a4a94f63b622f3af
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 22:06:52 2023 +0100

            Add HeartSystem

        commit f0dcede49ca212e02b532b04221226e775c52db3
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Tue Dec 5 21:09:33 2023 +0100

            Make Transition between Game scene and GameOver Scene

        commit 6e0d20057fc86b7b02910fcaafaae960635cce70
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:33:30 2023 +0100

            Squashed commit of the following:

            commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:32:57 2023 +0100

                Merging Emmanuel into Ilan

            commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
            Merge: 0f89400 1a856ab
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 0f89400afd8a33ecf4648945ad17908136eb60f4
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 15:30:18 2023 +0100

                Assets import

            commit 148483c043d6293756452cfc55ab628d2041bbc9
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:36:37 2023 +0100

                Merging Emmanuel into Ilan

            commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
            Merge: 83c53e0 d3d2a67
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:31:52 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:25:27 2023 +0100

                remove socket in game

            commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 14:24:54 2023 +0100

                ui in game

            commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 13:16:09 2023 +0100

                Integration penguin et background

            commit 959a8a028032d86f5eab3fce762dc429b716945d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:37:26 2023 +0100

                merging Emmanuel into Ilan

            commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
            Merge: 017f035 609c980
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:24:19 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 017f035681850ce7d311a2a17157cc088a7cf82d
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Tue Dec 5 09:21:22 2023 +0100

                Level manager

            commit 21fc848510fa271102798c2259b2a7f1e379d364
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 14:02:08 2023 +0100

                Merge Emmanuel to Ilan

            commit 2de1c56726516851fca86e438b7b499f0bc92e35
            Merge: 87f560e 78e7ae2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:52:04 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit 87f560e33f0a040709f30223c87cd377d8beedb2
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 13:36:18 2023 +0100

                commit

            commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 10:53:40 2023 +0100

                level manager states system

            commit a6f84061c8db544d15d427834f218bf15f9b2322
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:59 2023 +0100

                Merge Emmanuel

            commit 9e6203406629ceef0938dc730f7df5ae4d756438
            Merge: d85593d 373e765
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:53:43 2023 +0100

                Merge branch 'Emmanuel' into Ilan

            commit d85593d939e8e5edd6fdfef894b8d1936e791acc
            Author: Nay <ilan.outyey@gmail.com>
            Date:   Mon Dec 4 08:45:59 2023 +0100

                layers prefab

            commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
            Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
            Date:   Wed Nov 29 21:43:42 2023 +0100

                Update .gitignore

commit 922acf46209d4bb3c32013d5f02c4ff80c0b3572
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 11:09:45 2023 +0100

    Merge Emmanuel into Ilan

commit fa3207be4a2984f7b0b44699ef1e9a8164580b83
Merge: b5ee5f4 cbead29
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 10:59:46 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit b5ee5f4deb1f47b71e80937a47c4345ba7710467
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 10:58:14 2023 +0100

    Integration

commit cbead29beb60b2279a334b5864b927996c0e2f38
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Dec 6 10:53:34 2023 +0100

    New Score System

commit f05d51472aa20ba65154a3013f039f289d6ee4fe
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 09:38:48 2023 +0100

    obstacles added and background

commit 5b3b947638ecb729cac4f1bc8bb42d7b721876ac
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 09:01:20 2023 +0100

    Squashed commit of the following:

    commit fe3b5fcaad1ac6fff5bcd3b9a97c768189ad39e7
    Merge: adeafa6 933d42a
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Wed Dec 6 08:45:49 2023 +0100

        Merge branch 'Ilan' into Emmanuel

    commit adeafa6bfb8065a5e40263bc5718aabd84eb7be3
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Dec 6 08:41:25 2023 +0100

        Fix array of don't destroy on load

    commit 88528eec0cae7140e396bba6ec121c209ed015c5
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Dec 6 08:37:27 2023 +0100

        Change Object for don't destroyonload

    commit fb537aa24ed585365503405c372b6635e8bd6ed7
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Dec 6 08:35:41 2023 +0100

        Create temporary prefab

    commit 1f43ae5b787991b7fc9ea955a4a94f63b622f3af
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Tue Dec 5 22:06:52 2023 +0100

        Add HeartSystem

    commit f0dcede49ca212e02b532b04221226e775c52db3
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Tue Dec 5 21:09:33 2023 +0100

        Make Transition between Game scene and GameOver Scene

    commit 6e0d20057fc86b7b02910fcaafaae960635cce70
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 15:33:30 2023 +0100

        Squashed commit of the following:

        commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:32:57 2023 +0100

            Merging Emmanuel into Ilan

        commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
        Merge: 0f89400 1a856ab
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:31:52 2023 +0100

            Merge branch 'Emmanuel' into Ilan

        commit 0f89400afd8a33ecf4648945ad17908136eb60f4
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 15:30:18 2023 +0100

            Assets import

        commit 148483c043d6293756452cfc55ab628d2041bbc9
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 14:36:37 2023 +0100

            Merging Emmanuel into Ilan

        commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
        Merge: 83c53e0 d3d2a67
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 14:31:52 2023 +0100

            Merge branch 'Emmanuel' into Ilan

        commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 14:25:27 2023 +0100

            remove socket in game

        commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 14:24:54 2023 +0100

            ui in game

        commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 13:16:09 2023 +0100

            Integration penguin et background

        commit 959a8a028032d86f5eab3fce762dc429b716945d
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 09:37:26 2023 +0100

            merging Emmanuel into Ilan

        commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
        Merge: 017f035 609c980
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 09:24:19 2023 +0100

            Merge branch 'Emmanuel' into Ilan

        commit 017f035681850ce7d311a2a17157cc088a7cf82d
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Tue Dec 5 09:21:22 2023 +0100

            Level manager

        commit 21fc848510fa271102798c2259b2a7f1e379d364
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 14:02:08 2023 +0100

            Merge Emmanuel to Ilan

        commit 2de1c56726516851fca86e438b7b499f0bc92e35
        Merge: 87f560e 78e7ae2
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 13:52:04 2023 +0100

            Merge branch 'Emmanuel' into Ilan

        commit 87f560e33f0a040709f30223c87cd377d8beedb2
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 13:36:18 2023 +0100

            commit

        commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 10:53:40 2023 +0100

            level manager states system

        commit a6f84061c8db544d15d427834f218bf15f9b2322
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 08:53:59 2023 +0100

            Merge Emmanuel

        commit 9e6203406629ceef0938dc730f7df5ae4d756438
        Merge: d85593d 373e765
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 08:53:43 2023 +0100

            Merge branch 'Emmanuel' into Ilan

        commit d85593d939e8e5edd6fdfef894b8d1936e791acc
        Author: Nay <ilan.outyey@gmail.com>
        Date:   Mon Dec 4 08:45:59 2023 +0100

            layers prefab

        commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
        Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
        Date:   Wed Nov 29 21:43:42 2023 +0100

            Update .gitignore

commit fe3b5fcaad1ac6fff5bcd3b9a97c768189ad39e7
Merge: adeafa6 933d42a
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 08:45:49 2023 +0100

    Merge branch 'Ilan' into Emmanuel

commit 933d42af01279a06cb42745a94ed6e0433d4ea64
Author: Nay <ilan.outyey@gmail.com>
Date:   Wed Dec 6 08:45:11 2023 +0100

    integration

commit adeafa6bfb8065a5e40263bc5718aabd84eb7be3
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Dec 6 08:41:25 2023 +0100

    Fix array of don't destroy on load

commit 88528eec0cae7140e396bba6ec121c209ed015c5
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Dec 6 08:37:27 2023 +0100

    Change Object for don't destroyonload

commit fb537aa24ed585365503405c372b6635e8bd6ed7
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Dec 6 08:35:41 2023 +0100

    Create temporary prefab

commit 1f43ae5b787991b7fc9ea955a4a94f63b622f3af
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Tue Dec 5 22:06:52 2023 +0100

    Add HeartSystem

commit f0dcede49ca212e02b532b04221226e775c52db3
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Tue Dec 5 21:09:33 2023 +0100

    Make Transition between Game scene and GameOver Scene

commit 6e0d20057fc86b7b02910fcaafaae960635cce70
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 15:33:30 2023 +0100

    Squashed commit of the following:

    commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 15:32:57 2023 +0100

        Merging Emmanuel into Ilan

    commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
    Merge: 0f89400 1a856ab
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 15:31:52 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 0f89400afd8a33ecf4648945ad17908136eb60f4
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 15:30:18 2023 +0100

        Assets import

    commit 148483c043d6293756452cfc55ab628d2041bbc9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:36:37 2023 +0100

        Merging Emmanuel into Ilan

    commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
    Merge: 83c53e0 d3d2a67
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:31:52 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:25:27 2023 +0100

        remove socket in game

    commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:24:54 2023 +0100

        ui in game

    commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 13:16:09 2023 +0100

        Integration penguin et background

    commit 959a8a028032d86f5eab3fce762dc429b716945d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:37:26 2023 +0100

        merging Emmanuel into Ilan

    commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
    Merge: 017f035 609c980
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:24:19 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 017f035681850ce7d311a2a17157cc088a7cf82d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:21:22 2023 +0100

        Level manager

    commit 21fc848510fa271102798c2259b2a7f1e379d364
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 14:02:08 2023 +0100

        Merge Emmanuel to Ilan

    commit 2de1c56726516851fca86e438b7b499f0bc92e35
    Merge: 87f560e 78e7ae2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:52:04 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 87f560e33f0a040709f30223c87cd377d8beedb2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:36:18 2023 +0100

        commit

    commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 10:53:40 2023 +0100

        level manager states system

    commit a6f84061c8db544d15d427834f218bf15f9b2322
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:59 2023 +0100

        Merge Emmanuel

    commit 9e6203406629ceef0938dc730f7df5ae4d756438
    Merge: d85593d 373e765
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:43 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit d85593d939e8e5edd6fdfef894b8d1936e791acc
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:45:59 2023 +0100

        layers prefab

    commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Nov 29 21:43:42 2023 +0100

        Update .gitignore

commit c7cd7d225322c0f1d3932803ba8b63469fbd8b13
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 15:32:57 2023 +0100

    Merging Emmanuel into Ilan

commit 6df044950ad79424d0454f7e5d41e5e2b7af2702
Merge: 0f89400 1a856ab
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 15:31:52 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit 0f89400afd8a33ecf4648945ad17908136eb60f4
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 15:30:18 2023 +0100

    Assets import

commit 1a856ab29b84e0a8b9dd283bff0020eaee59e818
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Tue Dec 5 15:22:50 2023 +0100

    Create DataStorage

commit c439e554643b243fc571d59338608251aa23f96b
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 14:37:38 2023 +0100

    Squashed commit of the following:

    commit 148483c043d6293756452cfc55ab628d2041bbc9
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:36:37 2023 +0100

        Merging Emmanuel into Ilan

    commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
    Merge: 83c53e0 d3d2a67
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:31:52 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:25:27 2023 +0100

        remove socket in game

    commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 14:24:54 2023 +0100

        ui in game

    commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 13:16:09 2023 +0100

        Integration penguin et background

    commit 959a8a028032d86f5eab3fce762dc429b716945d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:37:26 2023 +0100

        merging Emmanuel into Ilan

    commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
    Merge: 017f035 609c980
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:24:19 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 017f035681850ce7d311a2a17157cc088a7cf82d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:21:22 2023 +0100

        Level manager

    commit 21fc848510fa271102798c2259b2a7f1e379d364
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 14:02:08 2023 +0100

        Merge Emmanuel to Ilan

    commit 2de1c56726516851fca86e438b7b499f0bc92e35
    Merge: 87f560e 78e7ae2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:52:04 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 87f560e33f0a040709f30223c87cd377d8beedb2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:36:18 2023 +0100

        commit

    commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 10:53:40 2023 +0100

        level manager states system

    commit a6f84061c8db544d15d427834f218bf15f9b2322
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:59 2023 +0100

        Merge Emmanuel

    commit 9e6203406629ceef0938dc730f7df5ae4d756438
    Merge: d85593d 373e765
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:43 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit d85593d939e8e5edd6fdfef894b8d1936e791acc
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:45:59 2023 +0100

        layers prefab

    commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Nov 29 21:43:42 2023 +0100

        Update .gitignore

commit 148483c043d6293756452cfc55ab628d2041bbc9
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 14:36:37 2023 +0100

    Merging Emmanuel into Ilan

commit a142c5e8af0d3b1b1d9963258e7941725b68a4dd
Merge: 83c53e0 d3d2a67
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 14:31:52 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit d3d2a67480bca1d8f0c03f8e1ba90f21defabc8b
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Tue Dec 5 14:26:19 2023 +0100

    Add endData

commit 83c53e0f9f9d7b53232fe0dce2fd62f09259ad5e
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 14:25:27 2023 +0100

    remove socket in game

commit d6bfba4019bb8a656336e599c4d2405e5eadeb04
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 14:24:54 2023 +0100

    ui in game

commit 36e76dbec36f4ac9a86aea46da34b311fd3cd5b6
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 13:16:09 2023 +0100

    Integration penguin et background

commit 7f20ad3a5cb90a294b209b1d6c4319a78544d96e
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 09:38:35 2023 +0100

    Squashed commit of the following:

    commit 959a8a028032d86f5eab3fce762dc429b716945d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:37:26 2023 +0100

        merging Emmanuel into Ilan

    commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
    Merge: 017f035 609c980
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:24:19 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 017f035681850ce7d311a2a17157cc088a7cf82d
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Tue Dec 5 09:21:22 2023 +0100

        Level manager

    commit 21fc848510fa271102798c2259b2a7f1e379d364
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 14:02:08 2023 +0100

        Merge Emmanuel to Ilan

    commit 2de1c56726516851fca86e438b7b499f0bc92e35
    Merge: 87f560e 78e7ae2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:52:04 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 87f560e33f0a040709f30223c87cd377d8beedb2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:36:18 2023 +0100

        commit

    commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 10:53:40 2023 +0100

        level manager states system

    commit a6f84061c8db544d15d427834f218bf15f9b2322
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:59 2023 +0100

        Merge Emmanuel

    commit 9e6203406629ceef0938dc730f7df5ae4d756438
    Merge: d85593d 373e765
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:43 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit d85593d939e8e5edd6fdfef894b8d1936e791acc
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:45:59 2023 +0100

        layers prefab

    commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Nov 29 21:43:42 2023 +0100

        Update .gitignore

commit 959a8a028032d86f5eab3fce762dc429b716945d
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 09:37:26 2023 +0100

    merging Emmanuel into Ilan

commit 751b57ffc3badc3dc82c51c419c5d1a1439ebfe8
Merge: 017f035 609c980
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 09:24:19 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit 017f035681850ce7d311a2a17157cc088a7cf82d
Author: Nay <ilan.outyey@gmail.com>
Date:   Tue Dec 5 09:21:22 2023 +0100

    Level manager

commit 609c980fb31997fde431990662b0159f221bdee8
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Tue Dec 5 09:20:58 2023 +0100

    Add Player life

commit 272006a366a8d212aed7417bae5ab0df1b599dcd
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Mon Dec 4 15:17:44 2023 +0100

    Update GameOver Scene

commit d1501cc76fa0eb8f6b2a6f01d150929649db2282
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Mon Dec 4 14:49:18 2023 +0100

    Create GameOver Scene and keep scoreData

commit 654484e204b607183038807d0b9e4a5074602d56
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 14:02:25 2023 +0100

    Squashed commit of the following:

    commit 21fc848510fa271102798c2259b2a7f1e379d364
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 14:02:08 2023 +0100

        Merge Emmanuel to Ilan

    commit 2de1c56726516851fca86e438b7b499f0bc92e35
    Merge: 87f560e 78e7ae2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:52:04 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit 87f560e33f0a040709f30223c87cd377d8beedb2
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 13:36:18 2023 +0100

        commit

    commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 10:53:40 2023 +0100

        level manager states system

    commit a6f84061c8db544d15d427834f218bf15f9b2322
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:59 2023 +0100

        Merge Emmanuel

    commit 9e6203406629ceef0938dc730f7df5ae4d756438
    Merge: d85593d 373e765
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:43 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit d85593d939e8e5edd6fdfef894b8d1936e791acc
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:45:59 2023 +0100

        layers prefab

    commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Nov 29 21:43:42 2023 +0100

        Update .gitignore

commit 21fc848510fa271102798c2259b2a7f1e379d364
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 14:02:08 2023 +0100

    Merge Emmanuel to Ilan

commit 2de1c56726516851fca86e438b7b499f0bc92e35
Merge: 87f560e 78e7ae2
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 13:52:04 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit 87f560e33f0a040709f30223c87cd377d8beedb2
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 13:36:18 2023 +0100

    commit

commit 78e7ae2afdb3f8237f5dd3d0d33ec821198b43da
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Mon Dec 4 13:36:07 2023 +0100

    Create Don't destroy on load

commit d25428f0577fd2a6d66b9c30985d5d965d42eaac
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 10:53:40 2023 +0100

    level manager states system

commit 5aa9cfcab53dade344378b0c4a6fe1c4afae923b
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 08:54:26 2023 +0100

    Squashed commit of the following:

    commit a6f84061c8db544d15d427834f218bf15f9b2322
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:59 2023 +0100

        Merge Emmanuel

    commit 9e6203406629ceef0938dc730f7df5ae4d756438
    Merge: d85593d 373e765
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:53:43 2023 +0100

        Merge branch 'Emmanuel' into Ilan

    commit d85593d939e8e5edd6fdfef894b8d1936e791acc
    Author: Nay <ilan.outyey@gmail.com>
    Date:   Mon Dec 4 08:45:59 2023 +0100

        layers prefab

    commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
    Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
    Date:   Wed Nov 29 21:43:42 2023 +0100

        Update .gitignore

commit a6f84061c8db544d15d427834f218bf15f9b2322
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 08:53:59 2023 +0100

    Merge Emmanuel

commit 9e6203406629ceef0938dc730f7df5ae4d756438
Merge: d85593d 373e765
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 08:53:43 2023 +0100

    Merge branch 'Emmanuel' into Ilan

commit 48383b58ecd047f7b3a1d8d738640225c64ba5dd
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Mon Dec 4 08:46:14 2023 +0100

    Some little change

commit d85593d939e8e5edd6fdfef894b8d1936e791acc
Author: Nay <ilan.outyey@gmail.com>
Date:   Mon Dec 4 08:45:59 2023 +0100

    layers prefab

commit 373e765ce489d0d34dd04ed09d668ab75a81edd4
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Nov 29 21:53:16 2023 +0100

    Slide and Photo System

commit 7543289c6b2dbdf6d19a78347ab13935820ef910
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Nov 29 21:52:33 2023 +0100

    Update .gitignore

commit dc4217fbd05a9975ad10112098d019731b5be49b
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Nov 29 21:51:36 2023 +0100

    Update .gitignore

commit e56b608c8c24b30875bce00831cbe19dbcc5c7c1
Author: Kibishi47 <78955048+Kibishi47@users.noreply.github.com>
Date:   Wed Nov 29 21:43:42 2023 +0100

    Update .gitignore
  • Loading branch information
@IlanOu
IlanOu committed Dec 7, 2023
1 parent 6ba88b3 commit fe1414d
Show file tree
Hide file tree
Showing 13 changed files with 254 additions and 18 deletions.
Binary file added Assets/Images/Icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions Assets/Images/Icon.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion Assets/Scenes/Game.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4478703393907703834, guid: fea87a2b236a1c241a144a6a7e3c2908,
type: 3}
propertyPath: m_Size.y
value: 7.7268124
objectReference: {fileID: 0}
- target: {fileID: 4478703393907703834, guid: fea87a2b236a1c241a144a6a7e3c2908,
type: 3}
propertyPath: m_Offset.y
value: 3.3134909
objectReference: {fileID: 0}
- target: {fileID: 5377337705100421582, guid: fea87a2b236a1c241a144a6a7e3c2908,
type: 3}
propertyPath: m_Name
Expand Down Expand Up @@ -3086,7 +3096,7 @@ Transform:
m_GameObject: {fileID: 1516151767}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.46, y: -0.17899895, z: 0}
m_LocalPosition: {x: -3.98, y: -0.17899895, z: 0}
m_LocalScale: {x: 2.0759623, y: 0.22026609, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scenes/GameOver.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2435,7 +2435,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand Down
1 change: 1 addition & 0 deletions Assets/Scenes/Introduction.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ MonoBehaviour:
hideTextDelay: 3.4
showLogoDelay: 5.9
hideLogoDelay: 6
fadeOutDelay: 3
--- !u!82 &1043548227
AudioSource:
m_ObjectHideFlags: 0
Expand Down
29 changes: 25 additions & 4 deletions Assets/Scripts/Manager/Introduction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;

public class Introduction : MonoBehaviour
Expand All @@ -11,11 +12,11 @@ public class Introduction : MonoBehaviour
public GameObject textNootNoot;
public GameObject logo;


public float showTextDelay = 2.5f; // Délai avant d'afficher le texte
public float hideTextDelay = 3.4f; // Délai avant de cacher le texte
public float showLogoDelay = 5.9f; // Délai avant d'afficher le logo
public float hideLogoDelay = 5f; // Délai avant de cacher le logo
public float fadeOutDelay = 8.5f; // Délai avant de débuter le fondu

// Start is called before the first frame update
void Start()
Expand All @@ -26,7 +27,7 @@ void Start()
StartCoroutine(PlayIntroSound());
StartCoroutine(ShowAndHideText());
StartCoroutine(ShowAndHideLogo());

StartCoroutine(FadeOut());
}

// Coroutine pour jouer le son avec une petite pause
Expand Down Expand Up @@ -56,15 +57,35 @@ IEnumerator ShowAndHideLogo()
yield return new WaitForSeconds(showLogoDelay); // Attends avant d'afficher le logo
logo.SetActive(true);

StartCoroutine(startLogoAnimation());
StartCoroutine(StartLogoAnimation());

yield return new WaitForSeconds(hideLogoDelay); // Attends avant de cacher le logo
logo.SetActive(false);
}

// Coroutine pour le fondu (fade) vers l'opacité 0
IEnumerator FadeOut()
{
yield return new WaitForSeconds(hideLogoDelay + fadeOutDelay); // Attends avant de débuter le fondu

Image logoImage = logo.GetComponent<Image>();
Color logoColor = logoImage.color;

float t = 0f;
while (t < fadeOutDelay)
{
t += Time.deltaTime;

float alpha = Mathf.Lerp(1f, 0f, t / fadeOutDelay);
logoImage.color = new Color(logoColor.r, logoColor.g, logoColor.b, alpha);
yield return null;
}

SceneManager.LoadScene("MainMenu");
}

IEnumerator startLogoAnimation()
// Coroutine pour l'animation du logo (à compléter si nécessaire)
IEnumerator StartLogoAnimation()
{
Vector2 initialSize = logo.GetComponent<RectTransform>().sizeDelta;
Vector2 targetSize = new Vector2(905.2627f, 460.1752f);
Expand Down
1 change: 1 addition & 0 deletions Assets/Scripts/Manager/ReloadManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ void Start()
IEnumerator WaitForPresence()
{
yield return new WaitForSeconds(time);
DataStorage.instance.ResetData();
if(DataTreat.instance.leftPlayerPresence && DataTreat.instance.rightPlayerPresence)
{
SceneManager.LoadScene("Game");
Expand Down
21 changes: 18 additions & 3 deletions Assets/Scripts/Tools/DataStorage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@ public class DataStorage : MonoBehaviour
public static DataStorage instance;
void Awake()
{
leftPlayer = new Dictionary<string, int>();
rightPlayer = new Dictionary<string, int>();
if(instance != null)
{
Debug.Log("Il existe déjà une instance de DataStorage dans cette scène");
Destroy(this.gameObject);
return;
}
instance = this;
else
{
leftPlayer = new Dictionary<string, int>();
rightPlayer = new Dictionary<string, int>();
instance = this;
}
}

public void UpdateBestScore()
Expand All @@ -44,4 +47,16 @@ public void CalculCalories()
int squat = (int)((leftPlayer["squat"] + rightPlayer["squat"]) * squatCalories);
burnedCalories = jump + squat;
}

public void ResetData()
{
score = 0;
time = 0;
deciSeconds = 0;
distance = 0;
dodgedObstacle = 0;
burnedCalories = 0;
leftPlayer.Clear();
rightPlayer.Clear();
}
}
1 change: 1 addition & 0 deletions Assets/Scripts/Tools/DontDestroyOnLoadScene.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ void Awake()
if(instance != null)
{
Debug.Log("Il existe déjà une instance de DontDestroyOnLoadScene dans cette scène");
Destroy(this.gameObject);
return;
}

Expand Down
18 changes: 18 additions & 0 deletions ProjectSettings/BurstAotSettings_StandaloneWindows.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}
16 changes: 16 additions & 0 deletions ProjectSettings/BurstAotSettings_WebGL.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"OptimizeFor": 0
}
}
6 changes: 6 additions & 0 deletions ProjectSettings/CommonBurstAotSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}
Loading

0 comments on commit fe1414d

Please sign in to comment.