Skip to content

John b #5

Merged
merged 4 commits into from
Feb 14, 2015
Merged

John b #5

merged 4 commits into from
Feb 14, 2015

Conversation

wkc12001
Copy link
Collaborator

If the Merchant class is the one pulled from Gavn, let me pull from this branch and I'll try and find some problems if there are any.

john added 4 commits February 12, 2015 22:36
tests for the Player's inventory. Added _quantity variable to Item
class. We will discuss whether or not to keep this at our meeting
every method. This helps to organize our other comments and keep them
"within" each method. The Javadoc serves as a title for each method and
outlines what each method does. I have also made changes to variable
names in an effort to make them more descriptive and appropriate. We can
discuss all of these changes during our meeting and decide whether or
not they will be beneficial.
john added a commit that referenced this pull request Feb 14, 2015
@john john merged commit 3e3bc27 into master Feb 14, 2015
@john john deleted the John-B branch February 14, 2015 18:59
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants