Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: flipfloprob/Unity
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: unodeej/Unity
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 9,860 files changed
  • 2 contributors

Commits on Apr 12, 2014

  1. Duplicate commit as in other repository.

    Integrated in control binds (Rebind).
    
    Included event hooks, PokeParty replacement for hard coded implementation.
    Turbine1991 committed Apr 12, 2014
    Configuration menu
    Copy the full SHA
    026040c View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2014

  1. Configuration menu
    Copy the full SHA
    b55a59a View commit details
    Browse the repository at this point in the history
  2. Decided to turn the reference field for active Pokemon into a propert…

    …y, which directly obtains its value from PokeParty. Ensuring value consistency.
    Turbine1991 committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    89ff1f7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d3dde1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    805c106 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2a250fa View commit details
    Browse the repository at this point in the history
  6. Prepares for the new multiplayer conscious inventory system.

    Major benefit here is that each instance of an item will refer to a shared data source, each trainer then does not have duplicate items with duplicate information. Making it better for multi-trainer use.
    
    The new inventory system (next commit) will be independent of any one trainer, so it can be reusable. As well as better encapsulate inventory operations and functionality.
    Turbine1991 committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    6090048 View commit details
    Browse the repository at this point in the history
  7. Implemented and fully integrated a proper Inventory system. Initial r…

    …elease with more functionality expected, such as retrieving all items in a pocket 'trainer.inventory.GetItems(ITEM_POCKET.BERRIES)'.
    
    Also includes all of the item icons. As well as all 251 Pokemon, named by id.
    Turbine1991 committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    c249ad4 View commit details
    Browse the repository at this point in the history
  8. Completed the inventory class and fixed a few tired mistakes. Also ad…

    …ded pocket and item flags to DataItem.
    Turbine1991 committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    e1c6b8b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    90aeeb3 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1 from Turbine1991/master

    Duplicate code-quality commit as in other repository.
    Dan committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    7a271ff View commit details
    Browse the repository at this point in the history
Loading