4444 Commits

Author	SHA1	Message	Date
SoundSSGood	a8220c551f	fixed init CArtifactsOfHero	2023-04-23 14:33:47 +03:00
SoundSSGood	177523d972	askToAssemble, askToDisassemble	2023-04-23 14:17:27 +03:00
SoundSSGood	1046964eef	CArtifactHolder	2023-04-23 14:14:24 +03:00
Nordsoft91	a553a4aa66	Merge pull request #2030 from Nordsoft91/boats	2023-04-22 03:27:00 +04:00
Ivan Savenko	80b37a3019	Fixed remaining regressions	2023-04-20 22:19:10 +03:00
Ivan Savenko	bb08a0afc8	Moved selection logic to player state	2023-04-20 22:04:24 +03:00
Ivan Savenko	e8718a46cc	Fix regressions	2023-04-20 22:04:24 +03:00
Ivan Savenko	dd227d24c3	Formatting and cleanup	2023-04-20 22:04:24 +03:00
Ivan Savenko	365f552fa1	Added API for owned towns access	2023-04-20 22:04:24 +03:00
Ivan Savenko	5cbd0f8fc8	API for wandering heroes access	2023-04-20 22:04:24 +03:00
Ivan Savenko	3eac6f323e	added API for sleeping heroes access	2023-04-20 22:04:24 +03:00
Ivan Savenko	6a46138617	Moved current selection to local state class	2023-04-20 22:04:24 +03:00
Ivan Savenko	f6d480cbb2	Moved player-specific heroes & towns information to new class	2023-04-20 22:04:24 +03:00
Ivan Savenko	4a169972f0	Further refactoring to cleanup code of advmap and locplint	2023-04-20 22:04:24 +03:00
Ivan Savenko	20de44d4a5	Reodered methods in file to group similar code	2023-04-20 22:04:24 +03:00
Ivan Savenko	7db67a3101	int3 now has proper hasher function	2023-04-20 22:04:24 +03:00
Ivan Savenko	4ec32e4dcd	Renamed CAdvMapInt to its proper full name	2023-04-20 22:04:24 +03:00
Ivan Savenko	f1902ab247	Initial refactoring to encapsulate adventure map	2023-04-20 22:03:28 +03:00
nordsoft	de159df481	Rename boats	2023-04-20 21:20:51 +04:00
Ivan Savenko	24c6587072	Fixed crash on leaving to main menu from battle in hotseat mode	2023-04-20 19:56:35 +03:00
Ivan Savenko	f245080cba	Fix missing error message on casting spell in hotseat	2023-04-20 19:24:13 +03:00
nordsoft	753b72f96d	Revert "Hidden maps" ... This reverts commit e669d31d33.	2023-04-20 19:50:00 +04:00
Ivan Savenko	6df85be4b3	Fixed death animation of Efreeti killed by petrification attack	2023-04-20 18:13:01 +03:00
Ivan Savenko	5c9ae8aafc	Implemented spell range overlay for Dimension Door and Scuttle Boat	2023-04-20 14:15:08 +03:00
Ivan Savenko	b3207f3465	RMG tab will now show all templates but will block invalid map sizes	2023-04-19 23:14:23 +03:00
Ivan Savenko	b517adfb25	Fixed crash on empty save game list after filtering	2023-04-19 23:12:30 +03:00
Ivan Savenko	3d30e04184	Fixed centering of scenario information window	2023-04-19 23:11:44 +03:00
Ivan Savenko	4bb4d7e7a5	Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 ... Artifact related code refactoring part1 (initial)	2023-04-19 15:31:11 +03:00
nordsoft	f464ca3560	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign ... # Conflicts: # lib/mapping/CCampaignHandler.cpp	2023-04-19 02:45:49 +04:00
nordsoft	0a28262c15	Merge remote-tracking branch 'upstream/develop' into boats ... # Conflicts: # AI/VCAI/Pathfinding/AINodeStorage.cpp	2023-04-19 02:22:19 +04:00
nordsoft	d1dacd45e2	Animations from config	2023-04-19 00:14:15 +04:00
Ivan Savenko	e8788cf4c4	Merge pull request #1999 from Laserlicht/patch-2 ... Big/Vector Icons	2023-04-18 16:23:00 +03:00
Ivan Savenko	56de0c9f56	Merge pull request #2015 from rilian-la-te/optional-variant-any ... vcmi: migrate to C++17	2023-04-18 15:44:52 +03:00
nordsoft	ed798b06da	Prepare transport enum	2023-04-18 13:04:49 +04:00
nordsoft	2babb5add5	Fix boat extra animations	2023-04-17 23:39:34 +04:00
nordsoft	80220fda5b	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign ... # Conflicts: # lib/mapping/CMap.h	2023-04-17 04:54:57 +04:00
nordsoft	91b4782a2f	Refactor more fields from campaign header	2023-04-17 04:47:54 +04:00
nordsoft	70f4cc5e0f	Refactor campaign regions	2023-04-17 04:26:35 +04:00
krs	91c96b1b68	Fix for merge.	2023-04-17 00:53:25 +03:00
Konstantin	54eb550eb9	vcmi: remove unused functions now	2023-04-17 00:43:13 +03:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
Konstantin	0d35606a44	vcmi: use std::variant	2023-04-17 00:43:13 +03:00
krs	14cbdf7ab0	Split Process console commands code into individual functions ... Extracted functions for each if branch, added one line doc for each function, rearranged the commands to be groupped more logically.	2023-04-16 23:45:37 +03:00
Ivan Savenko	e3ed728193	Merge pull request #1932 from rilian-la-te/proper-teleport ... VCMI: teleport redesign	2023-04-16 22:52:01 +03:00
nordsoft	954a2abb71	Verifying mods before starting map	2023-04-16 15:38:13 +04:00
Michael	d64106b700	Update generate_icns.py	2023-04-16 12:33:35 +02:00
Ivan Savenko	1704fab3a2	Fix assertion failure on fighting against AI with tactics	2023-04-15 17:20:38 +03:00
Ivan Savenko	cc8c1c769a	Fix duplicated maps in scenario selection screen	2023-04-15 17:20:38 +03:00
Ivan Savenko	de855085f0	Added information on banks, seer hut and monster properties	2023-04-15 17:20:38 +03:00
Ivan Savenko	3738171b21	Refactoring of H3M loader to make HotA format support easier ... - extracted low-level reader from MapFormatH3M class - added separate structure to define version-specific values - cleared up some H3M format edge cases - replaced witch hut skill vector with set - converted several fields to enum type	2023-04-15 17:20:38 +03:00
Laserlicht	c6458762ce	fix	2023-04-15 13:15:51 +02:00
Laserlicht	62ccb2d1da	Add different sizes	2023-04-15 13:13:44 +02:00
Laserlicht	6e22663121	new icons	2023-04-15 12:52:11 +02:00
Laserlicht	0c1c7bc24b	ico	2023-04-15 12:38:35 +02:00
Michael	37fb77521b	Update generate_icns.py	2023-04-15 12:33:24 +02:00
Nordsoft91	6b12ee044f	Merge pull request #1969 from Nordsoft91/spectator ... Single player spectator	2023-04-15 03:33:18 +04:00
SoundSSGood	9a838598a6	arts refactoring part1	2023-04-15 00:10:39 +03:00
Ivan Savenko	b354f99cc3	Merge pull request #1936 from IvanSavenko/cpp_17_upgrade ... Upgrade c++ standard to c++17	2023-04-14 19:21:17 +03:00
Ivan Savenko	128764b1c9	Merge pull request #1968 from rilian-la-te/fix-caster-tactics ... Fix caster tactics	2023-04-14 18:59:03 +03:00
Ivan Savenko	44b83b2e11	Merge master -> develop	2023-04-14 16:51:35 +03:00
nordsoft	289259f64a	Unblock spectator interface during AI turns	2023-04-14 00:22:47 +04:00
nordsoft	35fa06008b	Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c" ... This reverts commit 129b15a49c911315789721b7e62b93757819519a.	2023-04-14 00:20:51 +04:00
nordsoft	413870d39a	Revert "Single player spectator" ... This reverts commit b9e5e42647.	2023-04-14 00:18:29 +04:00
Ivan Savenko	1978e6f8e8	Do not show unit information on dead creatures	2023-04-13 21:16:55 +03:00
nordsoft	b9e5e42647	Single player spectator	2023-04-13 13:12:00 +04:00
nordsoft	e28dd128e0	Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c" ... This reverts commit 46d35541b453b6c026c457bf0c788f79311968b3.	2023-04-13 12:45:10 +04:00
Konstantin P	384ee99834	vcmi: configurable teleport v2 ... 1. Redesign wall and teleport penalty using shortest path This will avoid OH3 exploits with teleport inside walls 2. Teleport is now configurable	2023-04-13 11:24:19 +03:00
Konstantin	bc1aad3b26	vcmi: remove deprecated CStack::getCreature() ... Function battle::Unit::unitType() does the same.	2023-04-13 11:24:19 +03:00
Konstantin	8397bd91fb	BattleActionsController: do not pass unused caster ... This is unused, so, remove this parameter to prepare for teleport action	2023-04-13 11:24:19 +03:00
Konstantin	15031d2e16	vcmi: do not block interface on setup spells	2023-04-13 01:06:36 +03:00
nordsoft	fb4db41891	Single player spectator	2023-04-13 02:01:13 +04:00
nordsoft	f005dbbc14	Spectator mode	2023-04-13 00:59:44 +04:00
nordsoft	e669d31d33	Hidden maps	2023-04-12 02:44:17 +04:00
Ivan Savenko	644f0f4b32	Removed ARRAY_COUNT in favor of std::size	2023-04-12 01:04:26 +03:00
Ivan Savenko	506c3d29bc	Replaced vstd clamp with std version	2023-04-12 01:03:14 +03:00
Ivan Savenko	5f74aca341	Fix missing attribute	2023-04-12 01:03:14 +03:00
Ivan Savenko	63b197b78a	Converted attributes to use c++17 functionality	2023-04-12 01:03:14 +03:00
nordsoft	30281d5991	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign	2023-04-11 21:44:31 +04:00
Nordsoft91	3951bbb395	Merge pull request #1108 from Nordsoft91/battle-dialog ... [HDMod features] Quick combat	2023-04-11 21:18:04 +04:00
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
nordsoft	39f4bc0072	Reset battle bonuses on client side	2023-04-11 17:25:19 +04:00
nordsoft	8e77b833d9	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 15:54:08 +04:00
Ivan Savenko	e25cd7f90f	Merge pull request #1934 from IvanSavenko/beta_fixes ... Fixed bugs for 1.2 release	2023-04-11 11:08:40 +03:00
Ivan Savenko	ff66592fad	Merge pull request #1882 from rilian-la-te/native-terrain-refactor ... Native terrain refactor	2023-04-11 02:14:37 +03:00
nordsoft	bfc75ccd39	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 02:22:42 +04:00
Nordsoft91	ebd17c9e4a	Merge pull request #1928 from Nordsoft91/cast-reward ... Spell cast reward	2023-04-10 22:49:36 +04:00
Konstantin	fedf7d377c	vcmi: remove TFaction ... This is a huge change and will break save compatibility	2023-04-10 19:28:16 +03:00
Ivan Savenko	42b2be4bbb	Merge pull request #1908 from SoundSSGood/art-client-server-fixes ... Artifact related fixes	2023-04-10 18:26:49 +03:00
Konstantin	40bea35a26	CHeroWindow: fix picked art mana limit display	2023-04-10 15:35:21 +03:00
Ivan Savenko	07230f3b47	Attempt to fix stack splitting on macos	2023-04-10 14:34:17 +03:00
Ivan Savenko	02c9a3f3d8	Correctly reset UI on aborting Clone/Sacrifice	2023-04-10 14:33:24 +03:00
nordsoft	c0b90432cb	Change callback interface	2023-04-10 05:40:03 +04:00
nordsoft	e440343921	Bypass initial version of spell callback	2023-04-10 04:34:24 +04:00
Ivan Savenko	e2d0cd37e4	Merge pull request #1910 from IvanSavenko/beta_fixes ... Fixes for 1.2 branch	2023-04-09 20:09:03 +03:00
Ivan Savenko	6e90c0fd09	Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot ... Fix initialization of spell effects registry	2023-04-09 20:07:29 +03:00
nordsoft	08809f1cdc	String building id	2023-04-09 04:53:06 +04:00
nordsoft	307fb071a2	VCMI campaign format support prototype	2023-04-09 03:24:40 +04:00
nordsoft	9e5e1aebbc	Remove hardcoded campaign screens	2023-04-09 00:16:11 +04:00
Adriankhl	1d6192ca62	Shut down the thread for tactic phase properly	2023-04-08 22:52:46 +04:00
Ivan Savenko	84af64ce6b	Removed magical initialization of registry via static variables	2023-04-08 21:29:04 +03:00
krs	7eda4b6c1e	replaced SDLK_LSHIFT check with GH.isKeyboardShiftDown()	2023-04-08 20:42:37 +03:00
krs	3194999809	Add SHIFT + hover shortcut to show movement highlight while pressed.	2023-04-08 20:42:37 +03:00
krs	aba5840a6f	Removed Max Movement Highlight stubs	2023-04-08 20:40:30 +03:00
krs	1644cab938	Added combat option Highlight Movement on Hover	2023-04-08 20:40:30 +03:00
krs	9012a25276	Stub For Max Movement Range highlight ... When a creature is hovered., besides movement, for max possible movement, a hex in center of map is now highlighted.	2023-04-08 20:39:59 +03:00
krs	51ad49532b	Fix for wrong merge :(	2023-04-08 20:39:59 +03:00
krs	dab07bdef9	Now unit range is shown in Tactics phase as well ... A new parameter: isActiveStack was needed in battleGetAvailableHexes, so that we show the propper Tactics range.	2023-04-08 20:39:59 +03:00
krs	e1c388465a	HD mod highlighting of movement for hovered stack. ... Does not work as intended in tactics mode.	2023-04-08 20:39:59 +03:00
nordsoft	50115c3113	Rename variables	2023-04-08 20:56:05 +04:00
Ivan Savenko	454168897e	Fix handling of invalid hotkeys in configurable UI	2023-04-08 19:53:13 +03:00
Ivan Savenko	71ddaeea6e	Fix crash on missing music file	2023-04-08 19:47:16 +03:00
Ivan Savenko	4d37686eb3	Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll ... InfoBar: disable scrollbar	2023-04-08 19:12:48 +03:00
Ivan Savenko	d00fa5bf86	Merge pull request #1887 from Adriankhl/fix_dropbox_left_click ... Fix: close dropbox with left mouse click outside of the dropbox	2023-04-08 19:11:50 +03:00
Ivan Savenko	0abc00f82e	Fix assertion failure in in-game console	2023-04-08 18:53:47 +03:00
Ivan Savenko	3dedc963f7	Fix double-playing of battle effects	2023-04-08 18:53:28 +03:00
SoundSSGood	e58be8e7f7	vcmiartifacts fixed	2023-04-08 12:28:53 +03:00
Ivan Savenko	e35a1ba471	Merge pull request #1876 from rilian-la-te/refactoring-v1 ... VCMI Refactoring	2023-04-08 11:14:05 +03:00
Konstantin	50c9a57133	InfoBar: fix tiny selection with data	2023-04-08 01:44:08 +03:00
nordsoft	52b53ab307	Feature and setting implemented	2023-04-08 01:49:59 +04:00
SoundSSGood	ea7dd14d8b	client is able to erase artifact	2023-04-08 00:41:55 +03:00
Konstantin	f8c15f3a4b	InfoBar: disable scrollbar	2023-04-07 20:50:47 +03:00
Ivan Savenko	c675e6878a	Merge pull request #1878 from IvanSavenko/fix_battle_ui ... Fix visual glitches in battle UI	2023-04-07 12:41:29 +03:00
nordsoft	b1d06b6141	Complete quick combat feature	2023-04-06 22:49:38 +04:00
nordsoft	e85593dbb3	Save & restore mana	2023-04-06 21:19:46 +04:00
Adriankhl	57409a0d94	fix: close dropbox with left mouse click outside of the dropbox	2023-04-06 18:32:21 +02:00
nordsoft	3e28b58c80	Fixes	2023-04-06 19:59:22 +04:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Ivan Savenko	a3c5f75600	Fix visibility of alternative actions button in tactics stage	2023-04-05 18:36:10 +03:00
Ivan Savenko	cf966015bb	Correctly update battle queue state after changing its state	2023-04-05 18:35:45 +03:00
Konstantin	e0715a76c8	vcmi: reduce CStack usage a little bit	2023-04-04 23:02:54 +03:00
Ivan Savenko	0770a1a153	TTF fonts can now be used as fallback for H3 fonts	2023-04-04 22:23:32 +03:00
Ivan Savenko	307065a633	Merge beta into develop	2023-04-04 16:06:20 +03:00
Ivan Savenko	5b480124b8	Merge pull request #1862 from IvanSavenko/fix_garrison_move_shortcut ... Space and left-clicking on second hero in town now have share code	2023-04-04 11:23:19 +03:00
Ivan Savenko	d6cb513374	Merge pull request #1858 from IvanSavenko/sliders_fix ... Allow defining active areas for sliders.	2023-04-04 11:21:45 +03:00
Ivan Savenko	93b77d0c99	Space and left-clicking on second hero in town now have share code	2023-04-03 00:43:18 +03:00
Ivan Savenko	507d8bf7fd	Allow defining active areas for sliders. Fixes settings window.	2023-04-02 22:24:07 +03:00
Ivan Savenko	c661419897	Merge pull request #1700 from rilian-la-te/resource-array ... Modernize resourceSet.	2023-04-02 20:12:45 +03:00
Ivan Savenko	efbc5cf581	Merge pull request #1815 from IvanSavenko/beta_fixes ... Beta fixes	2023-04-02 20:02:41 +03:00
Ivan Savenko	519513e512	Merge pull request #1830 from SoundSSGood/beta ... Graphical glitches fixed	2023-04-01 23:14:13 +03:00
SoundSSGood	348684f93e	Graphical glitches fixed	2023-04-01 16:15:10 +03:00
krs	a8f13bb927	Add RALT key check for movement info	2023-04-01 00:20:51 +03:00
Ivan Savenko	e9aed2761c	Fix target selection for teleport	2023-03-31 23:18:45 +03:00
Ivan Savenko	4c6dbb5037	Fix town UI update on building new structures	2023-03-31 23:18:45 +03:00
Ivan Savenko	839172cd30	Do not attempt to play animations when map is inactive	2023-03-31 23:18:45 +03:00
Adriankhl	8c5c943da9	Show movement cost immediately after pressing left alt key	2023-03-31 17:48:31 +02:00
Konstantin	c1fd7309ad	ResourceSet: composition	2023-03-31 14:00:49 +03:00
Ivan Savenko	ea1d177c9b	Fixed false error messages on game startup	2023-03-31 01:28:56 +03:00
Ivan Savenko	6e28b6ed90	Do not crash on invalid callback name	2023-03-31 01:28:33 +03:00
Konstantin	d83e58f948	vcmi: use new animation functions in client	2023-03-31 01:01:25 +03:00
Konstantin	eff41f66ed	vcmi: now obstacles can have disappearing anim ... It is a reverse version of appearingAnimation.	2023-03-31 01:01:25 +03:00
Konstantin	7543fdf787	vcmi: add reverse effect animation type ... To be used later with obstacle removal	2023-03-31 01:01:25 +03:00
Konstantin	c4d5a7a2d6	vcmi:towns now can choose if moat render is needed ... Using invalid points. Also removed unused variable.	2023-03-31 01:01:25 +03:00
Ivan Savenko	46ccd65080	Removed largely unused signal handling, fixes build with musl c library	2023-03-30 14:56:13 +03:00
Konstantin	5716925b47	NetPacks: change GiveBonus enum to enum class.	2023-03-30 12:41:17 +03:00
Ivan Savenko	1084da00df	Fix initial value of sound/music labels in settings	2023-03-30 12:23:47 +03:00
Ivan Savenko	484f0a175a	Blocked movement of war machines in tactics phase	2023-03-30 12:20:13 +03:00
Ivan Savenko	974be97e6d	Merge pull request #1792 from IvanSavenko/happy_dydzio ... Fixes for beta - graphical artifacts	2023-03-30 00:11:19 +03:00
Ivan Savenko	a42dc923e4	Remove hardcoded constant	2023-03-29 14:33:44 +03:00
Ivan Savenko	1fcaeba8e0	Fix stack amount boxes flickering between actions	2023-03-29 13:21:43 +03:00
Ivan Savenko	3af829e6af	Fix stack label position updates	2023-03-29 13:03:40 +03:00
Ivan Savenko	0c023347dd	Fix potential nullptr dereference	2023-03-28 23:50:57 +03:00
Ivan Savenko	06f9759aee	Fix crash on using Teleport/Sacrifice spells	2023-03-28 23:50:42 +03:00
Ivan Savenko	0ce06e0f30	Improved rendering of stack amount boxes	2023-03-28 23:50:22 +03:00
Ivan Savenko	2cca15c2db	Fix graphical artifact in hero movement animation	2023-03-28 22:37:53 +03:00
Ivan Savenko	9062d67f80	Fixed volume of ambient sounds	2023-03-28 18:56:44 +03:00
Ivan Savenko	238de8a5d7	Properly disable combat panel during spell targeting	2023-03-28 18:14:09 +03:00
Ivan Savenko	47e774897d	Show simple message on left-clicking empty buildings	2023-03-28 17:36:46 +03:00
Ivan Savenko	fd3f80e860	Fix game hang on invalid shooter animation config	2023-03-28 17:04:18 +03:00
Ivan Savenko	b2f5042942	Merge pull request #1783 from vcmi/beta ... Merge beta -> develop	2023-03-27 21:21:25 +03:00
Ivan Savenko	b875da108b	Merge pull request #1717 from SoundSSGood/backpack-limit-size ... Introducing backpack size limit functionality	2023-03-27 17:17:49 +03:00
Konstantin	1b893fa525	client: do not show obstacles placed by another player	2023-03-26 21:23:54 +03:00
Ivan Savenko	da3a05bc8b	Fix special colors in battle	2023-03-26 00:46:21 +02:00
Ivan Savenko	4c311da21b	Clamp potential kills tooltip to target unit size	2023-03-26 00:07:21 +02:00
Ivan Savenko	5857ad0169	Fix corrupted UI redraw in artifact merchant	2023-03-25 23:54:51 +02:00
Ivan Savenko	c246cadaa7	Fix potential crash on exit	2023-03-25 23:54:51 +02:00
Ivan Savenko	46461e5c33	Improve performance of window redraws	2023-03-25 23:54:51 +02:00
Ivan Savenko	4eed0b2c9e	Added workaround for Dungeon towers	2023-03-25 23:54:51 +02:00
Ivan Savenko	49fa628e9b	Turret creature cutoff position should match H3	2023-03-25 23:54:51 +02:00
Ivan Savenko	dcff463d36	Fixed handling of special palette colors in palette transformations ... Fixes black color turning semi-transparent in some creatures from mods	2023-03-25 23:54:51 +02:00
Ivan Savenko	2167cb2a68	Fix battle startup with "no intro sound" mod	2023-03-25 23:54:51 +02:00
Ivan Savenko	339bbce7b7	Added more checks to avoid potential nullptr dereference crash	2023-03-25 23:54:51 +02:00
Ivan Savenko	5288e3761e	Merge pull request #1764 from IvanSavenko/selectable_spellcaster ... Implemented support for multi-spell casters	2023-03-25 20:08:47 +02:00
Ivan Savenko	786035085a	Merge pull request #1770 from Adriankhl/fix_label_update_on_hit ... Process attack/attacked animation before dealing damage to units	2023-03-25 20:06:23 +02:00
Ivan Savenko	6f631a0aa7	Merge pull request #1759 from IvanSavenko/kills_in_tooltip ... Show potential kill amount in attack tooltip	2023-03-25 20:03:27 +02:00
Ivan Savenko	382fbf423d	Merge pull request #1762 from IvanSavenko/reactivation_fix ... Do not activate new items when parent widget is inactive	2023-03-25 20:02:46 +02:00
Adriankhl	792ea2f06f	Process attack/attacked animation before dealing damage to units	2023-03-25 15:00:25 +01:00
Ivan Savenko	9a19feaf4a	Fix spellcasters with massive spells	2023-03-25 01:23:49 +02:00
Ivan Savenko	dc099b2a35	Implemented support for multi-spell casters	2023-03-25 00:48:14 +02:00
Adriankhl	76a71226a2	Deactivate activeStack during spellCast	2023-03-24 22:43:41 +01:00
Ivan Savenko	b0a3f95d20	Do not activate new items when parent widget is inactive	2023-03-24 18:56:38 +02:00
Ivan Savenko	970981cfc9	Show information on potential kills in attack tooltip	2023-03-24 17:18:47 +02:00
Adriankhl	49662f6f36	Deactivate activeStack when auto combat starts	2023-03-23 22:37:39 +01:00
Ivan Savenko	31147ac83b	refactoring: TDmgRange pair -> DamageRange struct	2023-03-23 17:49:33 +02:00
Ivan Savenko	a8fe8c0f3b	Converted timer event into tick event that is called every frame	2023-03-22 23:10:50 +02:00
Ivan Savenko	8af76947cb	Do not cache hovered tile and always update state	2023-03-22 19:49:57 +02:00
Ivan Savenko	fa9abf6adc	Lock UI while adventure map has animations	2023-03-22 19:49:24 +02:00
Ivan Savenko	54e8abb3eb	Fix map animation playback speed	2023-03-22 15:51:25 +02:00
Ivan Savenko	ef07935fbc	Update town visual when new structure is built	2023-03-22 14:41:36 +02:00
Ivan Savenko	c81d57ab8c	Remove excessive totalRedraw's	2023-03-22 00:57:08 +02:00
Ivan Savenko	a78f7de9cd	Fix crash on defeating hero in boat	2023-03-22 00:38:55 +02:00
SoundSSGood	19096f39f0	Backpack limit. Amount of fixes.	2023-03-21 22:11:42 +02:00
Ivan Savenko	bb03abdce6	Fix crash on switching players in hotseat	2023-03-21 19:06:38 +02:00
Ivan Savenko	bfe7bb11ab	Fix crash on winning scenario	2023-03-21 18:40:48 +02:00
Ivan Savenko	9dceed4f56	Merge pull request #1729 from IvanSavenko/battle_animation_fixes ... Fixes for battle UI regressions	2023-03-21 14:32:45 +02:00
Ivan Savenko	4968ac58b4	Do not abort battle opening sound, only allow actions	2023-03-21 13:49:19 +02:00
SoundSSGood	f0f9eecf97	Backpack limit part5. End of battle. Other stuff	2023-03-21 12:14:33 +02:00
SoundSSGood	9f8aa25297	Backpack limit part4 (Using cheats, buying)	2023-03-21 12:14:33 +02:00
SoundSSGood	e23766280f	Backpack limit part2 (Pick up, Dig up, Object rewards)	2023-03-21 12:14:33 +02:00
SoundSSGood	96e8a1f21c	Backpack limit part1 (move, disassemble)	2023-03-21 12:14:33 +02:00
SoundSSGood	72122fb433	CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization	2023-03-21 12:14:33 +02:00
Ivan Savenko	4919550a19	Show a message that battle intro can be skipped	2023-03-20 21:58:32 +02:00
Ivan Savenko	2864a04bda	Minor refactoring	2023-03-20 20:19:05 +02:00
Ivan Savenko	31b718898a	Fix playback of shooter animations at max speed	2023-03-20 20:19:05 +02:00
Ivan Savenko	688b8db3eb	Removed delays due to thread waits from battle animations	2023-03-20 20:19:05 +02:00
Konstantin	5462a92930	Fix #1688 again	2023-03-18 01:19:41 +03:00
Ivan Savenko	dfd6998a9e	Merge pull request #1702 from IvanSavenko/disable_client_state_load ... Disable loading of client save game	2023-03-17 22:15:18 +02:00
Adriankhl	4718396f5f	Prevent crashing when pressing auto-combat button on enemy turn	2023-03-17 15:40:14 +01:00
Ivan Savenko	a3059033f2	Fixes broken client state, e.g. movement. Effectively reverts #1663	2023-03-17 16:00:47 +02:00
Konstantin	bbbbfe00f0	Modernize resourceSet	2023-03-17 02:26:54 +03:00
Ivan Savenko	21407b26dd	Fix minimap redraw on fow reveal	2023-03-16 18:36:31 +02:00
Ivan Savenko	a0e9e01b48	Renamed & reorganized all game mechanics settings names	2023-03-16 18:11:35 +02:00
Ivan Savenko	383387ef29	Integrated defaultMods into mod system	2023-03-16 17:55:09 +02:00
Konstantin	4c4498b22a	vcmi: modernize rest of lib	2023-03-16 17:55:20 +03:00
Konstantin	ebbc8cf208	vcmi: remove BLOCK_LUCK bonus ... To block a luck, just set both INDEPENDENT_MAX and INDEPENDENT_MIN to 0 of LUCK bonus	2023-03-16 16:46:42 +03:00
Konstantin	c07e74250b	vcmi: remove BLOCKS_MORALE bonus ... To block morale, just set INDEPENDENT_MAX and INDEPENDENT_MIN to 0, there is no need for separate bonus.	2023-03-16 16:46:42 +03:00
Konstantin	9205ef2c91	vcmi: skill-agnostic ballistics ... Made ballistics by using spell action and more code is shared now.	2023-03-16 16:46:41 +03:00
Konstantin	84f53485e2	vcmi: skill-agnostic first aid ... Now first aid is passive battle spell, and skill just bumps specific spell power for this spell. Everything about healing is handled into Heal spell effect.	2023-03-16 16:46:41 +03:00
Konstantin	a0987313ba	vcmi: convert intelligence ... Intelligence is converted to both global effect and skill bonus Bonus name HERO_MANA_PER_TEN_KNOWLEDGE is a little weird, but works like old SECONDARY_SKILL_PREMY bonus	2023-03-16 16:46:41 +03:00
Konstantin	f264c541fb	vcmi: skill-agnostic tactics ... Tactics is split to 2 bonuses, and it is now possible to block tactics without having tactics itself. But tactics for two sides is not implemented, because it is huge rework and not high priority for me now, I want to do basic secondary skill rework first.	2023-03-16 16:46:41 +03:00
Konstantin	300a8a15ba	vcmi: remove estates bonus ... Now it is handled by GENERATE_RESOURCE::GOLD.	2023-03-16 16:46:41 +03:00
Konstantin	34a26580a7	vcmi: skill-agnostic resistance ... Uses exiting bonus and new PERCENT_TO_TARGET_TYPE value type	2023-03-16 16:46:41 +03:00
Ivan Savenko	129b5313c5	Merge pull request #1663 from Adriankhl/fix_load_sleeping_heroes ... Fix client data deserialization, such as sleepingHeroes	2023-03-16 15:05:18 +02:00
Ivan Savenko	865f9f7d2b	Merge pull request #1511 from IvanSavenko/launcher_welcome_page ... Add welcome/setup page to Laucher	2023-03-16 15:04:49 +02:00
Ivan Savenko	962f7ac4de	Merge pull request #1682 from IvanSavenko/h3m_text_export ... H3M/H3C text export	2023-03-16 14:50:57 +02:00
Ivan Savenko	77f92e56ac	Merge pull request #1689 from IvanSavenko/map_renderer_fixes ... Map renderer fixes	2023-03-16 14:48:57 +02:00
Ivan Savenko	dc926aac03	Merge pull request #1690 from rilian-la-te/fixup-infobars ... Fix yellow text rendering.	2023-03-16 14:47:43 +02:00
Ivan Savenko	2a2af34788	Merge pull request #1650 from SoundSSGood/arts-swap-regression-fix ... Arts swap regression fixed	2023-03-16 14:47:31 +02:00
Ivan Savenko	a065fb2e6d	Fix scrolling area bounds while in world view mode	2023-03-15 14:47:23 +02:00
Konstantin	c497f17dd1	TextControls: fix centering of the yellow text	2023-03-15 14:35:55 +03:00
Konstantin	4ab9cdd75a	infobar: fix tiny rendering	2023-03-15 14:35:34 +03:00
Ivan Savenko	d3533150b8	Fix misplaced width/height in UI	2023-03-15 12:17:08 +02:00
Ivan Savenko	87eab92290	Fix crash on killing hero in boat & visual artifacts from whirpool	2023-03-15 00:31:51 +02:00
Ivan Savenko	39f2bef1ab	Update town visual on capturing	2023-03-15 00:30:58 +02:00
Ivan Savenko	844bf9b9ab	Do not play embark/disembar sound during enemy turn	2023-03-15 00:30:19 +02:00
Ivan Savenko	f988a67fbf	Fix movement animation on revealing FoW	2023-03-15 00:29:12 +02:00
Ivan Savenko	d2152d387f	Fix processing of VCMI_Tests map	2023-03-14 21:48:39 +02:00
Ivan Savenko	f42a894723	Implemented h3c translations	2023-03-14 19:46:15 +02:00
Ivan Savenko	a4ef9fd0b8	Added h3m strings generation to 'convert txt' command	2023-03-14 17:54:37 +02:00
Ivan Savenko	369e925af8	Loading of translation mods is now skipped on language mismatch	2023-03-14 16:02:16 +02:00
Adriankhl	18be7d5261	Remove redundant client access to server save game files and redundant includes	2023-03-13 12:27:13 +01:00
Ivan Savenko	e1310f88e3	Merge pull request #1675 from rilian-la-te/scholar-infobox ... Fix #1385 and similar	2023-03-13 12:49:30 +02:00
Adriankhl	113527c80c	Fix paths deserialization	2023-03-13 11:04:06 +01:00
Adriankhl	eba4e4dd2c	No longer save/load common game state to/from client file	2023-03-13 10:10:44 +01:00
Konstantin	40222e3f77	vcmi: fix week animation	2023-03-13 01:22:19 +03:00
Konstantin	18200d1d98	vcmi: move getEstimatedComponentHeight	2023-03-13 00:24:26 +03:00
Konstantin	b4940ee247	vcmi: allow showing no more than 8 components ... In InfoWindow there is no place for more than 8 components. Better to have more annoying windows than window which cannot be closed Slider may be better of course, but I cannot do it for now.	2023-03-13 00:24:26 +03:00
Adriankhl	f054064322	Load client data (e.g. sleepingHeroes) from local file if possible	2023-03-12 21:54:51 +01:00
Konstantin	4df4a872c0	showInfoDialog: fix waitWhileDialog regression	2023-03-12 15:01:48 +03:00
Konstantin	3d33da0a9e	vcmi: request pop all when hero is moved ... This way new pickup will show immidately.	2023-03-11 21:41:57 +03:00
Konstantin	bf67784840	vcmi: correctly show spells from SpellInt.def	2023-03-11 21:41:57 +03:00
Konstantin	de211e9f13	vcmi: all notifications now shows inside the infobar properly ... No more dangling images or text.	2023-03-11 21:41:57 +03:00
Konstantin	bc228a938a	vcmi: use enum class for EComponentType ... There is really no reason not to use it	2023-03-11 21:41:57 +03:00
Konstantin	2bd74e5c67	vcmi: use small icons for medium components ... It makes more sense due to current UI implementation. It is better to have icon smaller than have icons overlap	2023-03-11 21:41:57 +03:00
Konstantin	1ca89c8492	vcmi: implement splitting by ID in infobar ... This will get a much better result than naive sorting	2023-03-11 21:41:57 +03:00
Konstantin	8a05f5bed7	vcmi: allow set font size on component ... Now it is possible to set arbitrary font size for CComponent. So, let's use it	2023-03-11 21:41:57 +03:00
Konstantin	716dd9a43b	vcmi: remove a bunch of duplicated showInfoDialog ... These methods duplicated in almost every map object Just replace it by one such method	2023-03-11 21:41:57 +03:00
Konstantin	a6cb7fd192	vcmi: allows to more than 8 components in infobar	2023-03-11 21:41:57 +03:00
Konstantin	a0c644a0e5	vcmi: actually implement AUTO for CInfoWindow ... This is possible to use infobar interactions now.	2023-03-11 21:41:57 +03:00
Konstantin	75358a68a7	vcmi: name infobar height and width	2023-03-11 21:41:57 +03:00
Konstantin	da8840c499	CComponent: do not always assume 80 for text	2023-03-11 21:41:57 +03:00
Konstantin	7a04c28815	vcmi: remove pickupSounds set ... It is unused now, resource pickups handled similar like necromancy	2023-03-11 21:41:57 +03:00
Konstantin	4617ce10e5	vcmi: allow showing more than one components in infobar ... Up to 8, AFAIK. So, we can show multi-reward in infobox now. One issue remain - cannot dynamically choose components size based on text size.	2023-03-11 21:41:57 +03:00
Konstantin	2fb2a79ca4	vcmi: fix components other than resources in infobar ... Do not redraw infobar when components shows and we request to show current adventure hero. Player already knows which hero he used to pick up components.	2023-03-11 21:41:57 +03:00
Konstantin	0dbc7169d8	vcmi: fix creature numbers on infobar ... It was rendered on a border	2023-03-11 21:41:57 +03:00
Ivan Savenko	20ef84bd55	Merge pull request #1670 from rilian-la-te/ffmpeg-6.0 ... vcmi: fix build and run with ffmpeg 6.0	2023-03-11 00:19:06 +02:00
Konstantin	a72af34d9f	vcmi: fix build and run with ffmpeg 6.0	2023-03-11 00:12:05 +03:00
Ivan Savenko	0ea73cae7f	Merge pull request #1662 from rilian-la-te/reduce-lexical-cast ... vcmi: reduce boost::lexical_cast usage	2023-03-10 12:53:21 +02:00
Ivan Savenko	11dc9228e2	Merge pull request #1635 from SoundSSGood/warmachine-buying-fix ... warmachine buying fix	2023-03-09 15:52:41 +02:00
Konstantin	5366f9190e	vcmi: reduce boost::lexical_cast usage	2023-03-09 16:36:46 +03:00
krs	1f06a62219	Do not show visitable for current hero	2023-03-08 22:43:52 +02:00
Ivan Savenko	010c548dc1	Merge pull request #1651 from Adriankhl/fix_sleep_wake ... Fix sleep/wake button icon update	2023-03-08 19:42:02 +02:00
SoundSSGood	e24eb6cc12	regression fixed	2023-03-08 17:20:38 +02:00
krs	7e97885e73	Renamed showBlockable to showBlocked	2023-03-08 01:19:26 +02:00
Ivan Savenko	76927cf434	Fix selection of current resolution	2023-03-07 15:35:04 +02:00
Ivan Savenko	d7e914d0eb	Fix resolution selection menu texts	2023-03-07 15:27:54 +02:00
Adriankhl	368def1609	Fix sleep/wake button, now the icon is updated properly after left click	2023-03-07 13:51:05 +01:00
Ivan Savenko	db9a296d02	Fix debug renderer	2023-03-07 00:06:58 +02:00
Ivan Savenko	df4fe33c3a	Do not switch InfoBar to hero during another player turn	2023-03-07 00:06:58 +02:00
Ivan Savenko	5f396af14c	Remove excessive logging	2023-03-07 00:06:58 +02:00
Ivan Savenko	1d03900f16	Fix render priority of heroes	2023-03-07 00:06:58 +02:00
Ivan Savenko	322b8e8840	Fix visibility of garrisoned heroes while picking up resources	2023-03-07 00:06:58 +02:00
Ivan Savenko	b7025125d5	Added map swipe option	2023-03-05 23:53:06 +02:00
Ivan Savenko	2e69a4769d	Implemented framerate limit option (not available in UI)	2023-03-05 21:06:52 +02:00
Ivan Savenko	37b2fb7ff3	Fixed map options to support adventure map rewrite	2023-03-05 20:14:23 +02:00
Ivan Savenko	7030fa8fe7	Allow changing queue size instantly on option toggle	2023-03-05 19:55:38 +02:00
Ivan Savenko	5f5ba0a54c	Fix town-related options	2023-03-05 19:55:38 +02:00
Ivan Savenko	105d988624	Remove debug code	2023-03-05 19:55:38 +02:00
Ivan Savenko	5fb5513572	Attempt to trace crash caused by iterator invalidation	2023-03-05 19:55:38 +02:00
Ivan Savenko	d34268d7d5	Split "Show available creatures in town" into two buttons	2023-03-05 19:55:38 +02:00
Ivan Savenko	cbe6a80020	Do not block "Load" button in battle	2023-03-05 19:55:38 +02:00
Ivan Savenko	b2e5e55c1e	Added labels that indicate current option values	2023-03-05 19:55:37 +02:00
Ivan Savenko	2f556ccf60	Improved General options tab layout presentation	2023-03-05 19:53:27 +02:00
Ivan Savenko	c976176453	Added additional buttons for movement speeds	2023-03-05 19:53:26 +02:00
Ivan Savenko	f09897b2b4	Remove unnecessary redraws	2023-03-05 19:51:42 +02:00
Ivan Savenko	c011a5a9cf	Added lines to window to separate UI elements into groups	2023-03-05 19:51:42 +02:00
Ivan Savenko	7ef5163d9d	Merge pull request #1581 from IvanSavenko/map_render_rewrite ... Adventure Map - rendering rewrite	2023-03-05 19:51:07 +02:00
SoundSSGood	142375c050	warmachine buying fix	2023-03-05 18:06:04 +02:00
Ivan Savenko	59d8989399	Fix initialization of movement speed settings	2023-03-05 18:02:59 +02:00
Ivan Savenko	30911eb593	Lock UI during movement animation	2023-03-05 18:02:59 +02:00
Ivan Savenko	c328aadfed	Update hero paths on new day	2023-03-05 18:02:59 +02:00
Ivan Savenko	b61cae5b37	Fixed minor issues discovered during testing	2023-03-05 18:02:59 +02:00
Ivan Savenko	165f6a0944	Implemented terrain transition animation	2023-03-05 18:02:59 +02:00
Ivan Savenko	58aa5c0427	Formatting	2023-03-05 18:02:59 +02:00
Ivan Savenko	b57a07b10f	Restored ambient sounds functionality	2023-03-05 18:02:59 +02:00
Ivan Savenko	cdcd5a29dd	Updated path to renamed directory	2023-03-05 18:02:59 +02:00
Ivan Savenko	225ae2ed46	Renamed directory	2023-03-05 18:02:59 +02:00
Ivan Savenko	c2d2402365	Object render order should now match H3	2023-03-05 18:02:59 +02:00
Ivan Savenko	b9e55db223	Minor fixes	2023-03-05 18:02:59 +02:00
Ivan Savenko	6196d538e7	Fix terrain tooltip	2023-03-05 18:02:59 +02:00
Ivan Savenko	387a7b421a	Refactoring of new code, multiple functionality changes: ... - Implemented separate Map View contexts for different map modes - Puzzle map now works - Enemy movement now works as in H3 - Removed no longer used code - Implemented missing embark/disembark sounds - Fixed view focusing on embarking/disembarking - Fixed focusing on movement near edge of terra incognita - Fixed sea movement sound	2023-03-05 18:02:58 +02:00
Ivan Savenko	46200b133f	Remove default parameter	2023-03-05 17:57:36 +02:00
Ivan Savenko	45e2875342	Completely removed old TerrainRect class	2023-03-05 17:57:36 +02:00
Ivan Savenko	fbb8c18c23	Improved map view selection tracking	2023-03-05 17:57:36 +02:00
Ivan Savenko	b9056ef248	Moved swipe handling to TerrainRect class	2023-03-05 17:57:34 +02:00
Ivan Savenko	f6cf8b23c2	Implemented grayscale filter for map	2023-03-05 17:48:02 +02:00
Ivan Savenko	5905dd6111	Grail digging check is now in library	2023-03-05 17:48:02 +02:00
Ivan Savenko	d21c41e436	Fix caching	2023-03-05 17:48:02 +02:00
Ivan Savenko	6a89245bd4	Working version of image caching	2023-03-05 17:48:02 +02:00
Ivan Savenko	cda78fb30f	Added option to disable animations for very low-end systems	2023-03-05 17:48:02 +02:00
Ivan Savenko	0282e6dad0	Attempt to improve caching	2023-03-05 17:48:02 +02:00
Ivan Savenko	4fdf3d4a87	Partial support for caching to detect updated tiles	2023-03-05 17:48:02 +02:00
Ivan Savenko	cd5f0bb36f	Map objects order should be close to H3	2023-03-05 17:48:02 +02:00
Ivan Savenko	7df5c612f7	Fix battle rendering	2023-03-05 17:48:02 +02:00
Ivan Savenko	11e4d84749	Implemented View Earth / View Air spells	2023-03-05 17:48:02 +02:00
Ivan Savenko	ec6f19ea18	Code reorganization, no changes to functionality	2023-03-05 17:48:02 +02:00
Ivan Savenko	330999fdc4	Moved files to new directory	2023-03-05 17:48:02 +02:00
Ivan Savenko	1c144637c1	Added basic overlay support for World View mode	2023-03-05 17:48:02 +02:00
Ivan Savenko	def1e35836	Use SDL BlitMode's to speed up image rendering	2023-03-05 17:48:02 +02:00
Ivan Savenko	40413ee6be	Basic version of scaling for view world	2023-03-05 17:48:02 +02:00
Ivan Savenko	16e7f860ff	Added debug rendering	2023-03-05 17:48:02 +02:00
Ivan Savenko	685cc91029	Cleanum & formatting	2023-03-05 17:48:02 +02:00
Ivan Savenko	ca13e7dedf	Implemented terrain palette animatiions. Removed old code	2023-03-05 17:48:02 +02:00
Ivan Savenko	57d906a01c	Fixed embarking & disembarking timings	2023-03-05 17:48:02 +02:00
Ivan Savenko	b5ad3a0559	Fixed in-boat movement	2023-03-05 17:48:02 +02:00
Ivan Savenko	ebe996fa74	Hero movement speed and map scrolling speed now matches H3	2023-03-05 17:48:02 +02:00
Ivan Savenko	7cf00ba87d	Implemented basic hero movement animation & object fade-out	2023-03-05 17:48:02 +02:00
Ivan Savenko	4501036a04	Basic version of hero movement on map. Removed old code.	2023-03-05 17:48:02 +02:00
Ivan Savenko	d46687a9c8	Partial implementation of world view mode	2023-03-05 17:48:02 +02:00
Ivan Savenko	beb7ce5beb	Refactoring of MapView	2023-03-05 17:48:02 +02:00
Ivan Savenko	67cc5a05c6	Removed old code	2023-03-05 17:48:02 +02:00
Ivan Savenko	21a48e4f0d	Moved path rendering to new map renderer	2023-03-05 17:48:02 +02:00
Ivan Savenko	600054e001	Refactored access to hero paths in CPlayerInterface	2023-03-05 17:48:01 +02:00
Ivan Savenko	bb6e1f7ee1	Initial WIP of adventure map rendering rewrite	2023-03-05 17:47:12 +02:00
Ivan Savenko	260f6d626c	Implemented translations for H3M maps	2023-03-05 17:39:27 +02:00
Ivan Savenko	f653d22f99	Fixed encoding of strings in h3m maps	2023-03-05 17:39:27 +02:00
Ivan Savenko	9b428e8231	Fonts will now correctly detect encoding of fonts from mods	2023-03-05 17:39:27 +02:00
Ivan Savenko	4260726e4b	Provide encoding information to maps & campaigns loaders	2023-03-05 17:39:27 +02:00
Ivan Savenko	bd70b6fabd	Unicode conversion functions now require source encoding	2023-03-05 17:39:27 +02:00
Ivan Savenko	acdb8d6e06	renamed Unicode -> TextOperations, to use for all text processing	2023-03-05 17:39:23 +02:00
Ivan Savenko	65c020ef34	Moved Unicode namespace out of GeneralTextHandler file	2023-03-05 17:30:38 +02:00
Ivan Savenko	476e60c753	Merge pull request #1615 from SoundSSGood/CArtifactsOfHero-refactoring ... Optimization and cleanup CArtifactHolder	2023-03-05 17:28:36 +02:00
SoundSSGood	a1dbbe2d86	redraw optimization	2023-03-03 10:17:31 +02:00
Andrey Filipenkov	0294a8b063	enable StupidAI and EmptyAI for static AI	2023-03-02 12:09:49 +03:00
Andrey Filipenkov	fd56f86a84	introduce VCMI_MOBILE macro	2023-03-02 12:09:49 +03:00
Andrey Filipenkov	313d479d42	fix using JNI from server in single process build	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	c4e7e91850	fix single process build for Android	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	4c19d8794d	add option to compile AI code into libvcmi directly ... - used on Android by default - AI sources and libs are propagated to upper level with set(... PARENT_SCOPE)	2023-03-02 12:09:48 +03:00
Andrey Filipenkov	5b1f3bf0db	use JNIEnv object from SDL instead of forwarding from Java for Client	2023-03-02 12:09:47 +03:00
Andrey Filipenkov	970bd6ed34	adjust project for Android (except AI)	2023-03-02 12:09:47 +03:00
Ivan Savenko	8c52cbcd00	Merge pull request #1429 from dydzio0614/creature-numeric-quantities ... Implement numeric creature descriptions with config toggle on/off	2023-02-26 22:57:01 +02:00
Ivan Savenko	195eac3375	Merge pull request #1545 from dydzio0614/town-panel-number-formatting ... Improve creature numbers handling in castle interface bottom left part	2023-02-26 22:56:54 +02:00
Ivan Savenko	cc84bed0c0	Merge pull request #1540 from dydzio0614/settings-rework ... Settings rework	2023-02-26 22:56:35 +02:00
Andrey Filipenkov	f128404770	simplify creating client target	2023-02-22 14:00:53 +03:00
Dydzio	9eccc29e16	Adjust tab positioning	2023-02-19 12:18:54 +01:00
Dydzio	7f03223634	Remove SDL_Events reference	2023-02-18 18:00:34 +01:00
Dydzio	6bd4eac27a	Rename settings files	2023-02-18 17:58:22 +01:00
Dydzio	7137329e80	Clang-tidy related fixed	2023-02-18 17:49:43 +01:00
Dydzio	7e409df3cb	Apply manual changes from code review	2023-02-18 16:35:07 +01:00
Dydzio	c2ef3331ef	Change main settings tabs to toggle group + fix json commas	2023-02-16 21:37:37 +01:00
Dydzio	e48a4185ed	Use config values from new settings	2023-02-15 23:36:09 +01:00
Dydzio	ade52239ea	Use config value from new settings	2023-02-15 23:26:55 +01:00
Dydzio	9101f05835	Fixes for new battle settings	2023-02-15 22:38:41 +01:00
Dydzio	775db89241	Fix battle settings UI labels, add "dont show battle intro" setting	2023-02-15 20:29:29 +01:00
Dydzio	1d153f4ee9	"ForceMovementInfo" support + make other settings tab	2023-02-14 23:45:45 +01:00
Dydzio	daa2b63dde	Further UI improvements	2023-02-14 22:22:11 +01:00
Dydzio	be9c71934c	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-02-14 21:00:17 +01:00
Dydzio	fb06aca0bb	Further progress - UI tweaks, new settings etc	2023-02-14 20:30:06 +01:00
Ivan Savenko	18d1823d44	Fix build	2023-02-14 11:32:20 +02:00
Ivan Savenko	72fe1fcfa9	Fix minimap updating on hero loss	2023-02-14 11:32:19 +02:00
Ivan Savenko	91b17bed79	Partial encapsulation of AdvMapInt	2023-02-14 11:18:42 +02:00
Ivan Savenko	e15c7dcd33	Attempt at better encapsulation of CTerrainRect	2023-02-14 11:18:41 +02:00
Ivan Savenko	89c29206f1	Internal classes of mapHandler are now in global namespace	2023-02-14 11:18:41 +02:00
Ivan Savenko	cc0c3e5bc9	All adventure map components now use shared_ptr	2023-02-14 11:18:41 +02:00
Ivan Savenko	f8c1c46562	removed CAdvMapInt::handleRightClick method	2023-02-14 11:18:41 +02:00
Ivan Savenko	d0f57fed6f	Cleaned up code of Minimap	2023-02-14 11:18:41 +02:00
Dydzio	80a5595d6c	Adding some settings options, minor UI fixes	2023-02-13 23:53:28 +01:00
Andrii Danylchenko	9f55666931	rework netpacks to avoid double typeinfo	2023-02-13 20:26:39 +02:00
SoundSSGood	0f93b0991c	Regression fixed	2023-02-13 15:16:42 +02:00
SoundSSGood	8504102c53	Merge branch 'vcmi:develop' into contitutient-swap	2023-02-13 09:51:42 +02:00
Andrii Danylchenko	e6b21ed298	Merge pull request #1574 from SoundSSGood/contitutient-move ... combined art move	2023-02-13 08:30:35 +02:00
SoundSSGood	2976739c97	some refactoring	2023-02-12 21:27:37 +02:00
Dydzio	de5138c854	Basic separation of adventure map & general tabs	2023-02-12 19:25:59 +01:00
SoundSSGood	34a0dbc0b6	misc slots. fixed combined arts moving	2023-02-12 20:13:26 +02:00
Dydzio	58bed920b4	Sort out settings files structure	2023-02-12 17:49:41 +01:00
Dydzio	7430616ada	Move settings to separate subfolder	2023-02-12 17:29:23 +01:00
Konstantin	6d8eac320d	vcmi/client: add missing include to GUIclasses.cpp ... Fix building with clang++ version 15.	2023-02-12 19:11:24 +03:00
Konstantin	3cf303f1c7	vcmi/client: make ColorRGBA constexpr ... 1. Replace overflowing int3 to ColorRGBA, which is more semantically correct 2. Make ColorRGBA constexpr, to make sure than hardcoded colors can be initialized in compile time	2023-02-12 19:11:24 +03:00
Dydzio	34227a0dab	Integrate new settings with battle UI	2023-02-12 15:49:17 +01:00
Dydzio	2f171fcc0e	Merge branch 'develop' into settings-rework	2023-02-12 15:03:33 +01:00
Dydzio	ee186f3839	Conversion of battle settings to configurable interface	2023-02-12 13:51:57 +01:00
Ivan Savenko	c8c38ac922	Merge pull request #1386 from IvanSavenko/resolutions_filter ... Do not allow selecting resolutions not supported by display	2023-02-12 14:33:39 +02:00
Dydzio	319d05b94f	Missing merge conflict stuff	2023-02-12 12:05:12 +01:00
Dydzio	11df79dc2a	Minor formatting	2023-02-12 11:55:39 +01:00
Dydzio	fc7d2b9778	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-02-12 11:55:21 +01:00
Ivan Savenko	4a0a82ceb4	Merge pull request #1553 from IvanSavenko/sdl_cleanup ... SDL usage cleanup	2023-02-08 18:14:15 +02:00
Ivan Savenko	ab8b407294	Style cleanup	2023-02-08 13:56:09 +02:00
Dydzio	a4cc386a5a	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-02-05 20:24:36 +01:00
nordsoft	fd6987ea0a	Fix alternative actions button redraw	2023-02-05 03:29:50 +04:00
Ivan Savenko	62151cd20c	Replaced genRect with Rect constructor call	2023-02-03 19:17:59 +02:00
Ivan Savenko	34dcb4127a	Removed text utilities from SDL_Extensions	2023-02-03 18:55:25 +02:00
Ivan Savenko	7c58a46279	Removed some instances of access to screen surface	2023-02-03 18:23:53 +02:00
Ivan Savenko	70c0937972	Moved SDL-specific code to SDL_Extensions	2023-02-03 13:02:05 +02:00
Ivan Savenko	01322aa4c5	Do not allow selecting resolution no supported by display	2023-02-03 12:57:38 +02:00
Ivan Savenko	ae9f040abf	removed unused method	2023-02-03 11:42:27 +02:00
Ivan Savenko	9833edcf73	Removed using namespace SDL_Ext	2023-02-03 11:39:40 +02:00
Ivan Savenko	d87fb43dcd	Replaced SDL access with VCMI methods	2023-02-03 11:39:40 +02:00
Ivan Savenko	3fef2a5e1f	Moved Colors to a separate file, updated includes	2023-02-03 11:39:40 +02:00
Ivan Savenko	aab082fd2e	Remove remaining access to SDL_Events	2023-02-03 11:39:40 +02:00
Ivan Savenko	594b7614cf	Fix CI build	2023-02-03 11:39:40 +02:00
Ivan Savenko	cfcaf5cbb6	renamed keyDown -> keyPressed	2023-02-03 11:39:40 +02:00
Ivan Savenko	b1821d4442	Removed some SDL access from non-SDL code	2023-02-03 11:39:40 +02:00
Ivan Savenko	e1bd0d2a04	API for custom events no longer requires SDL access	2023-02-03 11:39:40 +02:00
Ivan Savenko	d4fba3787c	Removed usage of SDL_KeyboardEvent from UI code	2023-02-03 11:39:40 +02:00
Ivan Savenko	860fe43131	Merged two mouse button enums	2023-02-03 11:39:40 +02:00
Ivan Savenko	6669ffd4b3	Moved input-related code from SDL_Extensions to GuiHandler	2023-02-03 11:39:40 +02:00
Ivan Savenko	214fc19e74	CIntObject now receives mouse position as point instead of SDL event	2023-02-03 11:39:39 +02:00
Ivan Savenko	58cfddccaa	Merge pull request #1546 from rilian-la-te/dead-code-removal ... Remove SDL usage from VCMI library	2023-02-03 11:28:29 +02:00
Ivan Savenko	64faa13b6d	Merge pull request #1487 from IvanSavenko/battle_actions_refactoring ... Battle actions refactoring	2023-02-03 11:28:14 +02:00
Konstantin	88ef83db53	client: remove SDL_BYTEORDER usage ... Make use of CMake endian checking in this places too.	2023-02-03 00:37:37 +03:00
Dydzio	e7a774c465	Improve creature numbers handling in castle interface bottom left part	2023-02-02 20:54:47 +01:00
Dydzio	2ef33d54ab	Merge branch 'develop' into battle-queue-improvement	2023-02-02 18:26:31 +01:00
Dydzio	5a08ec04fe	Initial split of BattleOptionsWindow	2023-02-02 17:17:16 +01:00
Ivan Savenko	2ac997d8a9	Fix "holding" animation speed	2023-02-02 14:37:34 +02:00
Ivan Savenko	731f7b0578	Fix opening spellbook via clicking on hero	2023-02-02 14:37:16 +02:00
Ivan Savenko	1e09c39c0e	Fix battle cursor after attack command	2023-02-02 14:36:58 +02:00
Ivan Savenko	3c8a0b9e70	Add missing text	2023-02-02 13:43:20 +02:00
Ivan Savenko	9678296875	Hero interaction is now battle action	2023-02-02 13:43:19 +02:00
Ivan Savenko	d3c85a19cb	Merged CClickableHex class into BattleFieldController	2023-02-02 13:35:57 +02:00
Ivan Savenko	c3b79c786b	Spellcasters UI now shares handling with hero spellcasting	2023-02-02 13:25:55 +02:00