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

J feature #51

Open
wants to merge 148 commits into
base: master
Choose a base branch
from
Open

J feature #51

wants to merge 148 commits into from

Commits on Jul 20, 2021

  1. made eater and noiseMaker interfaces

    Nathan authored and Nathan committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    5e9a0b4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Agate-Acres/feature/eat 

    made eater and noiseMaker interfaces
    @tnguyen1912
    tnguyen1912 authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    a6efced View commit details
    Browse the repository at this point in the history

  3. Added 2 classes

    @JeremySabina
    JeremySabina committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    2af5afe View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from Agate-Acres/JFeature 

    Added 2 classes
    @JeremySabina
    JeremySabina authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    404a694 View commit details
    Browse the repository at this point in the history

  5. ridable interface

    Nathan authored and Nathan committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    ec719f2 View commit details
    Browse the repository at this point in the history

  6. added classes for shelter and Person and animal types

    @jgiroso
    jgiroso committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    db85b17 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3 from Agate-Acres/feature/eat 

    ridable interface
    @tnguyen1912
    tnguyen1912 authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    2e41fa2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #4 from Agate-Acres/feat/firstFeat 

    added classes for shelter and Person and animal types
    @jgiroso
    jgiroso authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    0b79280 View commit details
    Browse the repository at this point in the history

  9. Added all food classes

    @JeremySabina
    JeremySabina committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    ddd449e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #5 from Agate-Acres/JFeature 

    Added all food classes
    @JeremySabina
    JeremySabina authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    a8e37d4 View commit details
    Browse the repository at this point in the history

  11. edible interface

    Nathan authored and Nathan committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    8e7d56b View commit details
    Browse the repository at this point in the history

  12. new stuff

    Nathan authored and Nathan committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    e79cf52 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #6 from Agate-Acres/feature/eat 

    Feature/eat
    @tnguyen1912
    tnguyen1912 authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    9167e0d View commit details
    Browse the repository at this point in the history

  14. Added vehicle classes and interfaces

    Zach authored and Zach committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    cb74c34 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #7 from Agate-Acres/feature/VehicleInterfaces 

    Added vehicle classes and interfaces
    @ZachSinger
    ZachSinger authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    f09981e View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. added methods to shelter classes

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    2bda368 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from Agate-Acres/feat/shelterClasses 

    added methods to shelter classes
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    df5ed4a View commit details
    Browse the repository at this point in the history

  3. edited shelter variables

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    87d877f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from Agate-Acres/feat/shelterEdits 

    edited shelter variables
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    59be4d4 View commit details
    Browse the repository at this point in the history

  5. Updated vehicle intefaces

    Zach authored and Zach committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    80202b0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #10 from Agate-Acres/feature/VehicleInterfaces 

    Updated vehicle intefaces
    @ZachSinger
    ZachSinger authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    fe8f114 View commit details
    Browse the repository at this point in the history

  7. added more stuff

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    160a6b6 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #11 from Agate-Acres/feature/eat 

    added more stuff
    @tnguyen1912
    tnguyen1912 authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    c83a462 View commit details
    Browse the repository at this point in the history

  9. added tests but need classes first

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    7f95af8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #12 from Agate-Acres/feat/shelterTests 

    added tests but need classes first
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    672664d View commit details
    Browse the repository at this point in the history

  11. edited eater

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    089debb View commit details
    Browse the repository at this point in the history

  12. Merge pull request #13 from Agate-Acres/feature/eat 

    edited eater
    @tnguyen1912
    tnguyen1912 authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    940bf26 View commit details
    Browse the repository at this point in the history

  13. Created farm class

    Zach authored and Zach committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    98de612 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #14 from Agate-Acres/feature/createFarm 

    Created farm class
    @ZachSinger
    ZachSinger authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    9bf658f View commit details
    Browse the repository at this point in the history

  15. Farm

    Zach authored and Zach committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    a7c14fd View commit details
    Browse the repository at this point in the history

  16. added some implementations

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    db6bd0c View commit details
    Browse the repository at this point in the history

  17. test

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    14424ab View commit details
    Browse the repository at this point in the history

  18. Merge pull request #15 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    4c4f4b5 View commit details
    Browse the repository at this point in the history

  19. added FarmHouse test and changes to shelter classes

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    08fa101 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #16 from Agate-Acres/feat/PersonClass 

    added FarmHouse test and changes to shelter classes
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    d2d0050 View commit details
    Browse the repository at this point in the history

  21. various changes

    Zach authored and Zach committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    b3c387d View commit details
    Browse the repository at this point in the history

  22. Merge pull request #17 from Agate-Acres/feature/FarmFeatures 

    various changes
    @ZachSinger
    ZachSinger authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    bc354aa View commit details
    Browse the repository at this point in the history

  23. changed the edible to an interface

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    331b851 View commit details
    Browse the repository at this point in the history

  24. test

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    a69f094 View commit details
    Browse the repository at this point in the history

  25. merging

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    ab38bb1 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #19 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    11e4196 View commit details
    Browse the repository at this point in the history

  27. added stable and chickenCoop tests

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    284081d View commit details
    Browse the repository at this point in the history

  28. Merge pull request #20 from Agate-Acres/feat/moreShelterTests 

    added stable and chickenCoop tests
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    acd6cb8 View commit details
    Browse the repository at this point in the history

  29. added constructors to food

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    004b70d View commit details
    Browse the repository at this point in the history

  30. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    79c291a View commit details
    Browse the repository at this point in the history

  31. changed pom

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    b157327 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #21 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    6c4cb69 View commit details
    Browse the repository at this point in the history

  33. person tests

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    73b86bf View commit details
    Browse the repository at this point in the history

  34. Merge pull request #22 from Agate-Acres/feat/Botanist 

    person tests
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    afb630b View commit details
    Browse the repository at this point in the history

  35. made eater generic

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    071108b View commit details
    Browse the repository at this point in the history

  36. send it

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    cd6a690 View commit details
    Browse the repository at this point in the history

  37. implemented Eater on Person. added Farmer Test

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    13fbcc5 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #23 from Agate-Acres/feat/personImplements 

    implemented Eater on Person. added Farmer Test
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    8db54e1 View commit details
    Browse the repository at this point in the history

  39. added packages

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    2c87d82 View commit details
    Browse the repository at this point in the history

  40. makeNoise override

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    fdad0d5 View commit details
    Browse the repository at this point in the history

  41. added Rideable

    @JeremySabina
    JeremySabina committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    30a7a7c View commit details
    Browse the repository at this point in the history

  42. hello

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    8bd83a0 View commit details
    Browse the repository at this point in the history

  43. added instanceof tests

    @jgiroso
    jgiroso committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    ca86be5 View commit details
    Browse the repository at this point in the history

  44. Merge pull request #24 from Agate-Acres/feat/addingMoreStuff 

    added instanceof tests
    @jgiroso
    jgiroso authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    b9f3352 View commit details
    Browse the repository at this point in the history

  45. finished farmer class

    Nathan authored and Nathan committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    13d55d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Merge pull request #25 from Agate-Acres/feature/eat 

    finished farmer class
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    4f5ba6a View commit details
    Browse the repository at this point in the history

  2. made changes to interfaces

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    5addea1 View commit details
    Browse the repository at this point in the history

  3. added method

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    56c7a5a View commit details
    Browse the repository at this point in the history

  4. new stuff

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    861f253 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #26 from Agate-Acres/feature/eat 

    new stuff
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c12933c View commit details
    Browse the repository at this point in the history

  6. added lotsa codes

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    062d722 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #27 from Agate-Acres/feature/eat 

    added lotsa codes
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    8a44d90 View commit details
    Browse the repository at this point in the history

  8. Mammal tests done

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    80fa18e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #28 from Agate-Acres/feat/moreStuffIdk 

    Mammal tests done
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    3c9c66f View commit details
    Browse the repository at this point in the history

  10. edited horse Test

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    4c82989 View commit details
    Browse the repository at this point in the history

  11. Added a few tests

    Zach authored and Zach committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a780cae View commit details
    Browse the repository at this point in the history

  12. Merge pull request #29 from Agate-Acres/feature/VehTests 

    Added a few tests
    @ZachSinger
    ZachSinger authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    85b0628 View commit details
    Browse the repository at this point in the history

  13. added a gew tests

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    f93211a View commit details
    Browse the repository at this point in the history

  14. added all test names for food

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a2b1a47 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #30 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a599649 View commit details
    Browse the repository at this point in the history

  16. Added tests for Tractor

    Zach authored and Zach committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    b418771 View commit details
    Browse the repository at this point in the history

  17. Added some food tests

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a39d1f7 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    33c4b97 View commit details
    Browse the repository at this point in the history

  19. added some more food tests

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    15cae18 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #31 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    925df54 View commit details
    Browse the repository at this point in the history

  21. chickenTests, chicken Class, and egg Class updated

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    9b58988 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #32 from Agate-Acres/feat/whoKnowsAnymore 

    Feat/who knows anymore
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    160e990 View commit details
    Browse the repository at this point in the history

  23. changed cropRow

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    d1bb877 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #33 from Agate-Acres/feature/eat 

    changed cropRow
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    14826d8 View commit details
    Browse the repository at this point in the history

  25. added tests to mammal class

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    d0ff627 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #34 from Agate-Acres/feat/moreMammalTests 

    added tests to mammal class
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    10f73c0 View commit details
    Browse the repository at this point in the history

  27. fixed cornstalk

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    f91ebf9 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #35 from Agate-Acres/feature/eat 

    fixed cornstalk
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    9ac7950 View commit details
    Browse the repository at this point in the history

  29. Farmer Tests Complete

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    615b48b View commit details
    Browse the repository at this point in the history

  30. Merge pull request #36 from Agate-Acres/feat/FarmerTests 

    Farmer Tests Complete
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    e9bbb1c View commit details
    Browse the repository at this point in the history

  31. cornstalk and croprow tests finished

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c956498 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #37 from Agate-Acres/feature/eat 

    cornstalk and croprow tests finished
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    19a1155 View commit details
    Browse the repository at this point in the history

  33. Structure tests complete

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c429a47 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #38 from Agate-Acres/feat/moreMammalTests 

    Structure tests complete
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    f52f1aa View commit details
    Browse the repository at this point in the history

  35. the plot chickens

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    980ed56 View commit details
    Browse the repository at this point in the history

  36. edited person and farmer methods

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    3611566 View commit details
    Browse the repository at this point in the history

  37. Merge pull request #39 from Agate-Acres/feature/eat 

    the plot chickens
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a225646 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #40 from Agate-Acres/feat/PersonTests 

    edited person and farmer methods
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    fe40f63 View commit details
    Browse the repository at this point in the history

  39. moved eat method from chicken and horse to Animal class only

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    b35cf7b View commit details
    Browse the repository at this point in the history

  40. Merge pull request #41 from Agate-Acres/feat/playingWithGenerics 

    moved eat method from chicken and horse to Animal class only
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    2c05a4d View commit details
    Browse the repository at this point in the history

  41. added implementation test to PersonTests

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    1c10ce3 View commit details
    Browse the repository at this point in the history

  42. Merge pull request #42 from Agate-Acres/feat/finalPersonTest 

    added implementation test to PersonTests
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    31f7043 View commit details
    Browse the repository at this point in the history

  43. Further testing on vehicles

    Zach authored and Zach committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    3264514 View commit details
    Browse the repository at this point in the history

  44. Merge pull request #43 from Agate-Acres/feature/FurtherVehicleTests 

    Further testing on vehicles
    @ZachSinger
    ZachSinger authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    d55f921 View commit details
    Browse the repository at this point in the history

  45. took out some tests

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a06a992 View commit details
    Browse the repository at this point in the history

  46. food package is done

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    e6bcc23 View commit details
    Browse the repository at this point in the history

  47. Merge pull request #44 from Agate-Acres/feature/eat 

    food package is done
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    0e259cd View commit details
    Browse the repository at this point in the history

  48. woo

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    0afbf43 View commit details
    Browse the repository at this point in the history

  49. Started Simulation

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    4c6604b View commit details
    Browse the repository at this point in the history

  50. Testing stuff

    Zach authored and Zach committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    90a8eff View commit details
    Browse the repository at this point in the history

  51. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    62c5db2 View commit details
    Browse the repository at this point in the history

  52. Merge pull request #45 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c8b6dbd View commit details
    Browse the repository at this point in the history

  53. Merge pull request #46 from Agate-Acres/feature/EvenMoreVehicleTesting 

    Testing stuff
    @ZachSinger
    ZachSinger authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    6e3e6e8 View commit details
    Browse the repository at this point in the history

  54. oops

    Zach authored and Zach committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    fe9e13f View commit details
    Browse the repository at this point in the history

  55. did on dev again

    Zach authored and Zach committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    e822d2f View commit details
    Browse the repository at this point in the history

  56. Simulation stuff?

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    8640b74 View commit details
    Browse the repository at this point in the history

  57. Merge branch 'JFeature' of https://github.com/Agate-Acres/Maven.Farme… 

    …rFroilan into JFeature
    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c583b4c View commit details
    Browse the repository at this point in the history

  58. Merge pull request #47 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    1431072 View commit details
    Browse the repository at this point in the history

  59. Carrot classes and tests added

    @jgiroso
    jgiroso committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    c9da791 View commit details
    Browse the repository at this point in the history

  60. Merge pull request #48 from Agate-Acres/feat/Carrot 

    Carrot classes and tests added
    @jgiroso
    jgiroso authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    e965ac2 View commit details
    Browse the repository at this point in the history

  61. croprow harvest method

    Nathan authored and Nathan committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    50bfa3d View commit details
    Browse the repository at this point in the history

  62. Merge pull request #49 from Agate-Acres/feature/eat 

    croprow harvest method
    @tnguyen1912
    tnguyen1912 authored Jul 22, 2021
    Configuration menu
    Copy the full SHA
    4428f14 View commit details
    Browse the repository at this point in the history

  63. heyo

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    b853e37 View commit details
    Browse the repository at this point in the history

  64. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    9fcdfe7 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2021

  1. Edits to farm, tractor, tractorHarvestTest

    Zach authored and Zach committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    8935fff View commit details
    Browse the repository at this point in the history

  2. Finished Establishing the plot

    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    926bc43 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #50 from Agate-Acres/feature/FinishVehicleTests 

    Edits to farm, tractor, tractorHarvestTest
    @ZachSinger
    ZachSinger authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    8e416a1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    45141be View commit details
    Browse the repository at this point in the history

  5. Merge pull request #51 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    ad917e0 View commit details
    Browse the repository at this point in the history

  6. changed croprow

    Nathan authored and Nathan committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    6d30531 View commit details
    Browse the repository at this point in the history

  7. help me

    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    b2fc849 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'JFeature' of https://github.com/Agate-Acres/Maven.Farme… 

    …rFroilan into JFeature
    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    48ca115 View commit details
    Browse the repository at this point in the history

  9. help

    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    dda5b29 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #52 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    635853e View commit details
    Browse the repository at this point in the history

  11. split chickens and horses

    Nathan authored and Nathan committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    3513174 View commit details
    Browse the repository at this point in the history

  12. implemented split changes

    Nathan authored and Nathan committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    96a2b26 View commit details
    Browse the repository at this point in the history

  13. edited croprow

    Nathan authored and Nathan committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    d45e354 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #53 from Agate-Acres/feature/eat 

    Feature/eat
    @tnguyen1912
    tnguyen1912 authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    0a43911 View commit details
    Browse the repository at this point in the history

  15. hello

    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    7cd3210 View commit details
    Browse the repository at this point in the history

  16. Froilan class added

    @jgiroso
    jgiroso committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    3e01090 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #54 from Agate-Acres/feat/Froilan 

    Froilan class added
    @jgiroso
    jgiroso authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    d3dee15 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    a8af06e View commit details
    Browse the repository at this point in the history

  19. Merge pull request #56 from Agate-Acres/JFeature 

    J feature
    @JeremySabina
    JeremySabina authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    89de06c View commit details
    Browse the repository at this point in the history

  20. moved VehicleTests

    @jgiroso
    jgiroso committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    688308f View commit details
    Browse the repository at this point in the history

  21. Merge pull request #57 from Agate-Acres/feat/smallEdits 

    moved VehicleTests
    @jgiroso
    jgiroso authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    c8052ad View commit details
    Browse the repository at this point in the history

  22. Tests added for vehicles

    Zach authored and Zach committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    d3835b2 View commit details
    Browse the repository at this point in the history

  23. hello there

    @JeremySabina
    JeremySabina committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    3a04bef View commit details
    Browse the repository at this point in the history

  24. Merge branch 'Dev' into JFeature

    @JeremySabina
    JeremySabina authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    38fd68e View commit details
    Browse the repository at this point in the history