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

[US.1][4] Object representation of cards #12 #13

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

[US.1][4] Object representation of cards #12 #13

wants to merge 63 commits into from

Commits on Oct 8, 2018

  1. Added class Property, StateRailway, Railway

    @Angan7a
    Angan7a committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    33bfcde View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. Changed shared_ptr to <State>, added virtual destructors

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    45693d6 View commit details
    Browse the repository at this point in the history

  2. Deleted int getPriceStamp() and added defaulat value to rolls = 0, ad… 

    …ded default value stateRailway - OneRailway
    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    283c40a View commit details
    Browse the repository at this point in the history

  3. Deleted purchasePrice from constructor, added test to Property

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    ab07e82 View commit details
    Browse the repository at this point in the history

  4. Added getName(), getPurchasePrice(), tests for it and changed states

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    b07ba7e View commit details
    Browse the repository at this point in the history

  5. Added helper class Railwais

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    4fb8bcc View commit details
    Browse the repository at this point in the history

  6. Added class City and tests

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    0ca1fd9 View commit details
    Browse the repository at this point in the history

  7. Added filed owner in class Property

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    302c883 View commit details
    Browse the repository at this point in the history

  8. Added class Country

    @Angan7a
    Angan7a committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    6871112 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. Refactoring, made class Property with name nad purchasePrice

    @Angan7a
    Angan7a committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    0e6f0ec View commit details
    Browse the repository at this point in the history

  2. Added explicit to constructor with one argument, and added other cons… 

    …tructors to meet rules of five
    @Angan7a
    Angan7a committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    516ff2a View commit details
    Browse the repository at this point in the history

  3. Marked delete: copy-constructor, move-constructor, copy-assignment, m… 

    …ove-assignment from class property. Allocated object property in stack during tests.
    @Angan7a
    Angan7a committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    7cf0f1c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2018

  1. Merge branch 'master' of https://github.com/LordLukin/Eurobusiness

    @Angan7a
    Angan7a committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    b98be06 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. Added class Card and tests

    @Angan7a
    Angan7a committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    dfcf83b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/LordLukin/Eurobusiness

    @Angan7a
    Angan7a committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    85508af View commit details
    Browse the repository at this point in the history

  3. Added const number to metods setJob and getJob in class Card

    @Angan7a
    Angan7a committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    9b0a8f9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into master

    @ziobron
    ziobron authored Oct 12, 2018
    Configuration menu
    Copy the full SHA
    9f48160 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2018

  1. Merge branch 'master' of https://github.com/LordLukin/Eurobusiness

    @Angan7a
    Angan7a committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    0b39b45 View commit details
    Browse the repository at this point in the history

  2. Changed class Card - class with json

    @Angan7a
    Angan7a committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    3a13488 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Added field color to contructor Cards, fixed warning in Board

    @Angan7a
    Angan7a committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    94d14c9 View commit details
    Browse the repository at this point in the history

  2. Added file json to ignore by codecov

    @Angan7a
    Angan7a committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    69b5196 View commit details
    Browse the repository at this point in the history

  3. Added ignore json file to codacy.yml

    @Angan7a
    Angan7a committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    ae1747f View commit details
    Browse the repository at this point in the history

  4. Added enum class CardsColor and made some changes in tests

    @Angan7a
    Angan7a committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    8c62ec3 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2018

  1. Changed CardsColor to UPPERCASE

    @Angan7a
    Angan7a committed Oct 17, 2018
    Configuration menu
    Copy the full SHA
    09d1f65 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Merge branch 'master' of https://github.com/LordLukin/Eurobusiness 

    Conflicts:
	CMakeLists.txt
    @Angan7a
    Angan7a committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    4e31459 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. Added class Field

    @Angan7a
    Angan7a committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    4d682a2 View commit details
    Browse the repository at this point in the history

  2. Added method reduceMoney in class Player and doOn(Player)

    @Angan7a
    Angan7a committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    fa0e622 View commit details
    Browse the repository at this point in the history

  3. Added method set and get Owner to class property

    @Angan7a
    Angan7a committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    bcdba06 View commit details
    Browse the repository at this point in the history

  4. Added method addMoney() to class Player

    @Angan7a
    Angan7a committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    11b1ec1 View commit details
    Browse the repository at this point in the history

  5. Added to Cards base class Field

    @Angan7a
    Angan7a committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    d770217 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Added method getName, factoryFields

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    114e952 View commit details
    Browse the repository at this point in the history

  2. Added return Cards to methodyFactor

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    0b8e524 View commit details
    Browse the repository at this point in the history

  3. Added class OrdinaryCard

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    cbd0547 View commit details
    Browse the repository at this point in the history

  4. Moved name to class Field in class Cards

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    cf0863c View commit details
    Browse the repository at this point in the history

  5. Move name to class Field

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    d42741e View commit details
    Browse the repository at this point in the history

  6. Added class Railway

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    eee2896 View commit details
    Browse the repository at this point in the history

  7. Added test for class Railway to class Board

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    215520e View commit details
    Browse the repository at this point in the history

  8. Added class OrdinaryCard to facotyFields

    @Angan7a
    Angan7a committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    cc84d65 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Added method readFile to class Board

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    1585c33 View commit details
    Browse the repository at this point in the history

  2. Added method setCards to class Board

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    25d5ce5 View commit details
    Browse the repository at this point in the history

  3. Added method setFieldToCards

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    0bc5ab4 View commit details
    Browse the repository at this point in the history

  4. Added class WaterSupplyNetwork

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    c017132 View commit details
    Browse the repository at this point in the history

  5. Added field purchasePrice to constructor Property

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    2683ff6 View commit details
    Browse the repository at this point in the history

  6. Added method getNameRailway, and set purchasePrice to constructor Rai… 

    …lway
    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    3554c58 View commit details
    Browse the repository at this point in the history

  7. Added class City

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    01b36b5 View commit details
    Browse the repository at this point in the history

  8. Added class StateCity

    @Angan7a
    Angan7a committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    d043b8f View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2018

  1. Added states City

    @Angan7a
    Angan7a committed Oct 28, 2018
    Configuration menu
    Copy the full SHA
    0b02979 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Added state to Property and Railway

    @Angan7a
    Angan7a committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    e6b6f11 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Added state Railway and WaterSupplayNetwork

    @Angan7a
    Angan7a committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    f5c34ba View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Added State Railway

    @Angan7a
    Angan7a committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    62062ce View commit details
    Browse the repository at this point in the history

  2. Added logic to owner Property

    @Angan7a
    Angan7a committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    b256049 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Added getPriceStamp on doOn

    @Angan7a
    Angan7a committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    82ad7d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2018

  1. Merge branch 'master' of https://github.com/AntoniBandera/Eurobusiness

    @Angan7a
    Angan7a committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    72eb051 View commit details
    Browse the repository at this point in the history

  2. Added board and Players to class Eurobusiness

    @Angan7a
    Angan7a committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    28d7a57 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. Added functions to Play in class Eurobusiness

    @Angan7a
    Angan7a committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    c39a6fa View commit details
    Browse the repository at this point in the history

  2. Added mock Dice

    @Angan7a
    Angan7a committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    fbe3715 View commit details
    Browse the repository at this point in the history

  3. Rafactoring class Board

    @Angan7a
    Angan7a committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    b44969e View commit details
    Browse the repository at this point in the history

  4. Refactoring class Railway

    @Angan7a
    Angan7a committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    9b0be02 View commit details
    Browse the repository at this point in the history

  5. Added class YouGoToPrison

    @Angan7a
    Angan7a committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    32e9df3 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Added 400$ when player pass field start

    @Angan7a
    Angan7a committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    6855334 View commit details
    Browse the repository at this point in the history

  2. Send palyer to prison when player roll twice double

    @Angan7a
    Angan7a committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    49e53b2 View commit details
    Browse the repository at this point in the history

  3. Added StatePlayer

    @Angan7a
    Angan7a committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    21227c4 View commit details
    Browse the repository at this point in the history

  4. Set no charge money when player is in the prison

    @Angan7a
    Angan7a committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    4a4df8a View commit details
    Browse the repository at this point in the history