44 Commits 1c47a957db ... ea7814e2da

Author SHA1 Message Date
  GeorgeKolog ea7814e2da Merge branch 'dev' into cell 6 years ago
  GeorgeKolog e6b4331e48 added function getPoints. deleted printAll 6 years ago
  Ivan Arkhipov c2b43c931a Merge branch 'gui' of GooseHouse/game-client into dev 6 years ago
  Ivan Arkhipov 87a057f344 Changed font in hint && changed game music 6 years ago
  Ivan Arkhipov e12142dc3b Merge branch 'gui' of GooseHouse/game-client into dev 6 years ago
  Ivan Arkhipov 598cfd84fa Changed units and races raw-pointers to std::shared_ptr, completed recruitment scene rewriting 6 years ago
  Ivan Arkhipov 718cf27c75 Created AboutUs and DialogForm windows, partially reimplemented HotSeat Recrtuitment scene 6 years ago
  Ivan Arkhipov f1097744bf Peredelana HotSeat battle introduction scene 6 years ago
  Ivan Arkhipov a21715d1f2 .pro file scripts improvement, refactored source files to follow new project structure 6 years ago
  Ivan Arkhipov 431c329bca Обновить 'README.md' 6 years ago
  Ivan Arkhipov b592b61fd9 Обновить 'README.md' 6 years ago
  Ivan Arkhipov 36f5fc6173 Renaming skills source files to be able to be compiled in linux 6 years ago
  Ivan Arkhipov 298a0bb093 Renaming files to be able to be compiled in linux 6 years ago
  Ivan Arkhipov 2d1390142e Remaking main_menu scene && adding sound engine && refactoring project structure 6 years ago
  Ivan Arkhipov cea1dbaa1e Changes in MainWindow & PvP-intro scenes 6 years ago
  Ivan Arkhipov 5793174264 Modified main_menu and pvp_intro scenes 6 years ago
  Ivan Arkhipov e94ad12908 Removed GUI class, all scenes are fullscreen now 6 years ago
  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
  Ivan Arkhipov 7a558e85e7 Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  Ivan Arkhipov c37c6efb8a Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  Ivan Arkhipov c0812ca1b0 Merge branch 'cell' of GooseHouse/game-client into dev 6 years ago
  igorbat99 2df12b5b2c Interfaces 6 years ago
  igorbat99 39135f7797 make true directory 6 years ago
100 changed files with 21 additions and 13 deletions
  1. 6 1
      .gitignore
  2. 11 12
      README.md
  3. BIN
      assets/common/ImprobableGivingAlbertosaurus.gif
  4. BIN
      assets/common/background.jpg
  5. BIN
      assets/common/book.png
  6. BIN
      assets/common/buttons/about_us_button.png
  7. BIN
      assets/common/buttons/about_us_button_hover.png
  8. BIN
      assets/common/buttons/back_button.png
  9. BIN
      assets/common/buttons/back_button_hover.png
  10. BIN
      assets/common/buttons/button_click.mp3
  11. BIN
      assets/common/buttons/button_hover.mp3
  12. BIN
      assets/common/buttons/complete_choice_button.png
  13. BIN
      assets/common/buttons/complete_choice_button_hover.png
  14. BIN
      assets/common/buttons/continue_button.png
  15. BIN
      assets/common/buttons/continue_button_hover.png
  16. BIN
      assets/common/buttons/hotseat_button.png
  17. BIN
      assets/common/buttons/hotseat_button_hover.png
  18. BIN
      assets/common/buttons/leave_game_button.png
  19. BIN
      assets/common/buttons/leave_game_button_hover.png
  20. BIN
      assets/common/buttons/settings_button.png
  21. BIN
      assets/common/buttons/settings_button_hover.png
  22. BIN
      assets/common/cursors/click.gif
  23. BIN
      assets/common/cursors/simple.gif
  24. BIN
      assets/common/dwarf_adventurer_by_vertibirdo-d9dr1c0.gif
  25. BIN
      assets/common/fonts/barocco-initial.ttf
  26. BIN
      assets/common/fonts/pixel.otf
  27. BIN
      assets/common/fonts/viking-cyr.ttf
  28. BIN
      assets/common/logo.png
  29. BIN
      assets/common/team_logo.jpg
  30. BIN
      assets/common/town.jpg
  31. 0 0
      assets/common/unittrees/README.md
  32. 0 0
      assets/common/unittrees/human-archer.png
  33. 0 0
      assets/common/unittrees/human-mage.png
  34. 0 0
      assets/common/unittrees/human-rider.png
  35. 0 0
      assets/common/unittrees/human-rogue.png
  36. 0 0
      assets/common/unittrees/human-warrior.png
  37. 0 0
      assets/common/window/README.md
  38. BIN
      assets/common/window/button1.png
  39. BIN
      assets/common/window/button2.png
  40. BIN
      assets/common/window/frame.png
  41. BIN
      assets/common/window/opaque-border-botleft.png
  42. BIN
      assets/common/window/opaque-border-botright.png
  43. BIN
      assets/common/window/opaque-border-bottom.png
  44. BIN
      assets/common/window/opaque-border-left.png
  45. BIN
      assets/common/window/opaque-border-right.png
  46. BIN
      assets/common/window/opaque-border-top.png
  47. BIN
      assets/common/window/opaque-border-topleft.png
  48. BIN
      assets/common/window/opaque-border-topright.png
  49. BIN
      assets/common/window/strong_translucent-background.png
  50. BIN
      assets/common/window/strong_translucent-border-botleft.png
  51. BIN
      assets/common/window/strong_translucent-border-botright.png
  52. BIN
      assets/common/window/strong_translucent-border-left.png
  53. BIN
      assets/common/window/strong_translucent-border-right.png
  54. BIN
      assets/common/window/strong_translucent-border-top.png
  55. BIN
      assets/common/window/strong_translucent-border-topleft.png
  56. BIN
      assets/common/window/strong_translucent-border-topright.png
  57. BIN
      assets/common/window/strong_translucent-border_bottom.png
  58. 0 0
      assets/common/window/thick_opaque-background.png
  59. BIN
      assets/common/window/thick_opaque-border-botleft.png
  60. BIN
      assets/common/window/thick_opaque-border-botright.png
  61. BIN
      assets/common/window/thick_opaque-border-bottom.png
  62. BIN
      assets/common/window/thick_opaque-border-left.png
  63. BIN
      assets/common/window/thick_opaque-border-right.png
  64. BIN
      assets/common/window/thick_opaque-border-top.png
  65. BIN
      assets/common/window/thick_opaque-border-topleft.png
  66. BIN
      assets/common/window/thick_opaque-border-topright.png
  67. 0 0
      assets/effects/README.md
  68. 2 0
      assets/effects/effects.txt
  69. 1 0
      assets/effects/melledamage/descr.txt
  70. BIN
      assets/effects/melledamage/icon.png
  71. 1 0
      assets/effects/selfheal/descr.txt
  72. BIN
      assets/effects/selfheal/icon.png
  73. BIN
      assets/hotseat_intro/image.gif
  74. BIN
      assets/hotseat_intro/image.psd
  75. 0 0
      assets/hotseat_recruit/README.md
  76. BIN
      assets/hotseat_recruit/icon_closed.png
  77. BIN
      assets/hotseat_recruit/image.gif
  78. BIN
      assets/hotseat_recruit/unit_icon_active.png
  79. BIN
      assets/hotseat_recruit/unit_icon_default.png
  80. BIN
      assets/hotseat_recruit/unit_icon_hover.png
  81. BIN
      assets/hotseat_recruit/unknown.png
  82. BIN
      assets/hotseatpvp/attack_state.png
  83. BIN
      assets/hotseatpvp/battle_bg/CmBkCF.png
  84. BIN
      assets/hotseatpvp/battle_bg/CmBkCur.png
  85. BIN
      assets/hotseatpvp/battle_bg/CmBkDeck.png
  86. BIN
      assets/hotseatpvp/battle_bg/CmBkDes.png
  87. BIN
      assets/hotseatpvp/battle_bg/CmBkDrDd.png
  88. BIN
      assets/hotseatpvp/battle_bg/CmBkDrMt.png
  89. BIN
      assets/hotseatpvp/battle_bg/CmBkDrTr.png
  90. BIN
      assets/hotseatpvp/battle_bg/CmBkGrMt.png
  91. BIN
      assets/hotseatpvp/battle_bg/CmBkGrTr.png
  92. BIN
      assets/hotseatpvp/battle_bg/CmBkHG.png
  93. BIN
      assets/hotseatpvp/battle_bg/CmBkLava.png
  94. BIN
      assets/hotseatpvp/battle_bg/CmBkMag.png
  95. BIN
      assets/hotseatpvp/battle_bg/CmBkRK.png
  96. BIN
      assets/hotseatpvp/battle_bg/CmBkRgh.png
  97. BIN
      assets/hotseatpvp/battle_bg/CmBkSnMt.png
  98. BIN
      assets/hotseatpvp/battle_bg/CmBkSnTr.png
  99. BIN
      assets/hotseatpvp/battle_bg/CmBkSub.png
  100. BIN
      assets/hotseatpvp/battle_bg/CmBkSwmp.png

+ 6 - 1
.gitignore

@@ -105,4 +105,9 @@ CMakeScripts
 Makefile
 cmake_install.cmake
 install_manifest.txt
-TestCellProject
+
+test
+deploy
+build
+debug
+release

+ 11 - 12
README.md

@@ -38,20 +38,19 @@ dpkg -i ./goosehouse-game.deb
 ```
 
 
-## Ветки развития юнитов расы людей:
+## Структура папок проекта:
 
-### Ветка Лучника
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-archer.png)
+#### Папка *assets* : 
+В этой папке содержатся все графические файлы, связанные с проектом. Часть из них (версии для деплоя) собираются в специальные файлы ресурсов для каждой сцены, которые загружаются вместе со сценой.
 
-### Ветка Мага
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-mage.png)
+#### Папка *include* :
+Эта папка содержит в себе все .h файлы приложения - все интерфейсы классов приложения (исключения - .h файлы, связанные с .ui сценами, они хранятся вместе с этими сценами)
 
-### Ветка Всадника
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-rider.png)
+#### Папка *source* :
+Здесь находятся все файлы реализации классов приложения, кроме тех, что завязаны на .ui файлах (аналогично с .h файлами, последние хранятся вместе с .ui сценами)
 
-### Ветка Изгоя
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-rogue.png)
-
-### Ветка Воина 
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-warrior.png)
+#### Папка *ui* : 
+В папке ui размещены все файлы графических сцен проекта. Каждая сцена состоит из 3-х файлов - .ui, .cpp и .h. Одна логическая сцена (главное меню, к примеру), может состоять из нескольких физических, которые накладываются друг на друга (сцена анимированного фона, сцена меню, расположенного по центру)
 
+#### Папка *res* :
+В ней находятся специальные файлы .qrc, содержащие информацию о тех файлах из */аssets*, которые будут собраны в файл ресурсов.

BIN
assets/common/ImprobableGivingAlbertosaurus.gif


BIN
assets/common/background.jpg


BIN
assets/common/book.png


BIN
assets/common/buttons/about_us_button.png


BIN
assets/common/buttons/about_us_button_hover.png


BIN
assets/common/buttons/back_button.png


BIN
assets/common/buttons/back_button_hover.png


BIN
assets/common/buttons/button_click.mp3


BIN
assets/common/buttons/button_hover.mp3


BIN
assets/common/buttons/complete_choice_button.png


BIN
assets/common/buttons/complete_choice_button_hover.png


BIN
assets/common/buttons/continue_button.png


BIN
assets/common/buttons/continue_button_hover.png


BIN
assets/common/buttons/hotseat_button.png


BIN
assets/common/buttons/hotseat_button_hover.png


BIN
assets/common/buttons/leave_game_button.png


BIN
assets/common/buttons/leave_game_button_hover.png


BIN
assets/common/buttons/settings_button.png


BIN
assets/common/buttons/settings_button_hover.png


BIN
assets/common/cursors/click.gif


BIN
assets/common/cursors/simple.gif


BIN
assets/common/dwarf_adventurer_by_vertibirdo-d9dr1c0.gif


BIN
assets/common/fonts/barocco-initial.ttf


BIN
assets/common/fonts/pixel.otf


BIN
assets/common/fonts/viking-cyr.ttf


BIN
assets/common/logo.png


BIN
assets/common/team_logo.jpg


BIN
assets/common/town.jpg


+ 0 - 0
assets/unittrees/README.md → assets/common/unittrees/README.md


+ 0 - 0
assets/unittrees/human-archer.png → assets/common/unittrees/human-archer.png


+ 0 - 0
assets/unittrees/human-mage.png → assets/common/unittrees/human-mage.png


+ 0 - 0
assets/unittrees/human-rider.png → assets/common/unittrees/human-rider.png


+ 0 - 0
assets/unittrees/human-rogue.png → assets/common/unittrees/human-rogue.png


+ 0 - 0
assets/unittrees/human-warrior.png → assets/common/unittrees/human-warrior.png


+ 0 - 0
assets/window/README.md → assets/common/window/README.md


BIN
assets/common/window/button1.png


BIN
assets/common/window/button2.png


BIN
assets/common/window/frame.png


BIN
assets/common/window/opaque-border-botleft.png


BIN
assets/common/window/opaque-border-botright.png


BIN
assets/common/window/opaque-border-bottom.png


BIN
assets/common/window/opaque-border-left.png


BIN
assets/common/window/opaque-border-right.png


BIN
assets/common/window/opaque-border-top.png


BIN
assets/common/window/opaque-border-topleft.png


BIN
assets/common/window/opaque-border-topright.png


BIN
assets/common/window/strong_translucent-background.png


BIN
assets/common/window/strong_translucent-border-botleft.png


BIN
assets/common/window/strong_translucent-border-botright.png


BIN
assets/common/window/strong_translucent-border-left.png


BIN
assets/common/window/strong_translucent-border-right.png


BIN
assets/common/window/strong_translucent-border-top.png


BIN
assets/common/window/strong_translucent-border-topleft.png


BIN
assets/common/window/strong_translucent-border-topright.png


BIN
assets/common/window/strong_translucent-border_bottom.png


+ 0 - 0
assets/window/thick_opaque-background.png → assets/common/window/thick_opaque-background.png


BIN
assets/common/window/thick_opaque-border-botleft.png


BIN
assets/common/window/thick_opaque-border-botright.png


BIN
assets/common/window/thick_opaque-border-bottom.png


BIN
assets/common/window/thick_opaque-border-left.png


BIN
assets/common/window/thick_opaque-border-right.png


BIN
assets/common/window/thick_opaque-border-top.png


BIN
assets/common/window/thick_opaque-border-topleft.png


BIN
assets/common/window/thick_opaque-border-topright.png


+ 0 - 0
assets/effects/README.md


+ 2 - 0
assets/effects/effects.txt

@@ -0,0 +1,2 @@
+melledamage
+selfheal

+ 1 - 0
assets/effects/melledamage/descr.txt

@@ -0,0 +1 @@
+Effect of instance damage to Unit.

BIN
assets/effects/melledamage/icon.png


+ 1 - 0
assets/effects/selfheal/descr.txt

@@ -0,0 +1 @@
+Effect of instance damage to Unit.

BIN
assets/effects/selfheal/icon.png


BIN
assets/hotseat_intro/image.gif


BIN
assets/hotseat_intro/image.psd


+ 0 - 0
assets/recruitscene/README.md → assets/hotseat_recruit/README.md


BIN
assets/hotseat_recruit/icon_closed.png


BIN
assets/hotseat_recruit/image.gif


BIN
assets/hotseat_recruit/unit_icon_active.png


BIN
assets/hotseat_recruit/unit_icon_default.png


BIN
assets/hotseat_recruit/unit_icon_hover.png


BIN
assets/hotseat_recruit/unknown.png


BIN
assets/hotseatpvp/attack_state.png


BIN
assets/hotseatpvp/battle_bg/CmBkCF.png


BIN
assets/hotseatpvp/battle_bg/CmBkCur.png


BIN
assets/hotseatpvp/battle_bg/CmBkDeck.png


BIN
assets/hotseatpvp/battle_bg/CmBkDes.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrDd.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkGrMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkGrTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkHG.png


BIN
assets/hotseatpvp/battle_bg/CmBkLava.png


BIN
assets/hotseatpvp/battle_bg/CmBkMag.png


BIN
assets/hotseatpvp/battle_bg/CmBkRK.png


BIN
assets/hotseatpvp/battle_bg/CmBkRgh.png


BIN
assets/hotseatpvp/battle_bg/CmBkSnMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkSnTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkSub.png


BIN
assets/hotseatpvp/battle_bg/CmBkSwmp.png


Some files were not shown because too many files changed in this diff