Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

again conflict #2

Merged
merged 18 commits into from
May 17, 2021
Merged

again conflict #2

merged 18 commits into from
May 17, 2021

Commits on May 15, 2021

  1. strums light up lol

    @Kade-github
    Kade-github authored May 15, 2021
    Configuration menu
    Copy the full SHA
    6b809a9 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2021

  1. alphabet code and sheet updated!!!

    @CyndaquilDAC
    CyndaquilDAC committed May 16, 2021
    Configuration menu
    Copy the full SHA
    4c7e8d8 View commit details
    Browse the repository at this point in the history

  2. SONGS NOW USE SPACES IN THEIR NAMES AND PHILLY NICE IS NAMED PROPERLY… 

    …!!!!
    @CyndaquilDAC
    CyndaquilDAC committed May 16, 2021
    Configuration menu
    Copy the full SHA
    7835b6e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #480 from CyndaquilDAC/alphabet-shit 

    Alphabet supports spaces and a ton more symbols as well!!
    @Kade-github
    Kade-github authored May 16, 2021
    Configuration menu
    Copy the full SHA
    a1bf6ee View commit details
    Browse the repository at this point in the history

  4. fix mistakes both made by me and others

    @CyndaquilDAC
    CyndaquilDAC committed May 16, 2021
    Configuration menu
    Copy the full SHA
    c50a058 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #485 from CyndaquilDAC/oops-i-messed-up 

    fix mistakes both made by me and others
    @Kade-github
    Kade-github authored May 16, 2021
    Configuration menu
    Copy the full SHA
    e635b14 View commit details
    Browse the repository at this point in the history

  6. they're not all screenshots dumbass

    NitrogenDioxide authored May 16, 2021
    Configuration menu
    Copy the full SHA
    44a112e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #488 from Kiffolisk/patch-12 

    they're not all screenshots dumbass
    @puyoxyz
    puyoxyz authored May 16, 2021
    Configuration menu
    Copy the full SHA
    aff87fa View commit details
    Browse the repository at this point in the history

  8. oops lol

    @Kade-github
    Kade-github authored May 16, 2021
    Configuration menu
    Copy the full SHA
    4407f0f View commit details
    Browse the repository at this point in the history

  9. BLUEBALL BUTTON OPTION

    @CyndaquilDAC
    CyndaquilDAC committed May 16, 2021
    Configuration menu
    Copy the full SHA
    f7880ba View commit details
    Browse the repository at this point in the history

  10. Merge branch 'KadeDev:master' into blueball-button-option

    @CyndaquilDAC
    CyndaquilDAC committed May 16, 2021
    Configuration menu
    Copy the full SHA
    2912e07 View commit details
    Browse the repository at this point in the history

  11. OOPS IM STUPID

    @CyndaquilDAC
    CyndaquilDAC committed May 16, 2021
    Configuration menu
    Copy the full SHA
    3fc3a03 View commit details
    Browse the repository at this point in the history

  12. 2 seconds

    @Kade-github
    Kade-github committed May 16, 2021
    Configuration menu
    Copy the full SHA
    7f86f1d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/KadeDev/Kade-Engine

    @Kade-github
    Kade-github committed May 16, 2021
    Configuration menu
    Copy the full SHA
    4b8527d View commit details
    Browse the repository at this point in the history

  14. I completely forgot about this lol!

    @Kade-github
    Kade-github committed May 16, 2021
    Configuration menu
    Copy the full SHA
    eb21492 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #490 from CyndaquilDAC/blueball-button-option 

    Reset button option
    @Kade-github
    Kade-github authored May 16, 2021
    Configuration menu
    Copy the full SHA
    4a3d514 View commit details
    Browse the repository at this point in the history

  16. window movement

    @Kade-github
    Kade-github committed May 16, 2021
    Configuration menu
    Copy the full SHA
    65adb42 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/KadeDev/Kade-Engine

    @Kade-github
    Kade-github committed May 16, 2021
    Configuration menu
    Copy the full SHA
    7b997b1 View commit details
    Browse the repository at this point in the history