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

Optimized recycling code and removed reduntant entries. #295

Merged
merged 13 commits into from
Aug 2, 2016
Merged

Optimized recycling code and removed reduntant entries. #295

merged 13 commits into from
Aug 2, 2016

Commits on Aug 1, 2016

  1. Merge pull request #4 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    f29945c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    6cfeea9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from Nimryel/dev-patch 

    Fixed xp/level and double recycling of pokeballs, potions and revives.
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    2b3f02b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    120abab View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    e62e3f6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #9 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    e31700e View commit details
    Browse the repository at this point in the history

  7. Optimized recycling and removed useless code.

    @Nimryel
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    541b7be View commit details
    Browse the repository at this point in the history

  8. Merge pull request #10 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    4ef55b8 View commit details
    Browse the repository at this point in the history

  9. Fixed bug. Added berry count to console.

    @Nimryel
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    8fe9d3b View commit details
    Browse the repository at this point in the history

  10. Fixed bug.

    @Nimryel
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    60906cc View commit details
    Browse the repository at this point in the history

  11. Merge pull request #14 from PocketMobsters/development 

    Merge
    Nimryel committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    3f5398b View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. Naming fix

    @Nimryel
    Nimryel committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    4344a7c View commit details
    Browse the repository at this point in the history

  2. Merge-fix

    @Nimryel
    Nimryel committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    d38ac06 View commit details
    Browse the repository at this point in the history