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

Jump to bottom

Mycah #4

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open

Mycah #4

wants to merge 98 commits into from

Commits on Jan 20, 2023

  1. Background added and displaying in correct size

    @meganenglert
    meganenglert committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    88c327a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from meganenglert/megan 

    Background added and displaying in correct size
    @meganenglert
    meganenglert authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    a92fd52 View commit details
    Browse the repository at this point in the history

  3. Setting up GitHub Pages (hopefully)

    @meganenglert
    meganenglert authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    785bb1b View commit details
    Browse the repository at this point in the history

  4. init commit

    @rrachelr
    rrachelr committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    e0f1879 View commit details
    Browse the repository at this point in the history

  5. Pages very possibly set up

    @meganenglert
    meganenglert committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    94a4648 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from meganenglert/gh-pages-setup 

    Pages very possibly set up
    @meganenglert
    meganenglert authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    731421e View commit details
    Browse the repository at this point in the history

  7. Delete jekyll-gh-pages.yml

    @meganenglert
    meganenglert authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    18ea1ce View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2023

  1. working on window

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    672eeab View commit details
    Browse the repository at this point in the history

  2. init commit

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    96bbd9f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird… 

    …-MVP into rachel
    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    ebca245 View commit details
    Browse the repository at this point in the history

  4. First new component added (Shop)

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    e3e0fd9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3 from meganenglert/megan-organization 

    First new component added (Shop)
    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    41a5ee7 View commit details
    Browse the repository at this point in the history

  6. All other files set up

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    4bfb141 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #4 from meganenglert/megan-organization 

    All other files set up
    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    d9f812a View commit details
    Browse the repository at this point in the history

  8. actually rendering all the components now oops

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    a735c37 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5 from meganenglert/megan-organization 

    actually rendering all the components now oops
    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    3f3f606 View commit details
    Browse the repository at this point in the history

  10. Shop image adding issues

    Lucas Castle authored and Lucas Castle committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    b85129d View commit details
    Browse the repository at this point in the history

  11. help

    Lucas Castle authored and Lucas Castle committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    077ebae View commit details
    Browse the repository at this point in the history

  12. colors images added

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    8af60be View commit details
    Browse the repository at this point in the history

  13. draggable popup

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    90b6e81 View commit details
    Browse the repository at this point in the history

  14. replaced popup background

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    f655100 View commit details
    Browse the repository at this point in the history

  15. Mycah Drag Drop

    @mycahdt
    mycahdt committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    ae777a7 View commit details
    Browse the repository at this point in the history

  16. properly displays colorwheel

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    4a1ffc3 View commit details
    Browse the repository at this point in the history

  17. Mycah DragNDrop

    @mycahdt
    mycahdt committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    9dcfd6e View commit details
    Browse the repository at this point in the history

  18. popup working and interactive

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    fbc7f31 View commit details
    Browse the repository at this point in the history

  19. Mycah DragNDrop push

    @mycahdt
    mycahdt committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    57f71a0 View commit details
    Browse the repository at this point in the history

  20. Mycah Drag and Drop

    @mycahdt
    mycahdt committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    8eb1d93 View commit details
    Browse the repository at this point in the history

  21. init commit

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    66a6fd9 View commit details
    Browse the repository at this point in the history

  22. working on window

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    1c7f548 View commit details
    Browse the repository at this point in the history

  23. draggable popup

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    3584dcc View commit details
    Browse the repository at this point in the history

  24. replaced popup background

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    22b4994 View commit details
    Browse the repository at this point in the history

  25. popup working and interactive

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    d5aa7d3 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird… 

    …-MVP into rachel
    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    0556857 View commit details
    Browse the repository at this point in the history

  27. Merge remote-tracking branch 'origin/main' into rachel

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    6b00a7b View commit details
    Browse the repository at this point in the history

  28. Merge pull request #6 from meganenglert/mycah 

    Mycah
    @mycahdt
    mycahdt authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    ef4d370 View commit details
    Browse the repository at this point in the history

  29. fix conflict

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    3986993 View commit details
    Browse the repository at this point in the history

  30. reorganized into components

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    518201c View commit details
    Browse the repository at this point in the history

  31. new commit

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    56508e4 View commit details
    Browse the repository at this point in the history

  32. Merge remote-tracking branch 'origin/main' into lucas

    Lucas Castle authored and Lucas Castle committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    eb98ef4 View commit details
    Browse the repository at this point in the history

  33. lucas final work for today

    Lucas Castle authored and Lucas Castle committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    ec45c29 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'main' into rachel

    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    2ff7799 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #7 from meganenglert/rachel 

    merge for Rachel's question pop ups
    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    004fd50 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'main' into lucas

    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    5a059ae View commit details
    Browse the repository at this point in the history

  37. Merge pull request #8 from meganenglert/lucas 

    Lucas
    @meganenglert
    meganenglert authored Jan 21, 2023
    Configuration menu
    Copy the full SHA
    8c84eee View commit details
    Browse the repository at this point in the history

  38. started getting stuff set up for additional functionality

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    c69d7db View commit details
    Browse the repository at this point in the history

  39. fixed linter issues

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    1aeb67b View commit details
    Browse the repository at this point in the history

  40. deployed!

    @meganenglert
    meganenglert committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    281b14a View commit details
    Browse the repository at this point in the history

  41. commit

    @rrachelr
    rrachelr committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    7c00af6 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. added color drag and drops

    @meganenglert
    meganenglert committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    ed5e198 View commit details
    Browse the repository at this point in the history

  2. renamed files to actually work

    @meganenglert
    meganenglert committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    fc12674 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. colors now drag and drop / color can change

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    642655b View commit details
    Browse the repository at this point in the history

  2. fixed merge conflict

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    1a7db9d View commit details
    Browse the repository at this point in the history

  3. please no more merge conflicts

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    1e8d724 View commit details
    Browse the repository at this point in the history

  4. new shop

    Lucas Castle authored and Lucas Castle committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    bd6419a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #10 from meganenglert/lucas 

    Shop 2
    @castlel3000
    castlel3000 authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    d0c9afa View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @Co1etrain
    Co1etrain authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    6d711d2 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin' into cole

    Cole McCaleb authored and Cole McCaleb committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    a45092c View commit details
    Browse the repository at this point in the history

  8. colors now become available again after replacement

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    77cbeba View commit details
    Browse the repository at this point in the history

  9. Merge pull request #11 from meganenglert/megan-colors-v2-1 

    Colors now pop back up after getting replace + text representation of color
    @meganenglert
    meganenglert authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    d46c82a View commit details
    Browse the repository at this point in the history

  10. added hat images

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    c9bbc9e View commit details
    Browse the repository at this point in the history

  11. Most updated

    Cole McCaleb authored and Cole McCaleb committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    3e6511f View commit details
    Browse the repository at this point in the history

  12. we have hats and colors woohoo

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    d86fbc0 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #12 from meganenglert/megan-colors-v2-2 

    Megan colors v2 2
    @meganenglert
    meganenglert authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    df84f30 View commit details
    Browse the repository at this point in the history

  14. reset button image

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    23ae514 View commit details
    Browse the repository at this point in the history

  15. reset button added and working

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    03263cc View commit details
    Browse the repository at this point in the history

  16. Merge pull request #14 from meganenglert/megan-add-reset-button 

    Megan add reset button
    @meganenglert
    meganenglert authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    836a781 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #13 from meganenglert/cole 

    Title screen
    @meganenglert
    meganenglert authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    f1221a1 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird… 

    …-MVP into rachel
    @rrachelr
    rrachelr committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    0d7ab7d View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/main' into ra

    @rrachelr
    rrachelr committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    999d9ef View commit details
    Browse the repository at this point in the history

  20. moving files

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    b6b2739 View commit details
    Browse the repository at this point in the history

  21. fixed title

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    0ec67ec View commit details
    Browse the repository at this point in the history

  22. Delete titleScene.ts

    @meganenglert
    meganenglert authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    efcd334 View commit details
    Browse the repository at this point in the history

  23. alpha publish

    @meganenglert
    meganenglert committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    3701232 View commit details
    Browse the repository at this point in the history

  24. Popups working

    @rrachelr
    rrachelr committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    b3180da View commit details
    Browse the repository at this point in the history

  25. Question formatting

    @rrachelr
    rrachelr committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    6d36c3a View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. collection scene

    @mycahdt
    mycahdt committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    d089a5e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from meganenglert/mycah 

    collection scene
    @mycahdt
    mycahdt authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    3cad448 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into rachel

    @rrachelr
    rrachelr committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    2d5d6bc View commit details
    Browse the repository at this point in the history

  4. ready to merge

    @rrachelr
    rrachelr committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    5090ff4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from meganenglert/rachel 

    Rachel
    @rrachelr
    rrachelr authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    ea6376b View commit details
    Browse the repository at this point in the history

  6. fixed popup error

    @rrachelr
    rrachelr committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    9b08f55 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from meganenglert/rachel 

    fixed popup error
    @rrachelr
    rrachelr authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    8abfadb View commit details
    Browse the repository at this point in the history

  8. quiz questions

    @mycahdt
    mycahdt committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    aea18f5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP… 

    … into mycah
    @mycahdt
    mycahdt committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    afc57bc View commit details
    Browse the repository at this point in the history

  10. Merge pull request #20 from meganenglert/mycah 

    Mycah
    @mycahdt
    mycahdt authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    5088944 View commit details
    Browse the repository at this point in the history

  11. deployment actually works now?

    @meganenglert
    meganenglert committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    7dfd2a7 View commit details
    Browse the repository at this point in the history

  12. Fixed hats location and I have updated title screen background 

     Please enter the commit message for your changes. Lines starting
    Cole McCaleb authored and Cole McCaleb committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    e63dce7 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #21 from meganenglert/cole 

    Fixed hats location and I have updated title screen background
    @meganenglert
    meganenglert authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    2e1a621 View commit details
    Browse the repository at this point in the history

  14. ready for deployment

    @meganenglert
    meganenglert committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    a51e743 View commit details
    Browse the repository at this point in the history

  15. drag and drop cleaned

    @meganenglert
    meganenglert committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    ec9a4d7 View commit details
    Browse the repository at this point in the history

  16. cleaned up files

    @meganenglert
    meganenglert committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    ef04ee8 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #22 from meganenglert/megan-cleanup 

    Megan cleanup
    @meganenglert
    meganenglert authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    f58c1d0 View commit details
    Browse the repository at this point in the history

  18. saves user input text

    @mycahdt
    mycahdt committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    5f73160 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. save name

    @mycahdt
    mycahdt committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    4564f3c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from meganenglert/mycah 

    Mycah
    @mycahdt
    mycahdt authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    a41c34c View commit details
    Browse the repository at this point in the history

  3. updated package lock

    @meganenglert
    meganenglert committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    bf669ba View commit details
    Browse the repository at this point in the history

  4. displays names in collection

    @mycahdt
    mycahdt committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    70aab2f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP… 

    … into mycah
    @mycahdt
    mycahdt committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    8f930b2 View commit details
    Browse the repository at this point in the history