3865 Commits

Author	SHA1	Message	Date
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