Ashley#45

Open

smartist17 wants to merge 39 commits intoZipCodeCore:masterfrom

Commits on Mar 26, 2021

Created Shelter abstract class and its subclasses

Chris Allen
authored and
Chris Allen
committed
Created Edible interface and classes that implement it. Also refactored

Chris Allen
authored and
Chris Allen
committed
Created FoodInventory tests

Chris Allen
authored and
Chris Allen
committed
Updated tests

Chris Allen
authored and
Chris Allen
committed
Minor change

Chris Allen
authored and
Chris Allen
committed
Added a second constructor option for Shelter and FoodInventory

Chris Allen
authored and
Chris Allen
committed
my attempt at vehicle stuff

Abiel Figueroa
authored and
Abiel Figueroa
committed
Added field class

Chris Allen
authored and
Chris Allen
committed
Merge pull request #1 from MNinh/abby
Abielf
authored
Merge pull request #2 from MNinh/ChrisBranch
MNinh
authored
okay done now

Abiel Figueroa
authored and
Abiel Figueroa
committed
Merge pull request #3 from MNinh/abby
Abielf
authored
Made a bunch of updates

Chris Allen
authored and
Chris Allen
committed
More stuff

Chris Allen
authored and
Chris Allen
committed
More stuff

Chris Allen
authored and
Chris Allen
committed
Merge pull request #4 from MNinh/ChrisBranch
Christopher-Allen-21
authored
Made some changes

Chris Allen
authored and
Chris Allen
committed
Made logic changes

Chris Allen
authored and
Chris Allen
committed
Merge pull request #5 from MNinh/ChrisBranch
Abielf
authored

Commits on Mar 27, 2021

thoroughly commented project

Abiel Figueroa
authored and
Abiel Figueroa
committed
Merge pull request #6 from MNinh/abby
Abielf
authored
Made modifications we talked about

Chris Allen
authored and
Chris Allen
committed

Commits on Mar 28, 2021

Merge pull request #7 from MNinh/ChrisBranch
MNinh
authored
Worked on test
MNinh
committed
Merge pull request #8 from MNinh/MikesBranch
MNinh
authored
added noise to return strings
MNinh
committed
Merge pull request #9 from MNinh/MikesBranch
MNinh
authored
half the main done

Abiel Figueroa
authored and
Abiel Figueroa
committed
Merge pull request #10 from MNinh/abby
Abielf
authored
Shelter tests & Edible tests done
smartist17
committed
WE FEEDING ANIMAL NOW YALL

Abiel Figueroa
authored and
Abiel Figueroa
committed

Commits on Mar 29, 2021

updated some test
MNinh
committed
Half the week done

Abiel Figueroa
authored and
Abiel Figueroa
committed
only harvest day left baybee

Abiel Figueroa
authored and
Abiel Figueroa
committed
DONE AND DONE

Abiel Figueroa
authored and
Abiel Figueroa
committed
Merge remote-tracking branch 'origin/abby' into Ashley
smartist17
committed
Merge remote-tracking branch 'origin/MikesBranch' into Ashley
smartist17
committed
Updates
smartist17
committed
More tests added in crops
smartist17
committed