750 Commits

Author	SHA1	Message	Date
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	ed798b06da	Prepare transport enum	2023-04-18 13:04:49 +04:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +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
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
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
Konstantin	fedf7d377c	vcmi: remove TFaction ... This is a huge change and will break save compatibility	2023-04-10 19:28:16 +03:00
Konstantin	40bea35a26	CHeroWindow: fix picked art mana limit display	2023-04-10 15:35:21 +03:00
krs	1644cab938	Added combat option Highlight Movement on Hover	2023-04-08 20:40:30 +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
nordsoft	52b53ab307	Feature and setting implemented	2023-04-08 01:49:59 +04:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Ivan Savenko	cf966015bb	Correctly update battle queue state after changing its state	2023-04-05 18:35:45 +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	4c6dbb5037	Fix town UI update on building new structures	2023-03-31 23:18:45 +03:00
Konstantin	c1fd7309ad	ResourceSet: composition	2023-03-31 14:00:49 +03:00
Ivan Savenko	1084da00df	Fix initial value of sound/music labels in settings	2023-03-30 12:23:47 +03:00
Ivan Savenko	47e774897d	Show simple message on left-clicking empty buildings	2023-03-28 17:36:46 +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
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
SoundSSGood	19096f39f0	Backpack limit. Amount of fixes.	2023-03-21 22:11:42 +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	72122fb433	CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization	2023-03-21 12:14:33 +02:00
Konstantin	bbbbfe00f0	Modernize resourceSet	2023-03-17 02:26:54 +03: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	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	77f92e56ac	Merge pull request #1689 from IvanSavenko/map_renderer_fixes ... Map renderer fixes	2023-03-16 14:48:57 +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	d3533150b8	Fix misplaced width/height in UI	2023-03-15 12:17:08 +02:00
Konstantin	18200d1d98	vcmi: move getEstimatedComponentHeight	2023-03-13 00:24:26 +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
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
SoundSSGood	e24eb6cc12	regression fixed	2023-03-08 17:20:38 +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
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	5f5ba0a54c	Fix town-related options	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	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	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	45e2875342	Completely removed old TerrainRect class	2023-03-05 17:57:36 +02:00
Ivan Savenko	7df5c612f7	Fix battle rendering	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	def1e35836	Use SDL BlitMode's to speed up image rendering	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	4501036a04	Basic version of hero movement on map. Removed old code.	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	260f6d626c	Implemented translations for H3M maps	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
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
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	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	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	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	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
Dydzio	de5138c854	Basic separation of adventure map & general tabs	2023-02-12 19:25:59 +01: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
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	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
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	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	cfcaf5cbb6	renamed keyDown -> keyPressed	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	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
Dydzio	e7a774c465	Improve creature numbers handling in castle interface bottom left part	2023-02-02 20:54:47 +01:00
Dydzio	5a08ec04fe	Initial split of BattleOptionsWindow	2023-02-02 17:17:16 +01:00
Dydzio	d04c53e7e0	Merge branch 'develop' into settings-rework	2023-02-02 11:55:13 +01:00
Ivan Savenko	108a42e4ba	Reorganized includes for new layout. New class - IImageLoader	2023-02-01 20:42:06 +02:00
Ivan Savenko	8a9492d129	Moved client files to more suitable locations	2023-02-01 13:09:19 +02:00
Ivan Savenko	0ba74fea73	Merge pull request #1515 from IvanSavenko/time_based_animations ... Time based animations	2023-02-01 12:25:54 +02:00
Dydzio	88744633de	Move buttons from mainOptions to SystemOptionsWindow	2023-01-30 23:26:33 +01:00
Dydzio	cc9d65a341	Make battle settings callable without battle, save last settings tab	2023-01-30 22:15:37 +01:00
Dydzio	9dd692cea4	Initial draft of tabbed settings window	2023-01-30 20:18:59 +01:00
Ivan Savenko	5cc23cc286	Renamed SDL_Pixels -> SDL_PixelAccess due to similar SDL header	2023-01-30 20:06:08 +02:00
Ivan Savenko	9c3030603d	Removed most SDL includes from headers, removed SDL int's	2023-01-30 19:55:32 +02:00
Ivan Savenko	e14290fde0	Removed loading of images from file into SDL_Surface	2023-01-30 18:25:47 +02:00
Ivan Savenko	87218c63c4	CPicture now uses IImage internally	2023-01-30 17:18:59 +02:00
Ivan Savenko	e35a669eeb	Refactoring of CPicture class to improve encapsulation	2023-01-30 13:58:13 +02:00
Ivan Savenko	42df5626d9	Added Color class to replace SDL_Color	2023-01-30 00:12:43 +02:00
Dydzio	1898b8218c	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-01-29 17:36:56 +01:00
Dydzio	e3578d0bc8	Extract options stuff to separate file	2023-01-29 17:36:33 +01:00
Ivan Savenko	57ee9a9bf3	Merge vcmi/beta into vcmi/develop	2023-01-29 18:21:55 +02:00
Dydzio	0fdfd8bdcb	Configurable interface for game settings, change sound/music sliders	2023-01-29 16:49:47 +01:00
Ivan Savenko	bdde9f831a	Fixed timings of building construction to match H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	09413c61b8	Changed timing of building fade-in to match H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	3acee297be	CShowableAnim is now time-based with timing matching H3	2023-01-28 13:19:35 +02:00
Ivan Savenko	7bbaae75a2	Merge pull request #1508 from kambala-decapitator/shipyard-regression ... attempt to show shipyard dialog only when a hero is selected	2023-01-28 02:04:10 +02:00
Ivan Savenko	50a0fc4fb2	Removed pointer to current SDL_Event from GuiHandler	2023-01-27 23:17:40 +02:00
Andrey Filipenkov	612b5e2746	attempt to show shipyard dialog only when a hero is selected ... fixes regression from a4e8255cbc	2023-01-25 20:49:37 +03:00
Andrey Filipenkov	b2d2c7a2dc	Merge pull request #1501 from kambala-decapitator/townportal-doubleclick ... handle double-click in Town Portal dialog	2023-01-25 17:42:15 +03:00
Ivan Savenko	52ab0f9b5b	Merge pull request #1446 from dydzio0614/movement-points-show ... Implement movement points info on ALT hold + tile mouse hover	2023-01-25 12:30:34 +02:00
Andrey Filipenkov	08b04a3527	handle double-click in Town Portal dialog	2023-01-23 15:43:55 +03:00
Dydzio	192a97bc05	Extract method and make customizable movement points string	2023-01-21 15:30:32 +01:00
Andrey Filipenkov	919c592e67	fix closing Buy Boat dialog with Escape button	2023-01-21 16:00:29 +03:00
Andrey Filipenkov	a4e8255cbc	allow opening Buy Boat dialog on clicking shipyard on advmap when a town is selected	2023-01-21 15:58:12 +03:00
Ivan Savenko	8ed115a628	Fix ios compile	2023-01-20 16:11:43 +02:00
Ivan Savenko	9be38780cd	Removed remaining parts of Geomeotries.h/cpp	2023-01-20 16:11:43 +02:00
Ivan Savenko	ee7a573cb8	Refactoring of SDL API usage: ... - Rect no longer inherits from SDL_Rect - renamed vcmi functions that used SDL naming format - moved all functions in SDL_Extensions file into CSDL_Ext namespace - SDL_Rect is now used only by SDL_Extensions, all other code uses Rect	2023-01-20 16:11:43 +02:00
Ivan Savenko	05a1d7c6e3	All text for factions/towns/building are passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	388ed88b5d	All artifact strings now pass through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	d2b837b116	All creature-related texts go through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	fa6f7513e8	All heroes-related strings are passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	e22f6283c2	Secondary skills strings are now passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	5da407e822	All spell texts are now passed through translator	2023-01-20 15:18:36 +02:00
Andrey Filipenkov	1b3c07eda4	buy units starting from the highest level in the "buy all units" dialog	2023-01-20 15:14:15 +02:00
Ivan Savenko	05ac217b0f	Merge with vcmi/develop	2023-01-17 23:02:25 +02:00
Andrii Danylchenko	c24b89fe06	2 finger rclick block adwmap scrolling and disable for iOS	2023-01-17 16:22:44 +02:00
Andrii Danylchenko	33f92bc4b1	Merge pull request #1438 from dydzio0614/build-speed-adjust ... Adjust newly built building appearance and outline blinking speed	2023-01-16 20:27:56 +02:00
Dydzio	c3b254a815	Enum value can be used here as well	2023-01-16 18:26:31 +01:00
Dydzio	c886a2a02b	Implement movement points info on ALT hold + tile mouse hover	2023-01-16 17:29:33 +01:00
Andrii Danylchenko	b3f6250f4e	Merge pull request #1439 from dydzio0614/castle-shipyard-animation-fix ... Fix wrong rendering of castle shipyard	2023-01-16 14:23:37 +02:00
Dydzio	54e499f5e7	Minor refactoring from code review	2023-01-16 00:33:53 +01:00
Ivan Savenko	9971bdca1b	Existing software cursor logic is now in a separate class	2023-01-15 21:18:34 +02:00
Ivan Savenko	0e8ee929df	Renamed CCursorHandler -> CursorHandler	2023-01-15 21:18:34 +02:00
Dydzio	7dd7f4af54	Change to time-based frame counting, easier than I though	2023-01-15 19:56:55 +01:00
Dydzio	6572f5697e	Fix wrong rendering of castle shipyard	2023-01-15 19:10:40 +01:00
Dydzio	cbddf2d8fb	Adjust newly built building appearance and outline blinking speed	2023-01-15 17:22:53 +01:00
Ivan Savenko	246281e62a	Merged vcmi/beta with vcmi/develop	2023-01-15 17:46:42 +02:00
Ivan Savenko	6ea7add4bb	Merge pull request #1394 from SoundSSGood/art-move-fix ... Artifact movement refactoring	2023-01-15 17:29:36 +02:00
SoundSSGood	a0568823a9	swap contitutient	2023-01-11 13:17:33 +02:00
Ivan Savenko	4f3ea0d1d9	Renamed Terrain.h/cpp -> TerrainHandler.h/cpp	2023-01-10 00:01:35 +02:00
Ivan Savenko	f51b3bca57	use JsonKey or NameTranslated instead of ambiguos Name	2023-01-10 00:01:35 +02:00
Ivan Savenko	7c7ae26e67	Map/Road/River identifiers are now private members	2023-01-10 00:01:35 +02:00
Ivan Savenko	64885bdf6b	Better names for terrain parameters. Support for new movement sounds.	2023-01-10 00:01:35 +02:00
Ivan Savenko	1fece0ce18	Merge pull request #1229 from IvanSavenko/battle_improvements ... Battle: Fixing bugs & Implementation of missing features	2023-01-09 22:07:13 +02:00
Ivan Savenko	9308319ac7	Added workaround for ~200 ms lag occuring after hero move	2023-01-09 13:05:28 +02:00
SoundSSGood	4005b48360	Regressions fixed	2023-01-08 23:31:12 +02:00
Ivan Savenko	d83eedb8dd	Fixes #1378 - do not auto-set key color - image might not have one	2023-01-06 13:15:52 +02:00
Ivan Savenko	c479504646	Formatting cleanup	2023-01-01 22:50:38 +02:00
Ivan Savenko	7c0d5666a0	Return string by copy to fix cases when string is constructed on stack	2023-01-01 20:55:43 +02:00
Ivan Savenko	cb4f5edae9	All Heroes 3 texts are now passed through translator	2023-01-01 14:56:45 +02:00
Ivan Savenko	bdb8e0ee5c	Introduced string identifiers for H3 texts, still WIP	2023-01-01 14:56:44 +02:00
Ivan Savenko	5d80457eda	Merge with vcmi/develop branch	2022-12-30 00:52:23 +02:00
Ivan Savenko	405b2976d5	Renamed getUpgradeInfo -> fillUpgradeInfo	2022-12-25 14:03:43 +02:00
Ivan Savenko	325c29da0d	Merge remote-tracking branch 'vcmi/develop' into battle_improvements	2022-12-23 14:51:34 +02:00
Ivan Savenko	eb20a4b208	Merge remote-tracking branch 'vcmi/develop' into warnings_fix	2022-12-23 14:40:45 +02:00
Ivan Savenko	f073c676f9	Merge 1.1 release into develop	2022-12-23 14:17:18 +02:00
Ivan Savenko	c835a84051	Moved all GUI handling from BattleInterface to BattleControlPanel	2022-12-21 17:02:53 +02:00