12755 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	013417fb7e	Code cleanup	2023-08-21 17:55:49 +03:00
Ivan Savenko	c516b5a64e	Fixes for several discovered edge cases	2023-08-21 17:55:49 +03:00
Ivan Savenko	a1092e0f3f	Fix battle ending	2023-08-21 17:55:49 +03:00
Ivan Savenko	a1d3181a98	Unified spellcasting handling with other actions	2023-08-21 17:55:49 +03:00
Ivan Savenko	6297140bf5	Start of stabilization - battles now start correctly	2023-08-21 17:55:49 +03:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Ivan Savenko	5c78060a07	Moved battle netpack validation to battle processor	2023-08-21 17:55:48 +03:00
Ivan Savenko	323772fc2e	Split CQuery file into multiple files	2023-08-21 17:55:07 +03:00
Ivan Savenko	629ca3f13e	Created directory structure for server files	2023-08-21 17:55:07 +03:00
Ivan Savenko	c217d7717a	server queries is now stored as unique_ptr	2023-08-21 17:55:07 +03:00
Ivan Savenko	e8e6c02a4a	Moved all battle-related functionality of server into a new class	2023-08-21 17:55:06 +03:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Nordsoft91	4edee00a97	Merge pull request #2605 from Laserlicht/map_preview ... Map preview	2023-08-21 14:56:21 +04:00
Michael	05a88bd8ac	another try...	2023-08-20 23:34:09 +02:00
Michael	080630b39f	try to fix	2023-08-20 22:22:46 +02:00
Nordsoft91	2f5bd1423c	Merge pull request #2623 from Nordsoft91/tutorial	2023-08-20 23:20:27 +04:00
Dydzio	78f56df44f	Comment out unused OH3 options so they do not clutter code suggestions ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-08-20 19:11:36 +02:00
Dydzio	b53894ac2d	Add artifact slots backgrounds	2023-08-20 18:57:53 +02:00
Dydzio	3b99f09495	Update backpack icons	2023-08-20 18:25:57 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Michael	5c5576313b	handle long texts better; big window also for only one layer	2023-08-20 16:58:13 +02:00
nordsoft	989a0859ef	Fix tutorial loading	2023-08-20 17:58:40 +04:00
Nordsoft91	ef4fddd0c4	Merge pull request #2570 from Laserlicht/town_selection_window ... Town selection window	2023-08-20 17:37:45 +04:00
Michael	952ce3061b	avoid crash if any error in map	2023-08-20 14:28:10 +02:00
Michael	e3a4c65100	code review	2023-08-20 14:14:47 +02:00
Dydzio	d8eef4905a	Implement new callback in stupidAI	2023-08-20 13:53:25 +02:00
Michael	1d94536299	code review	2023-08-20 13:16:39 +02:00
Michael	52ed824100	add sound; possibility to click outside to close	2023-08-20 13:05:25 +02:00
Ivan Savenko	b92e45d7b4	Merge pull request #2616 from dydzio0614/battle-hero-window-mana-fix ... Fix updating opponent hero spellpoints in battle window	2023-08-20 10:54:30 +03:00
Ivan Savenko	58ee6acb63	Merge pull request #2621 from dydzio0614/kingdom-overview-woodmines-fix ... Fix counting wood mines starting from 8 in kingdom overview	2023-08-20 10:54:13 +03:00
nordsoft	a09cb23a85	Better handling other players for turn timer	2023-08-20 04:06:52 +04:00
Nordsoft91	e283a80146	Merge pull request #2584 from krs0/feature/Remove_wog_artifacts_from_SoD ... Removed WoG artifacts from core. Replaced with unused to avoid crashes.	2023-08-20 03:32:49 +04:00
Dydzio	f24910e5d2	Artifacts backpack window GUI improvements	2023-08-20 00:52:03 +02:00
Dydzio	f409b6ced9	Fix counting wood mines starting from 8 in kingdom overview	2023-08-19 21:09:02 +02:00
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
nordsoft	d4ab3087cb	Disable timer for AI players	2023-08-19 19:00:08 +04:00
nordsoft	2fff74deea	Remove uninitialized variable	2023-08-19 18:59:31 +04:00
Nordsoft91	4a6deedd5e	Merge pull request #2530 from Nordsoft91/tutorial ... Support tutorial	2023-08-19 18:06:15 +04:00
Dydzio	6cb6a6d785	Fix updating opponent hero spellpoints in battle window	2023-08-18 20:24:31 +02:00
Ivan Savenko	5da1a6c412	Merge branch 'android_api_version_bump' into beta	2023-08-18 15:24:59 +03:00
Ivan Savenko	70ddc1f3e5	Merge pull request #2577 from wb180/secondarySkillSerialization ... Preserve order of secondary skills during hero json serialization/deserialization	2023-08-18 15:24:02 +03:00
Ivan Savenko	801c051625	Merge pull request #2613 from vcmi/IvanSavenko-patch-1 ... Fix merge	2023-08-18 15:20:08 +03:00
Ivan Savenko	4c503f8df3	Fix merge	2023-08-18 15:13:38 +03:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Ivan Savenko	f4c20bc33f	Merge pull request #2612 from vcmi/DjWarmonger-patch-2 ... Update README.md	2023-08-18 13:37:26 +03:00
DjWarmonger	e25c070f59	Update README.md ... - Add counter for 1.3.1 - Remove abandoned Coverity status	2023-08-18 12:22:01 +02:00
Ivan Savenko	83b00bb7c3	Merge pull request #2610 from vcmi/master ... Merge master -> beta	2023-08-18 12:56:05 +03:00
DjWarmonger	f9564dc8e4	Merge pull request #2563 from vcmi/fix_resources_near_mines ... Fix resources placed behind mines	2023-08-18 09:12:56 +02:00
Michael	8635c24166	fix	2023-08-18 00:15:47 +02:00