Pull request #2
Open
Pull request #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
Created Butter.ava, FruitSnacks.java, and Spaghetti.java
Merged zmuehlich615 to base
Refresh based on master
Merged Temperdox with master
Merded silvercorked with master
Merged jhoogner with master
Merged sosborn002 with master
Merged shinyPIKACHUx with master
Merged njones958 with master
Merged sflott393 with master
We fixed it but we gooffed. Changed methods to correct name. Changed variables to correct type. Removed error from setDesirability() for now till we can correctly throw errors.
Not Useful as of Now
Added time parameter to changeStoreCost. Made name for variables more descriptive. Reordered food set things.
https://github.com/MWHSComputerScience-ORG/StoreSim-APCS2016.git Conflicts: src/CannedAppleSauce.java src/CannedApples.java src/Main.java src/TherapeuticToiletPaper.java
Re-arranged class files into respective packages and set up hierarchy for interfact implementation.
Frozen Pizza & Pancake Mix
Might want to check this
Hot Pockets and Pizza Rolls all values set, comments put in per the need, was told to ignore any errors.
created Butter, Spaghetti, and Fruit Snacks
Created Coffee and Almonds
Created beef, blueberries and strawberries.
Yup, that's it.
Added Pie Class and Pie Mix Class
Accept Food Classes from ogong500
Adding 3 Foods
Adding Two Foods to the game -- Nick Jones
Added Food Classes from dbeut
food classes uploaded from jhoogner
Added Spaghetti, Butter, and Fruit Snacks
Added both food classes
Pulling Fork
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit