Code

Shm#110

Code

Open

bartosz-gruszczyk wants to merge 113 commits intocoders-school:shmcoders-school/object-oriented-programming:shmfrom bartosz-gruszczyk:shmbartosz-gruszczyk/object-oriented-programming:shmCopy head branch name to clipboard

+1,586

Commits

Commits on Jun 11, 2021

• fix coders-school#30

  ziobron

  committed
  b358851

  Copy full SHA for b358851

• fix coders-school#84

  ziobron

  committed
  c5340c8

  Copy full SHA for c5340c8

• fix coders-school#88, module3 almost removed

  ziobron

  committed
  220bf13

  Copy full SHA for 220bf13

Commits on Jun 14, 2021

• Update 09-operators.md

  BarTes8

  authored
  44b8e81

  Copy full SHA for 44b8e81

Commits on Jun 17, 2021

• Project start. First concept of files structure

  bartosz-gruszczyk

  committed
  5fc1b6f

  Copy full SHA for 5fc1b6f

Commits on Jun 20, 2021

• Files cargo.cpp and ship.cpp created. Methods impementations moved there (from hpp files).

  bartosz-gruszczyk

  committed
  ea70a73

  Copy full SHA for ea70a73

• Task 'Zadanie 2' completed. Constructor and getters added to the class 'Cargo'.

  bartosz-gruszczyk

  committed
  5f82ef7

  Copy full SHA for 5f82ef7

• Adding operator ==

  ploWoj

  committed
  268dd71

  Copy full SHA for 268dd71

Commits on Jun 22, 2021

• Initialize files and made first functionality

  Regggis

  committed
  1f17478

  Copy full SHA for 1f17478

• Added getPosition, Initialization, default constructor, some additional changes

  Regggis

  committed
  3f5d8f7

  Copy full SHA for 3f5d8f7

• Added island.cpp and island.hpp files

  Morfiniusz

  committed
  cd73046

  Copy full SHA for cd73046

Commits on Jun 23, 2021

• Adding player.hpp

  ploWoj

  committed
  92d4e90

  Copy full SHA for 92d4e90

• Adding player.cpp, player.hpp -corrected

  ploWoj

  committed
  ae6a443

  Copy full SHA for ae6a443

• getSpeed() implemented

  ploWoj

  committed
  99cdf86

  Copy full SHA for 99cdf86

• implemented getCargo()

  ploWoj

  committed
  daa404b

  Copy full SHA for daa404b

• corrected

  ploWoj

  committed
  8637398

  Copy full SHA for 8637398

Commits on Jun 26, 2021

• 'shm' and 'shmD4art' (zadanie3) branches megred

  bartosz-gruszczyk

  committed
  ac8dc4b

  Copy full SHA for ac8dc4b

• Merge branch 'shmRegis' (zadanie 4) into 'shm'

  bartosz-gruszczyk

  committed
  52bf2f5

  Copy full SHA for 52bf2f5

• Changed capital letter in fiilenames Map.cpp and Map.hpp. Included island.hpp in map.hpp.

  bartosz-gruszczyk

  committed
  b1fe926

  Copy full SHA for b1fe926

• Merge branch 'shmWoj'(zadanie 7) into 'shm'

  bartosz-gruszczyk

  committed
  75cb5a2

  Copy full SHA for 75cb5a2

• some changings in hpp i cpp files

  ploWoj

  committed
  f0bd5b5

  Copy full SHA for f0bd5b5

• Make some changes, and added getIsland function

  Regggis

  committed
  714a9ba

  Copy full SHA for 714a9ba

• Merge branch 'shmWoj'(with some corrections in Wojtek's tasks) into shm

  bartosz-gruszczyk

  committed
  f7233b5

  Copy full SHA for f7233b5

• Merge branch 'shm_zad6_regis' into shm

  bartosz-gruszczyk

  committed
  9967da7

  Copy full SHA for 9967da7

Commits on Jun 27, 2021

• Changes changes changes

  ploWoj

  committed
  c4a1c7b

  Copy full SHA for c4a1c7b

• some cleaning in cargo class

  bartosz-gruszczyk

  committed
  5a4cf38

  Copy full SHA for 5a4cf38

Commits on Jun 28, 2021

• remove 'basePrice' comparison in operator== in Cargo class

  bartosz-gruszczyk

  committed
  18f68ee

  Copy full SHA for 18f68ee

• Addign countAvailbaleSpace

  ploWoj

  committed
  b212c45

  Copy full SHA for b212c45

• Changes in Island class: better format-style, and improvemenet of operator== in subclass Coordinates

  bartosz-gruszczyk

  committed
  3c8a7d7

  Copy full SHA for 3c8a7d7

• fixing

  ploWoj

  committed
  4c184e8

  Copy full SHA for 4c184e8

• zadanie 5 implementation

  bartosz-gruszczyk

  committed
  54b9ed6

  Copy full SHA for 54b9ed6

• vector of islands change -> reference added... its probably wrong

  bartosz-gruszczyk

  committed
  c63de9d

  Copy full SHA for c63de9d

• Merge branch 'shmWoj'(with zadanie 8) into shm

  bartosz-gruszczyk

  committed
  f12be8a

  Copy full SHA for f12be8a

• another code-style fixes

  bartosz-gruszczyk

  committed
  ff3c21b

  Copy full SHA for ff3c21b

Commits on Jun 30, 2021

• Diffrent cargo

  ploWoj

  committed
  d946046

  Copy full SHA for d946046

Commits on Jul 2, 2021

• all changes

  ploWoj

  committed
  680db84

  Copy full SHA for 680db84

• after hunks

  ploWoj

  committed
  c5f98ae

  Copy full SHA for c5f98ae

• Fixing a bug of operator-=

  ploWoj

  committed
  1b9e862

  Copy full SHA for 1b9e862

• Fixing the bugs in getCargos()

  ploWoj

  committed
  c1b96cc

  Copy full SHA for c1b96cc

• Changes in Player class

  ploWoj

  committed
  1ab9d3d

  Copy full SHA for 1ab9d3d

Commits on Jul 6, 2021

• Added new files coordinates.hpp/.cpp, modification of island.hpp - move coordinates class to new file, delete references, modification of operator==

  Morfiniusz

  committed
  5b7353f

  Copy full SHA for 5b7353f

• Revert "Added new files coordinates.hpp/.cpp, modification of island.hpp - move coordinates class to new file, delete references, modification of operator=="

  Show description for 8de5823
  Morfiniusz

  committed
  8de5823

  Copy full SHA for 8de5823

• Added new files coordinates.hpp/.cpp, moved class coordinates to new file, delete references, modification of operator==

  Morfiniusz

  committed
  9ed1f3c

  Copy full SHA for 9ed1f3c

Commits on Jul 7, 2021

• main

  ploWoj

  committed
  cd918ff

  Copy full SHA for cd918ff

Commits on Jul 10, 2021

• Fixing a bug in player, cargo and ship

  ploWoj

  committed
  9fbb5a8

  Copy full SHA for 9fbb5a8

Commits on Jul 14, 2021

• In coordinates class added new method distastance and change variable type from int to size_t, in island class added method set position

  Morfiniusz

  committed
  44eb3f5

  Copy full SHA for 44eb3f5

Commits on Jul 15, 2021

• Map repaired, added Cmake, also changes to cargo, and island and added coordinates files from Darth branch

  Regggis

  committed
  0fa6324

  Copy full SHA for 0fa6324

• Vector of objects, map done (i hope)

  Regggis

  committed
  c837a38

  Copy full SHA for c837a38

Commits on Jul 18, 2021

• Merge branch 'shmWoj' into shmFix1AllMerged

  bartosz-gruszczyk

  committed
  0e7d86e

  Copy full SHA for 0e7d86e

• delete alkohol, fruit, item classes files (they're unnecessery for no). Delete main binary file.

  bartosz-gruszczyk

  committed
  bb12618

  Copy full SHA for bb12618

• Merge branch 'shmD4rth_task3_update' into shmFix1AllMerged

  bartosz-gruszczyk

  committed
  aae412a

  Copy full SHA for aae412a

• Merge branch 'shm_Regis_4_6_update' into shmFix1AllMerged

  bartosz-gruszczyk

  committed
  188c3b7

  Copy full SHA for 188c3b7

• remove 'Store' class files(unnecessery), plus some little style fixes

  bartosz-gruszczyk

  committed
  b28eb70

  Copy full SHA for b28eb70

• added Map class fix

  bartosz-gruszczyk

  committed
  fec6fd5

  Copy full SHA for fec6fd5

Commits on Jul 19, 2021

• player chaneged

  ploWoj

  committed
  763a42d

  Copy full SHA for 763a42d

• creating enum Response

  ploWoj

  committed
  9bad12c

  Copy full SHA for 9bad12c

• adding functionalities

  ploWoj

  committed
  e7d5614

  Copy full SHA for e7d5614

• store.cpp

  ploWoj

  committed
  3817b97

  Copy full SHA for 3817b97

• remove unnecessary cout message 'island don't exist'

  bartosz-gruszczyk

  committed
  e1ed853

  Copy full SHA for e1ed853

Commits on Jul 20, 2021

• changes

  ploWoj

  committed
  88acddd

  Copy full SHA for 88acddd

• add types of cargos

  ploWoj

  committed
  2a02c33

  Copy full SHA for 2a02c33

Commits on Jul 21, 2021

• changes in store

  ploWoj

  committed
  03c6ce7

  Copy full SHA for 03c6ce7

• changes in store

  ploWoj

  committed
  0516f0e

  Copy full SHA for 0516f0e

• some code cleaning

  bartosz-gruszczyk

  committed
  eb4149c

  Copy full SHA for eb4149c

Commits on Jul 29, 2021

• Next day method for Ship and Cargo

  Regggis

  committed
  96044fd

  Copy full SHA for 96044fd

Commits on Jul 31, 2021

• adding generating stock_ of store

  ploWoj

  committed
  f8ed192

  Copy full SHA for f8ed192

Commits on Aug 1, 2021

• Another chaneges in Piradise

  ploWoj

  committed
  d3dafd9

  Copy full SHA for d3dafd9

Commits on Aug 2, 2021

• Next day in Store class

  Regggis

  committed
  65e8c68

  Copy full SHA for 65e8c68

Commits on Aug 8, 2021

• Alcohol class added

  bartosz-gruszczyk

  committed
  a34c2d6

  Copy full SHA for a34c2d6

• set some methods from cargo as virtual

  bartosz-gruszczyk

  committed
  2885a07

  Copy full SHA for 2885a07

Commits on Aug 9, 2021

• Fruit class added

  bartosz-gruszczyk

  committed
  79e0485

  Copy full SHA for 79e0485

• Item class added

  bartosz-gruszczyk

  committed
  3912043

  Copy full SHA for 3912043

• added fruit, alcohol, item cpp files do CMakeLists.txt

  bartosz-gruszczyk

  committed
  a1fb936

  Copy full SHA for a1fb936

• Operators in Cargo class: += -= == set as virtual. Classes Alcohol, Item, Fruit provide override operators.

  bartosz-gruszczyk

  committed
  5c3f05a

  Copy full SHA for 5c3f05a

Commits on Aug 12, 2021

• added files time.cpp/hpp iObserver.hpp

  Morfiniusz

  committed
  3d7c55c

  Copy full SHA for 3d7c55c

• Revert "added files time.cpp/hpp iObserver.hpp"

  Show description for a52b949
  Morfiniusz

  committed
  a52b949

  Copy full SHA for a52b949

• added new files time.cpp hpp iObserver.hpp

  Morfiniusz

  committed
  c2e251d

  Copy full SHA for c2e251d

• modification time.cpp/hpp changed shared_ptr to ptr, cargo class Inheritance to class IObserwer, added time parameter to Cargo constructor and time variable

  Morfiniusz

  committed
  b1a3aca

  Copy full SHA for b1a3aca

• modification of Ship constructors added time variable and iheritance to IObserver class

  Morfiniusz

  committed
  0984f02

  Copy full SHA for 0984f02

Commits on Aug 13, 2021

• Better randomizing process in nextDay

  Regggis

  committed
  d320f4e

  Copy full SHA for d320f4e

Commits on Aug 16, 2021

• Merge branch 'shm2_zad2_bart' into shm2_working_branch

  bartosz-gruszczyk

  committed
  85d5b75

  Copy full SHA for 85d5b75

• fixed mistaken names in Time Class (Obeserver to Observer)

  bartosz-gruszczyk

  committed
  7990ddb

  Copy full SHA for 7990ddb

• Merge branch 'StorSHM' into shm2_working_branch

  bartosz-gruszczyk

  committed
  5d99fbc

  Copy full SHA for 5d99fbc

• cleaning after merge (build dir)

  bartosz-gruszczyk

  committed
  8a129e5

  Copy full SHA for 8a129e5

• another small bug fixes (function declarations etc.)

  bartosz-gruszczyk

  committed
  9e4155f

  Copy full SHA for 9e4155f

• syntax fix in main.cpp

  bartosz-gruszczyk

  committed
  26c4daf

  Copy full SHA for 26c4daf

• Merge branch 'shm2_zad_3_regis' into shm2_working_branch

  bartosz-gruszczyk

  committed
  4a3ed88

  Copy full SHA for 4a3ed88

• another small after-merge fixes

  bartosz-gruszczyk

  committed
  2a51252

  Copy full SHA for 2a51252

Commits on Aug 27, 2021

• changes in store class

  ploWoj

  committed
  eae7cb9

  Copy full SHA for eae7cb9

• adding game class

  ploWoj

  committed
  755efc9

  Copy full SHA for 755efc9

Commits on Aug 29, 2021

• teamwork improvements 1

  bartosz-gruszczyk

  committed
  6dee2fd

  Copy full SHA for 6dee2fd

• pointer to owner added to class Ship

  bartosz-gruszczyk

  committed
  fda7c7b

  Copy full SHA for fda7c7b

• nextDay() in Fruit class

  bartosz-gruszczyk

  committed
  4dca07a

  Copy full SHA for 4dca07a

• teamork final commit

  bartosz-gruszczyk

  committed
  5c2c99e

  Copy full SHA for 5c2c99e

Commits on Sep 3, 2021

• nextDay() in store repaired

  Regggis

  committed
  897ac40

  Copy full SHA for 897ac40

Commits on Sep 7, 2021

• Vector of shared_ptr removed from Cargos

  Regggis

  committed
  f89d725

  Copy full SHA for f89d725

• Segmentatio fault disaster

  Regggis

  committed
  407dc63

  Copy full SHA for 407dc63

Commits on Sep 11, 2021

• Adding new functionalities to game

  Regggis

  committed
  f376156

  Copy full SHA for f376156

• Some more changes and checking of possiblities

  Regggis

  committed
  482f093

  Copy full SHA for 482f093

Commits on Sep 12, 2021

• Only sell to write (I hope)

  Regggis

  committed
  5fc35a9

  Copy full SHA for 5fc35a9

• Almost, ALMOSTgit add .

  Regggis

  committed
  81bc456

  Copy full SHA for 81bc456

Commits on Sep 13, 2021

• Only some esthetic to done (I hope)

  Regggis

  committed
  83216df

  Copy full SHA for 83216df

• Only some esthetic to done (I hope) vol2

  Regggis

  committed
  f78999f

  Copy full SHA for f78999f

• finally done

  Regggis

  committed
  3b60c1c

  Copy full SHA for 3b60c1c

• finally done2

  Regggis

  committed
  a3dff7b

  Copy full SHA for a3dff7b

Commits on Sep 23, 2021

• Some changes after review

  Regggis

  committed
  4a94837

  Copy full SHA for 4a94837

Commits on Sep 26, 2021

• Operators and polymorphism left to do

  Regggis

  committed
  f31e2cd

  Copy full SHA for f31e2cd

Commits on Oct 10, 2021

• Fixed bug where we cannot buy more stuff of the same object

  Regggis

  committed
  6310af7

  Copy full SHA for 6310af7

• Operators removed from Cargo; const shared_ptr reference everywhere; small bugs fixed

  Regggis

  committed
  4d5803a

  Copy full SHA for 4d5803a

Commits on Oct 21, 2021

• Ship TEST implementation

  ploWoj

  committed
  2a8230f

  Copy full SHA for 2a8230f

• Constexpr Coordinates working

  Regggis

  committed
  b058834

  Copy full SHA for b058834

• Polimorphism / functions commented

  Regggis

  committed
  337b091

  Copy full SHA for 337b091

• All review problems resolved

  Regggis

  committed
  e1399df

  Copy full SHA for e1399df