SHA1
--- a/.gitignore
+++ b/.gitignore
@@ -105,4 +105,9 @@ CMakeScripts
 
				 Makefile
			
 
				 cmake_install.cmake
			
 
				 install_manifest.txt
			
 
				-TestCellProject
			
 
				+
			
 
				+test
			
 
				+deploy
			
 
				+build
			
 
				+debug
			
 
				+release
			
--- a/README.md
+++ b/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*, которые будут собраны в файл ресурсов.
			
--- a/assets/common/ImprobableGivingAlbertosaurus.gif
+++ b/assets/common/ImprobableGivingAlbertosaurus.gif
--- a/assets/common/background.jpg
+++ b/assets/common/background.jpg
--- a/assets/common/book.png
+++ b/assets/common/book.png
--- a/assets/common/buttons/about_us_button.png
+++ b/assets/common/buttons/about_us_button.png
--- a/assets/common/buttons/about_us_button_hover.png
+++ b/assets/common/buttons/about_us_button_hover.png
--- a/assets/common/buttons/back_button.png
+++ b/assets/common/buttons/back_button.png
--- a/assets/common/buttons/back_button_hover.png
+++ b/assets/common/buttons/back_button_hover.png
--- a/assets/common/buttons/button_click.mp3
+++ b/assets/common/buttons/button_click.mp3
--- a/assets/common/buttons/button_hover.mp3
+++ b/assets/common/buttons/button_hover.mp3
--- a/assets/common/buttons/complete_choice_button.png
+++ b/assets/common/buttons/complete_choice_button.png
--- a/assets/common/buttons/complete_choice_button_hover.png
+++ b/assets/common/buttons/complete_choice_button_hover.png
--- a/assets/common/buttons/continue_button.png
+++ b/assets/common/buttons/continue_button.png
--- a/assets/common/buttons/continue_button_hover.png
+++ b/assets/common/buttons/continue_button_hover.png
--- a/assets/common/buttons/hotseat_button.png
+++ b/assets/common/buttons/hotseat_button.png
--- a/assets/common/buttons/hotseat_button_hover.png
+++ b/assets/common/buttons/hotseat_button_hover.png
--- a/assets/common/buttons/leave_game_button.png
+++ b/assets/common/buttons/leave_game_button.png
--- a/assets/common/buttons/leave_game_button_hover.png
+++ b/assets/common/buttons/leave_game_button_hover.png
--- a/assets/common/buttons/settings_button.png
+++ b/assets/common/buttons/settings_button.png
--- a/assets/common/buttons/settings_button_hover.png
+++ b/assets/common/buttons/settings_button_hover.png
--- a/assets/common/cursors/click.gif
+++ b/assets/common/cursors/click.gif
--- a/assets/common/cursors/simple.gif
+++ b/assets/common/cursors/simple.gif
--- a/assets/common/dwarf_adventurer_by_vertibirdo-d9dr1c0.gif
+++ b/assets/common/dwarf_adventurer_by_vertibirdo-d9dr1c0.gif
--- a/assets/common/fonts/barocco-initial.ttf
+++ b/assets/common/fonts/barocco-initial.ttf
--- a/assets/common/fonts/pixel.otf
+++ b/assets/common/fonts/pixel.otf
--- a/assets/common/fonts/viking-cyr.ttf
+++ b/assets/common/fonts/viking-cyr.ttf
--- a/assets/common/logo.png
+++ b/assets/common/logo.png
--- a/assets/common/team_logo.jpg
+++ b/assets/common/team_logo.jpg
--- a/assets/common/town.jpg
+++ b/assets/common/town.jpg
--- a/assets/common/unittrees/README.md
+++ b/assets/common/unittrees/README.md
--- a/assets/common/unittrees/human-archer.png
+++ b/assets/common/unittrees/human-archer.png
--- a/assets/common/unittrees/human-mage.png
+++ b/assets/common/unittrees/human-mage.png
--- a/assets/common/unittrees/human-rider.png
+++ b/assets/common/unittrees/human-rider.png
--- a/assets/common/unittrees/human-rogue.png
+++ b/assets/common/unittrees/human-rogue.png
--- a/assets/common/unittrees/human-warrior.png
+++ b/assets/common/unittrees/human-warrior.png
--- a/assets/common/window/README.md
+++ b/assets/common/window/README.md
--- a/assets/common/window/button1.png
+++ b/assets/common/window/button1.png
--- a/assets/common/window/button2.png
+++ b/assets/common/window/button2.png
--- a/assets/common/window/frame.png
+++ b/assets/common/window/frame.png
--- a/assets/common/window/opaque-border-botleft.png
+++ b/assets/common/window/opaque-border-botleft.png
--- a/assets/common/window/opaque-border-botright.png
+++ b/assets/common/window/opaque-border-botright.png
--- a/assets/common/window/opaque-border-bottom.png
+++ b/assets/common/window/opaque-border-bottom.png
--- a/assets/common/window/opaque-border-left.png
+++ b/assets/common/window/opaque-border-left.png
--- a/assets/common/window/opaque-border-right.png
+++ b/assets/common/window/opaque-border-right.png
--- a/assets/common/window/opaque-border-top.png
+++ b/assets/common/window/opaque-border-top.png
--- a/assets/common/window/opaque-border-topleft.png
+++ b/assets/common/window/opaque-border-topleft.png
--- a/assets/common/window/opaque-border-topright.png
+++ b/assets/common/window/opaque-border-topright.png
--- a/assets/common/window/strong_translucent-background.png
+++ b/assets/common/window/strong_translucent-background.png
--- a/assets/common/window/strong_translucent-border-botleft.png
+++ b/assets/common/window/strong_translucent-border-botleft.png
--- a/assets/common/window/strong_translucent-border-botright.png
+++ b/assets/common/window/strong_translucent-border-botright.png
--- a/assets/common/window/strong_translucent-border-left.png
+++ b/assets/common/window/strong_translucent-border-left.png
--- a/assets/common/window/strong_translucent-border-right.png
+++ b/assets/common/window/strong_translucent-border-right.png
--- a/assets/common/window/strong_translucent-border-top.png
+++ b/assets/common/window/strong_translucent-border-top.png
--- a/assets/common/window/strong_translucent-border-topleft.png
+++ b/assets/common/window/strong_translucent-border-topleft.png
--- a/assets/common/window/strong_translucent-border-topright.png
+++ b/assets/common/window/strong_translucent-border-topright.png
--- a/assets/common/window/strong_translucent-border_bottom.png
+++ b/assets/common/window/strong_translucent-border_bottom.png
--- a/assets/common/window/thick_opaque-background.png
+++ b/assets/common/window/thick_opaque-background.png
--- a/assets/common/window/thick_opaque-border-botleft.png
+++ b/assets/common/window/thick_opaque-border-botleft.png
--- a/assets/common/window/thick_opaque-border-botright.png
+++ b/assets/common/window/thick_opaque-border-botright.png
--- a/assets/common/window/thick_opaque-border-bottom.png
+++ b/assets/common/window/thick_opaque-border-bottom.png
--- a/assets/common/window/thick_opaque-border-left.png
+++ b/assets/common/window/thick_opaque-border-left.png
--- a/assets/common/window/thick_opaque-border-right.png
+++ b/assets/common/window/thick_opaque-border-right.png
--- a/assets/common/window/thick_opaque-border-top.png
+++ b/assets/common/window/thick_opaque-border-top.png
--- a/assets/common/window/thick_opaque-border-topleft.png
+++ b/assets/common/window/thick_opaque-border-topleft.png
--- a/assets/common/window/thick_opaque-border-topright.png
+++ b/assets/common/window/thick_opaque-border-topright.png
--- a/assets/effects/README.md
+++ b/assets/effects/README.md
--- a/assets/effects/effects.txt
+++ b/assets/effects/effects.txt
@@ -0,0 +1,2 @@
 
				+melledamage
			
 
				+selfheal
			
--- a/assets/effects/melledamage/descr.txt
+++ b/assets/effects/melledamage/descr.txt
@@ -0,0 +1 @@
 
				+Effect of instance damage to Unit.
			
--- a/assets/effects/melledamage/icon.png
+++ b/assets/effects/melledamage/icon.png
--- a/assets/effects/selfheal/descr.txt
+++ b/assets/effects/selfheal/descr.txt
@@ -0,0 +1 @@
 
				+Effect of instance damage to Unit.
			
--- a/assets/effects/selfheal/icon.png
+++ b/assets/effects/selfheal/icon.png
--- a/assets/hotseat_intro/image.gif
+++ b/assets/hotseat_intro/image.gif
--- a/assets/hotseat_intro/image.psd
+++ b/assets/hotseat_intro/image.psd
--- a/assets/hotseat_recruit/README.md
+++ b/assets/hotseat_recruit/README.md
--- a/assets/hotseat_recruit/icon_closed.png
+++ b/assets/hotseat_recruit/icon_closed.png
--- a/assets/hotseat_recruit/image.gif
+++ b/assets/hotseat_recruit/image.gif
--- a/assets/hotseat_recruit/unit_icon_active.png
+++ b/assets/hotseat_recruit/unit_icon_active.png
--- a/assets/hotseat_recruit/unit_icon_default.png
+++ b/assets/hotseat_recruit/unit_icon_default.png
--- a/assets/hotseat_recruit/unit_icon_hover.png
+++ b/assets/hotseat_recruit/unit_icon_hover.png
--- a/assets/hotseat_recruit/unknown.png
+++ b/assets/hotseat_recruit/unknown.png
--- a/assets/hotseatpvp/attack_state.png
+++ b/assets/hotseatpvp/attack_state.png
--- a/assets/hotseatpvp/battle_bg/CmBkCF.png
+++ b/assets/hotseatpvp/battle_bg/CmBkCF.png
--- a/assets/hotseatpvp/battle_bg/CmBkCur.png
+++ b/assets/hotseatpvp/battle_bg/CmBkCur.png
--- a/assets/hotseatpvp/battle_bg/CmBkDeck.png
+++ b/assets/hotseatpvp/battle_bg/CmBkDeck.png
--- a/assets/hotseatpvp/battle_bg/CmBkDes.png
+++ b/assets/hotseatpvp/battle_bg/CmBkDes.png
--- a/assets/hotseatpvp/battle_bg/CmBkDrDd.png
+++ b/assets/hotseatpvp/battle_bg/CmBkDrDd.png
--- a/assets/hotseatpvp/battle_bg/CmBkDrMt.png
+++ b/assets/hotseatpvp/battle_bg/CmBkDrMt.png
--- a/assets/hotseatpvp/battle_bg/CmBkDrTr.png
+++ b/assets/hotseatpvp/battle_bg/CmBkDrTr.png
--- a/assets/hotseatpvp/battle_bg/CmBkGrMt.png
+++ b/assets/hotseatpvp/battle_bg/CmBkGrMt.png
--- a/assets/hotseatpvp/battle_bg/CmBkGrTr.png
+++ b/assets/hotseatpvp/battle_bg/CmBkGrTr.png
--- a/assets/hotseatpvp/battle_bg/CmBkHG.png
+++ b/assets/hotseatpvp/battle_bg/CmBkHG.png
--- a/assets/hotseatpvp/battle_bg/CmBkLava.png
+++ b/assets/hotseatpvp/battle_bg/CmBkLava.png
--- a/assets/hotseatpvp/battle_bg/CmBkMag.png
+++ b/assets/hotseatpvp/battle_bg/CmBkMag.png
--- a/assets/hotseatpvp/battle_bg/CmBkRK.png
+++ b/assets/hotseatpvp/battle_bg/CmBkRK.png
--- a/assets/hotseatpvp/battle_bg/CmBkRgh.png
+++ b/assets/hotseatpvp/battle_bg/CmBkRgh.png
--- a/assets/hotseatpvp/battle_bg/CmBkSnMt.png
+++ b/assets/hotseatpvp/battle_bg/CmBkSnMt.png
--- a/assets/hotseatpvp/battle_bg/CmBkSnTr.png
+++ b/assets/hotseatpvp/battle_bg/CmBkSnTr.png
--- a/assets/hotseatpvp/battle_bg/CmBkSub.png
+++ b/assets/hotseatpvp/battle_bg/CmBkSub.png
--- a/assets/hotseatpvp/battle_bg/CmBkSwmp.png
+++ b/assets/hotseatpvp/battle_bg/CmBkSwmp.png
Autor	SHA1 Zpráva	Datum
GeorgeKolog	ea7814e2da Merge branch 'dev' into cell	před 6 roky
GeorgeKolog	e6b4331e48 added function getPoints. deleted printAll	před 6 roky
Ivan Arkhipov	c2b43c931a Merge branch 'gui' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	87a057f344 Changed font in hint && changed game music	před 6 roky
Ivan Arkhipov	e12142dc3b Merge branch 'gui' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	598cfd84fa Changed units and races raw-pointers to std::shared_ptr, completed recruitment scene rewriting	před 6 roky
Ivan Arkhipov	718cf27c75 Created AboutUs and DialogForm windows, partially reimplemented HotSeat Recrtuitment scene	před 6 roky
Ivan Arkhipov	f1097744bf Peredelana HotSeat battle introduction scene	před 6 roky
Ivan Arkhipov	a21715d1f2 .pro file scripts improvement, refactored source files to follow new project structure	před 6 roky
Ivan Arkhipov	431c329bca Обновить 'README.md'	před 6 roky
Ivan Arkhipov	b592b61fd9 Обновить 'README.md'	před 6 roky
Ivan Arkhipov	36f5fc6173 Renaming skills source files to be able to be compiled in linux	před 6 roky
Ivan Arkhipov	298a0bb093 Renaming files to be able to be compiled in linux	před 6 roky
Ivan Arkhipov	2d1390142e Remaking main_menu scene && adding sound engine && refactoring project structure	před 6 roky
Ivan Arkhipov	cea1dbaa1e Changes in MainWindow & PvP-intro scenes	před 6 roky
Ivan Arkhipov	5793174264 Modified main_menu and pvp_intro scenes	před 6 roky
Ivan Arkhipov	e94ad12908 Removed GUI class, all scenes are fullscreen now	před 6 roky
Ivan Arkhipov	5030d9cebc Renamed and reconfigured file names	před 6 roky
Ivan Arkhipov	db47f2fb26 Fixing dublicating files	před 6 roky
Ivan Arkhipov	1fe765f57b Merge remote-tracking branch 'origin/unit' into dev	před 6 roky
Ivan Arkhipov	a480b5bcb9 Refactoring & project structure improvements	před 6 roky
noath	632e732829 added operate() for Unit, fixed some build errors and codestyle fails (not at all)	před 6 roky
Ivan Arkhipov	5bbb1b878e Filename case changes (part 2), Debian build adaptation	před 6 roky
Ivan Arkhipov	a792d3f7ce Changed source and header filenames to correct UpperCase	před 6 roky
Ivan Arkhipov	7603136207 Merge branch 'gui' into dev. Filenames changes, build system addings (resource files)	před 6 roky
Ivan Arkhipov	0c20c95055 Merge branch 'spelleffects' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	8b1b179ad1 Merge branch 'gamemanager' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	b0854c2cc4 Splitted resources to several files and added release build option to make them out of .exe	před 6 roky
Ivan Arkhipov	5e4d368cbc Hot-seat pvp game model gui realisation	před 6 roky
noath	18b201c1b8 added primal GameManager, added empty Cells print()	před 6 roky
igorbat99	fd5ce3aaaa Done: basic spell/skill model. TODO: Spell:traits	před 6 roky
noath	9932fe8214 added fixes to compile	před 6 roky
igorbat99	d3846026aa add effects	před 6 roky
igorbat99	0ce676c818 did traits	před 6 roky
Ivan Arkhipov	0ca837f3b4 Merge branch 'unit' of GooseHouse/game-client into dev	před 6 roky
noath	32b9548b7e Warrior mechanics and fixes in unit and cell	před 6 roky
igorbat99	ecd9ca323a icons	před 6 roky
igorbat99	53507c8b3b made old gods great again(anf files in true directory)	před 6 roky
Ivan Arkhipov	9c1f93d5bc Merge branch 'cell' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	7a558e85e7 Merge branch 'cell' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	c37c6efb8a Merge branch 'cell' of GooseHouse/game-client into dev	před 6 roky
Ivan Arkhipov	c0812ca1b0 Merge branch 'cell' of GooseHouse/game-client into dev	před 6 roky
igorbat99	2df12b5b2c Interfaces	před 6 roky
igorbat99	39135f7797 make true directory	před 6 roky