#42 [DEV => MASTER] 2-nd milestone reach

Merged
Endevir merged 42 commits from GooseHouse/dev into GooseHouse/master 6 years ago

42 Commits

Author SHA1 Message Date
  Ivan Arkhipov 5030d9cebc Renamed and reconfigured file names 6 years ago
  Ivan Arkhipov db47f2fb26 Fixing dublicating files 6 years ago
  Ivan Arkhipov 1fe765f57b Merge remote-tracking branch 'origin/unit' into dev 6 years ago
  Ivan Arkhipov a480b5bcb9 Refactoring & project structure improvements 6 years ago
  noath 632e732829 added operate() for Unit, fixed some build errors and codestyle fails (not at all) 6 years ago
  Ivan Arkhipov 5bbb1b878e Filename case changes (part 2), Debian build adaptation 6 years ago
  Ivan Arkhipov a792d3f7ce Changed source and header filenames to correct UpperCase 6 years ago
  Ivan Arkhipov 7603136207 Merge branch 'gui' into dev. Filenames changes, build system addings (resource files) 6 years ago
  Ivan Arkhipov 0c20c95055 Merge branch 'spelleffects' of GooseHouse/game-client into dev 6 years ago
  Ivan Arkhipov 8b1b179ad1 Merge branch 'gamemanager' of GooseHouse/game-client into dev 6 years ago
  Ivan Arkhipov b0854c2cc4 Splitted resources to several files and added release build option to make them out of .exe 6 years ago
  Ivan Arkhipov 5e4d368cbc Hot-seat pvp game model gui realisation 6 years ago
  noath 18b201c1b8 added primal GameManager, added empty Cells print() 6 years ago
  igorbat99 fd5ce3aaaa Done: basic spell/skill model. TODO: Spell:traits 6 years ago
  noath 9932fe8214 added fixes to compile 6 years ago
  igorbat99 d3846026aa add effects 6 years ago
  igorbat99 0ce676c818 did traits 6 years ago
  Ivan Arkhipov 0ca837f3b4 Merge branch 'unit' of GooseHouse/game-client into dev 6 years ago
  noath 32b9548b7e Warrior mechanics and fixes in unit and cell 6 years ago
  igorbat99 ecd9ca323a icons 6 years ago
  igorbat99 53507c8b3b made old gods great again(anf files in true directory) 6 years ago
  Ivan Arkhipov 9c1f93d5bc Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  GeorgeKolog 1c47a957db deleted testQueue.cpp 6 years ago
  GeorgeKolog 9c54f196e7 Added GameManager 6 years ago
  GeorgeKolog 65cfab9c06 Удалить 'testQueue.cpp' 6 years ago
  GeorgeKolog ef32bb4e09 added UnitsQueue 6 years ago
  Ivan Arkhipov 7a558e85e7 Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  GeorgeKolog fc63bf77b5 ЭТО ТОЧНО ПОСЛЕДНИЙ КОММИТ 6 years ago
  GeorgeKolog 776d8ce04b deleted includes 6 years ago
  GeorgeKolog f493b7bfbc 1 6 years ago
  GeorgeKolog 53468d52be Last Cell commit 6 years ago
  GeorgeKolog 34aa51e486 1 6 years ago
  GeorgeKolog 829dea3956 Cosmetic parts 6 years ago
  Ivan Arkhipov c37c6efb8a Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  GeorgeKolog bc8e03cdf7 Add function for Gi1dor getter next Cell 6 years ago
  GeorgeKolog 6e4f4c8086 Cell.h is Ready. Cell.cpp is partly realised 6 years ago
  Ivan Arkhipov c0812ca1b0 Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  igorbat99 2df12b5b2c Interfaces 6 years ago
  GeorgeKolog f529c4e00c moved to folder 6 years ago
  GeorgeKolog c755e2695c Updated Cell. Need to add in branch dev 6 years ago
  igorbat99 39135f7797 make true directory 6 years ago
  GeorgeKolog ec64568644 Обновить '.gitignore' 6 years ago