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

multiple chat room stuff frontend #39

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open

multiple chat room stuff frontend #39

wants to merge 36 commits into from

Commits on Nov 17, 2020

  1. sign up with success/error message

    @nicole-chang
    nicole-chang committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    5f5c110 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. boundaries across screen sizes, fish have different speeds

    @ryanjackson10
    ryanjackson10 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    3dfb0bf View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2020

  1. sign in and sign out forms, css is messy but at least everything is c… 

    …entered
    @nicole-chang
    nicole-chang committed Nov 28, 2020
    Configuration menu
    Copy the full SHA
    1a5a57c View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2020

  1. fish are 3d models + different kinds of fish

    @ryanjackson10
    ryanjackson10 committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    d9363e4 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2020

  1. slight changes to movement, hook is now 3d

    @ryanjackson10
    ryanjackson10 committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    0238b4d View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2020

  1. small changes and game over graphic

    @ryanjackson10
    ryanjackson10 committed Dec 5, 2020
    Configuration menu
    Copy the full SHA
    28defa7 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2020

  1. Merge pull request #31 from ucladevx/rj_fishingGame 

    3d models, game over graphic
    @ryanjackson10
    ryanjackson10 authored Dec 6, 2020
    Configuration menu
    Copy the full SHA
    bac59b4 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. loading graphic, one more model

    @ryanjackson10
    ryanjackson10 committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    844210c View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2020

  1. file-loader missing fixed

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    97cbd90 View commit details
    Browse the repository at this point in the history

  2. collision detection

    @kiwamoto14 @Ishnoor-Singh
    kiwamoto14 authored and Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    49759c7 View commit details
    Browse the repository at this point in the history

  3. context addition

    @kiwamoto14 @Ishnoor-Singh
    kiwamoto14 authored and Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    ee3ba0f View commit details
    Browse the repository at this point in the history

  4. image background

    @kiwamoto14 @Ishnoor-Singh
    kiwamoto14 authored and Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    7cdec3b View commit details
    Browse the repository at this point in the history

  5. backend integration

    @kiwamoto14 @Ishnoor-Singh
    kiwamoto14 authored and Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    6b7f3dd View commit details
    Browse the repository at this point in the history

  6. background improvement

    @kiwamoto14 @Ishnoor-Singh
    kiwamoto14 authored and Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    be7ab8a View commit details
    Browse the repository at this point in the history

  7. multiple players

    @kiwamoto14 @Ishnoor-Singh
    kiwamoto14 authored and Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    737d7bd View commit details
    Browse the repository at this point in the history

  8. wip

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    5a88137 View commit details
    Browse the repository at this point in the history

  9. refactored folder structure

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    b157ec8 View commit details
    Browse the repository at this point in the history

  10. further refactor

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    5311dd9 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #32 from ucladevx/rj_fishingGame 

    loading graphic, one more model
    @Ishnoor-Singh
    Ishnoor-Singh authored Dec 12, 2020
    Configuration menu
    Copy the full SHA
    dc4a2e3 View commit details
    Browse the repository at this point in the history

  12. useContext is not working but here's what i have

    @nicole-chang
    nicole-chang committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    dfbba61 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #33 from ucladevx/rj_movingMesh 

    Rj moving mesh
    @Ishnoor-Singh
    Ishnoor-Singh authored Dec 12, 2020
    Configuration menu
    Copy the full SHA
    65c4427 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2020

  1. username label

    @ryanjackson10
    ryanjackson10 committed Dec 13, 2020
    Configuration menu
    Copy the full SHA
    4fb1115 View commit details
    Browse the repository at this point in the history

  2. Delete kid.glb

    @ryanjackson10
    ryanjackson10 authored Dec 13, 2020
    Configuration menu
    Copy the full SHA
    aa6a62d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #34 from ucladevx/usernameLabels 

    Username labels
    @Ishnoor-Singh
    Ishnoor-Singh authored Dec 13, 2020
    Configuration menu
    Copy the full SHA
    6b223df View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. sign up with success/error message

    @nicole-chang @Ishnoor-Singh
    nicole-chang authored and Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    6a67d40 View commit details
    Browse the repository at this point in the history

  2. sign in and sign out forms, css is messy but at least everything is c… 

    …entered
    @nicole-chang @Ishnoor-Singh
    nicole-chang authored and Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    378cd9c View commit details
    Browse the repository at this point in the history

  3. useContext is not working but here's what i have

    @nicole-chang @Ishnoor-Singh
    nicole-chang authored and Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    98f12ed View commit details
    Browse the repository at this point in the history

  4. wip

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    81e4b11 View commit details
    Browse the repository at this point in the history

  5. fixed chat

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    0f2b93b View commit details
    Browse the repository at this point in the history

  6. everything works together, i think

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    1cbb41f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'nc_login' of https://github.com/ucladevx/clubbruin-fron… 

    …tend into nc_login
    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    52803fb View commit details
    Browse the repository at this point in the history

  8. Merge pull request #35 from ucladevx/nc_login 

    Nc login
    @Ishnoor-Singh
    Ishnoor-Singh authored Dec 14, 2020
    Configuration menu
    Copy the full SHA
    7c875fb View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. fixed merge issues

    @Ishnoor-Singh
    Ishnoor-Singh committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    e52047a View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. login page looks nicer aside from fonts

    @nicole-chang
    nicole-chang committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    ef156de View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2021

  1. use sessionStorage to maintain login and username in chat after refre… 

    …shing map
    @nicole-chang
    nicole-chang committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    0de682e View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. starting to make multiple chatrooms

    @nicole-chang
    nicole-chang committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    86f0b07 View commit details
    Browse the repository at this point in the history