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

Food fixes #6

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

Food fixes #6

wants to merge 59 commits into from

Commits on Jun 15, 2017

  1. added background and new sprite

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    04da790 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from JHFellows/sarahs-tasks 

    added background and new sprite
    githubschman authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    13432cb View commit details
    Browse the repository at this point in the history

  3. goodbye toooo youuuu

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    da21162 View commit details
    Browse the repository at this point in the history

  4. adds sprite to team but then doesnt render the sprite?

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    a48219a View commit details
    Browse the repository at this point in the history

  5. need to declare teams in socket file not in game constructor or they … 

    …will change every time. need to finish adding food.
    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    a78419a View commit details
    Browse the repository at this point in the history

  6. added some notes on client game communication flow

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    eaa4a0b View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from JHFellows/michelle 

    Michelle
    githubschman authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    c0ad791 View commit details
    Browse the repository at this point in the history

  8. nothing changed

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    477b53e View commit details
    Browse the repository at this point in the history

  9. teams work!

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    7503fb0 View commit details
    Browse the repository at this point in the history

  10. food is added in correct spot!

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    e6c10f2 View commit details
    Browse the repository at this point in the history

  11. it can eat the food!

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    6a9b693 View commit details
    Browse the repository at this point in the history

  12. finally got tile map working

    @JHFellows
    JHFellows committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    405e450 View commit details
    Browse the repository at this point in the history

  13. food works as it should

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    bb17115 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #3 from JHFellows/fixing-teams 

    Fixing teams
    githubschman authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    b69c4ba View commit details
    Browse the repository at this point in the history

  15. purps background

    @JHFellows
    JHFellows committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    b25580a View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' into make-background

    @JHFellows
    JHFellows authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    d4b260a View commit details
    Browse the repository at this point in the history

  17. Merge pull request #4 from JHFellows/make-background 

    Make background
    @JHFellows
    JHFellows authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    04fc68c View commit details
    Browse the repository at this point in the history

  18. changed velocity

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    d8bfba2 View commit details
    Browse the repository at this point in the history

  19. increments team score when player eats

    githubschman committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    0e78007 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2017

  1. camera follows only newest player

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    d10a854 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from JHFellows/camera-follow 

    camera follows only newest player
    @JHFellows
    JHFellows authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    48d1af8 View commit details
    Browse the repository at this point in the history

  3. anxiety commit

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    2c323c3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into enemy

    githubschman authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    33ead5b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6 from JHFellows/enemy 

    Enemy
    githubschman authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    803a65a View commit details
    Browse the repository at this point in the history

  6. spaced out food

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    71536e3 View commit details
    Browse the repository at this point in the history

  7. size changes i guess!

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    5c3c2d1 View commit details
    Browse the repository at this point in the history

  8. eating the enemies

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    cd5918c View commit details
    Browse the repository at this point in the history

  9. Merge pull request #7 from JHFellows/food 

    Food
    githubschman authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    c7427f1 View commit details
    Browse the repository at this point in the history

  10. score almost working...

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    8895bc3 View commit details
    Browse the repository at this point in the history

  11. leaderboard updates dynamically

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    4ba130a View commit details
    Browse the repository at this point in the history

  12. Merge pull request #8 from JHFellows/leaderboard 

    leaderboard updates dynamically
    @JHFellows
    JHFellows authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    06bb968 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into scores

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    94a5fe4 View commit details
    Browse the repository at this point in the history

  14. collision goes both ways

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    7e0e2b2 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #9 from JHFellows/scores 

    Scores
    githubschman authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    1ca3b82 View commit details
    Browse the repository at this point in the history

  16. pls look at the gameover text

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    05ef69e View commit details
    Browse the repository at this point in the history

  17. Merge pull request #10 from JHFellows/fixing-attacks 

    pls look at the gameover text
    githubschman authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    e6d3d39 View commit details
    Browse the repository at this point in the history

  18. world fits screen and then some

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    00b596b View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' into change-world-again

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    7aa5f9b View commit details
    Browse the repository at this point in the history

  20. meh

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    99f7765 View commit details
    Browse the repository at this point in the history

  21. game over text works

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    20e1ca2 View commit details
    Browse the repository at this point in the history

  22. finally decided on this size yesss

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    015f933 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #11 from JHFellows/change-world-again 

    Change world again
    @JHFellows
    JHFellows authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    1416fd7 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' into game-over

    @JHFellows
    JHFellows authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    adea7ce View commit details
    Browse the repository at this point in the history

  25. Merge pull request #12 from JHFellows/game-over 

    game over text works
    @JHFellows
    JHFellows authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    ec2a33a View commit details
    Browse the repository at this point in the history

  26. small changes

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    9176407 View commit details
    Browse the repository at this point in the history

  27. food spawning as it should

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    dd82d31 View commit details
    Browse the repository at this point in the history

  28. point system is a lot cleaner

    githubschman committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    d2fc2be View commit details
    Browse the repository at this point in the history

  29. changed leaderboard position and game over text

    @JHFellows
    JHFellows committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    a1e66e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2017

  1. moved game over text up

    @JHFellows
    JHFellows committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    92473d4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from JHFellows/new-leaderboard 

    New leaderboard
    @JHFellows
    JHFellows authored Jun 17, 2017
    Configuration menu
    Copy the full SHA
    3c9a3cf View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. changed background back to purple

    @JHFellows
    JHFellows committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    0a40fa0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from JHFellows/change-background 

    changed background back to purple
    @JHFellows
    JHFellows authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    d0b6272 View commit details
    Browse the repository at this point in the history

  3. added many foods

    @JHFellows
    JHFellows committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    f779b10 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #15 from JHFellows/fun-foods 

    added many foods
    @JHFellows
    JHFellows authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    44478c2 View commit details
    Browse the repository at this point in the history

  5. confined food to world bounds

    @JHFellows
    JHFellows committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    8c21876 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #16 from JHFellows/better-foods-placement 

    confined food to world bounds
    @JHFellows
    JHFellows authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    0f68591 View commit details
    Browse the repository at this point in the history

  7. hi jenna <3

    githubschman committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    6b28579 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into food-fixes

    githubschman authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    16d78fc View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into food-fixes

    githubschman authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    0e21565 View commit details
    Browse the repository at this point in the history