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

changes to test cases #63

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

changes to test cases #63

wants to merge 40 commits into from

Commits on May 16, 2023

  1. add eater, animal, horse, stable (edible params commented out)

    @Luciaw1219
    Luciaw1219 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    99b9140 View commit details
    Browse the repository at this point in the history

  2. add junit to pom.xml and specify java version 19

    @Luciaw1219
    Luciaw1219 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    4a455ff View commit details
    Browse the repository at this point in the history

  3. add rideable to horse commented out until rideable is created

    @Luciaw1219
    Luciaw1219 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    a50dbe1 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Mohammed amine is cool

    Mohammed amine ztait authored and Mohammed amine ztait committed May 17, 2023
    Configuration menu
    Copy the full SHA
    cb88a1e View commit details
    Browse the repository at this point in the history

  2. classes done

    @mouad1937
    mouad1937 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    0ed25cf View commit details
    Browse the repository at this point in the history

  3. done

    @mouad1937
    mouad1937 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    aa24738 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. Mohammed amine is cool

    Mohammed amine ztait authored and Mohammed amine ztait committed May 18, 2023
    Configuration menu
    Copy the full SHA
    2a02478 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. saved

    @Dariuss13
    Dariuss13 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    7f47c88 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Luciaw1219/lucia2 

    add junit to pom.xml and specify java version 19
    @Luciaw1219
    Luciaw1219 authored May 19, 2023
    Configuration menu
    Copy the full SHA
    9f74799 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from Luciaw1219/Lucia 

    add eater, animal, horse, stable (edible params commented out)
    @Luciaw1219
    Luciaw1219 authored May 19, 2023
    Configuration menu
    Copy the full SHA
    54a016b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:Luciaw1219/FarmerFroilan into Ami… 

    …neWork
    Mohammed amine ztait authored and Mohammed amine ztait committed May 19, 2023
    Configuration menu
    Copy the full SHA
    c971c01 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:Luciaw1219/FarmerFroilan into Sprye

    @Dariuss13
    Dariuss13 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    9edbd5e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from Luciaw1219/Sprye 

    saved
    @Luciaw1219
    Luciaw1219 authored May 19, 2023
    Configuration menu
    Copy the full SHA
    e24dbbf View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:Luciaw1219/FarmerFroilan into Ami… 

    …neWork
    Mohammed amine ztait authored and Mohammed amine ztait committed May 19, 2023
    Configuration menu
    Copy the full SHA
    2ab38c2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #4 from Luciaw1219/AmineWork 

    Mohammed amine is cool
    @Luciaw1219
    Luciaw1219 authored May 19, 2023
    Configuration menu
    Copy the full SHA
    b39f409 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. organize files, resolve dependencies

    @Luciaw1219
    Luciaw1219 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    8057a3b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from Luciaw1219/Lucia 

    organize files, resolve dependencies
    @Luciaw1219
    Luciaw1219 authored May 20, 2023
    Configuration menu
    Copy the full SHA
    89fef60 View commit details
    Browse the repository at this point in the history

  3. save

    @Dariuss13
    Dariuss13 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    18a3c79 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from Luciaw1219/Ahlafi 

    classes done
    @Dariuss13
    Dariuss13 authored May 20, 2023
    Configuration menu
    Copy the full SHA
    258a153 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. remove ds store, move vehicles into vehicles pacage, add test classes… 

    … for every object, implement rideable on horse
    @Luciaw1219
    Luciaw1219 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    dcde73b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from Luciaw1219/Lucia 

    remove ds store, move vehicles into vehicles package, add test classes…
    @Dariuss13
    Dariuss13 authored May 21, 2023
    Configuration menu
    Copy the full SHA
    a18098b View commit details
    Browse the repository at this point in the history

  3. new save

    @Dariuss13
    Dariuss13 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    ea6df1b View commit details
    Browse the repository at this point in the history

  4. save1

    @Dariuss13
    Dariuss13 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    0d07652 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/Luciaw1219/FarmerFroilan … 

    …into Ahlafi
    @mouad1937
    mouad1937 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    0fd42d0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #12 from Luciaw1219/Ahlafi 

    Ahlafi
    @Luciaw1219
    Luciaw1219 authored May 21, 2023
    Configuration menu
    Copy the full SHA
    4ed7b33 View commit details
    Browse the repository at this point in the history

  7. saved2

    @Dariuss13
    Dariuss13 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    fb409fe View commit details
    Browse the repository at this point in the history

  8. Merge pull request #10 from Luciaw1219/Sprye 

    Sprye
    @Luciaw1219
    Luciaw1219 authored May 21, 2023
    Configuration menu
    Copy the full SHA
    56df4da View commit details
    Browse the repository at this point in the history

  9. add import of crop to croprow, fix stable array, remove yeild method … 

    …from crop as it should be implemented by subclasses
    @Luciaw1219
    Luciaw1219 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    52cab5b View commit details
    Browse the repository at this point in the history

  10. Merge pull request #13 from Luciaw1219/Lucia 

    add import of crop to croprow, fix stable array, remove yeild method …
    @Luciaw1219
    Luciaw1219 authored May 21, 2023
    Configuration menu
    Copy the full SHA
    a784acf View commit details
    Browse the repository at this point in the history

  11. create plants and food packages

    @Luciaw1219
    Luciaw1219 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    de18390 View commit details
    Browse the repository at this point in the history

  12. correct mistake for harvesting and yeilding

    @Luciaw1219
    Luciaw1219 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    69f1e85 View commit details
    Browse the repository at this point in the history

  13. uncomment croprow for farmer

    @Luciaw1219
    Luciaw1219 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    cfcc2a8 View commit details
    Browse the repository at this point in the history

  14. uncomment croprow for farmer

    @Luciaw1219
    Luciaw1219 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    238eae5 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #14 from Luciaw1219/Lucia 

    create plants and food packages
    @Luciaw1219
    Luciaw1219 authored May 21, 2023
    Configuration menu
    Copy the full SHA
    ed956b3 View commit details
    Browse the repository at this point in the history

  16. finish

    @mouad1937
    mouad1937 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    0067033 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. classes done

    @mouad1937
    mouad1937 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    282dc2e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Ahlafi

    @Luciaw1219
    Luciaw1219 authored May 22, 2023
    Configuration menu
    Copy the full SHA
    247de4d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #16 from Luciaw1219/Ahlafi 

    finish
    @Luciaw1219
    Luciaw1219 authored May 22, 2023
    Configuration menu
    Copy the full SHA
    a31d189 View commit details
    Browse the repository at this point in the history

  4. resolve merge conflicts

    @Luciaw1219
    Luciaw1219 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    8e64d32 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #17 from Luciaw1219/Lucia 

    resolve merge conflicts
    @Luciaw1219
    Luciaw1219 authored May 22, 2023
    Configuration menu
    Copy the full SHA
    accf6c3 View commit details
    Browse the repository at this point in the history