#60 [DEV => MASTER] 3-rd milestone reach

Merge realizado
Endevir mesclou 34 commits de GooseHouse/dev em GooseHouse/master há 6 anos atrás

34 Commits

Autor SHA1 Mensagem Data
  Ivan Arkhipov 38f6b7271a Merge branch 'unit' into dev há 6 anos atrás
  Ivan Arkhipov e4b9ab806f small code improvements and fixes há 6 anos atrás
  Ivan Arkhipov bb3676cf4c Merge branch 'recruitmentscene' into dev há 6 anos atrás
  Ivan Arkhipov 9318c9d60a Merge branch 'gui' of GooseHouse/game-client into dev há 6 anos atrás
  Ivan Arkhipov 9a0c3b8e74 Realisation of dynamic game field há 6 anos atrás
  Arkady Bokov 3825347185 Обновить 'source/units/unit.cpp' há 6 anos atrás
  Arkady Bokov 8b3d8c19ba Обновить 'source/units/unit.cpp' há 6 anos atrás
  Arkady Bokov 311b2d5a4c Обновить 'include/units/unit.h' há 6 anos atrás
  Arkady Bokov 7e49cb63db Обновить 'include/units/unit.h' há 6 anos atrás
  Noath 779ebcb675 upgraded ui recruitment and prebattle, decreased max party to 7 há 6 anos atrás
  Arkady Bokov b0d7461668 Обновить 'source/units/unit.cpp' há 6 anos atrás
  Arkady Bokov 5f64d8b76b Обновить 'source/units/unit.cpp' há 6 anos atrás
  Noath 820bfe6a9e filled character traits, added constructor, filling script há 6 anos atrás
  Ivan Arkhipov 68b7bc3ef4 Merge branch 'dev' into gui há 6 anos atrás
  Ivan Arkhipov 590feeaebe Merge branch 'dev' into gui há 6 anos atrás
  Ivan Arkhipov d35f170e5c Completed prebattlescene. Preparing hotseatgame scene há 6 anos atrás
  Ivan Arkhipov e769376d77 Merge branch 'cell' of GooseHouse/game-client into dev há 6 anos atrás
  GeorgeKolog ea7814e2da Merge branch 'dev' into cell há 6 anos atrás
  GeorgeKolog e6b4331e48 added function getPoints. deleted printAll há 6 anos atrás
  Ivan Arkhipov c2b43c931a Merge branch 'gui' of GooseHouse/game-client into dev há 6 anos atrás
  Ivan Arkhipov 87a057f344 Changed font in hint && changed game music há 6 anos atrás
  Ivan Arkhipov e12142dc3b Merge branch 'gui' of GooseHouse/game-client into dev há 6 anos atrás
  Ivan Arkhipov 598cfd84fa Changed units and races raw-pointers to std::shared_ptr, completed recruitment scene rewriting há 6 anos atrás
  Ivan Arkhipov 718cf27c75 Created AboutUs and DialogForm windows, partially reimplemented HotSeat Recrtuitment scene há 6 anos atrás
  Ivan Arkhipov f1097744bf Peredelana HotSeat battle introduction scene há 6 anos atrás
  Ivan Arkhipov a21715d1f2 .pro file scripts improvement, refactored source files to follow new project structure há 6 anos atrás
  Ivan Arkhipov 431c329bca Обновить 'README.md' há 6 anos atrás
  Ivan Arkhipov b592b61fd9 Обновить 'README.md' há 6 anos atrás
  Ivan Arkhipov 36f5fc6173 Renaming skills source files to be able to be compiled in linux há 6 anos atrás
  Ivan Arkhipov 298a0bb093 Renaming files to be able to be compiled in linux há 6 anos atrás
  Ivan Arkhipov 2d1390142e Remaking main_menu scene && adding sound engine && refactoring project structure há 6 anos atrás
  Ivan Arkhipov cea1dbaa1e Changes in MainWindow & PvP-intro scenes há 6 anos atrás
  Ivan Arkhipov 5793174264 Modified main_menu and pvp_intro scenes há 6 anos atrás
  Ivan Arkhipov e94ad12908 Removed GUI class, all scenes are fullscreen now há 6 anos atrás