6507 Commits

Author	SHA1	Message	Date
Ivan Savenko	408a632002	Deprecate artifact-related building types	2024-08-28 13:50:08 +00:00
Ivan Savenko	55fd7bd7aa	Thieves guild information level is now a bonus type	2024-08-28 13:50:07 +00:00
Ivan Savenko	a1a194d904	Allow replacing war machine if hero has a different machine in the slot	2024-08-28 13:49:42 +00:00
Ivan Savenko	8ef8ffa5c4	Implemented configurable blacksmith. Deprecated ballistaYard type	2024-08-28 13:49:42 +00:00
Ivan Savenko	ce1e0b8875	Moved NewTurn pack generation to NewTurnProcessor	2024-08-28 13:03:24 +00:00
Ivan Savenko	0fd9dbf240	Unified income handling, added IOwnableObject interface	2024-08-28 12:40:44 +00:00
Ivan Savenko	58da447f43	Merge pull request #4523 from IvanSavenko/xbrz_fixes ... Xbrz fixes	2024-08-28 15:39:45 +03:00
Laserlicht	70190ea1fe	Merge branch 'develop' into resource_generation	2024-08-28 00:03:46 +02:00
Laserlicht	4704e92d98	adjust resource naming	2024-08-28 00:02:29 +02:00
Ivan Savenko	a2bac260e7	Fix images with custom scaling in xBRZ mode	2024-08-27 19:49:41 +00:00
Ivan Savenko	0bbc2bce33	Fix handling of transparency in xbrz and in images with non-cyan ... transparent color in unscaled mode	2024-08-27 19:44:11 +00:00
Laserlicht	d47271de6c	avoid zero size Y axis	2024-08-27 21:41:50 +02:00
Ivan Savenko	20d5b33ea6	Remove marketModes as member ... marketModes are now generated in runtime and are not a member of IMarket. Was not a bad change, but towns load buildings before town type is randomized, leading to case where market modes are not actually known when building is added to town (like random towns with market built) Since altar requires CArtifactSet for work, IMarket will now always contain it, but it will only be accessible if market supports altar mode.	2024-08-27 14:07:00 +00:00
Simeon Manolov	20ccc92e6d	move shutdown functions in EntryPoint	2024-08-27 13:12:55 +03:00
Simeon Manolov	e9131538dd	Merge branch 'develop' into split-client+develop	2024-08-27 03:05:07 +03:00
Ivan Savenko	01396b62b7	Extracted handling of type ID's from serializer into a separate class	2024-08-26 19:48:46 +00:00
Ivan Savenko	232a759db7	Remove type registration from library pack applying	2024-08-26 19:48:46 +00:00
Ivan Savenko	b84af1a6de	Significantly simplify packs applying ... Apparently our logic for packs applying with types registration is overcomplicated and by now completely unnecessary - it became redundant after introduction of visitor pattern.	2024-08-26 19:48:46 +00:00
Ivan Savenko	11e8b04ac5	Merge pull request #4463 from SoundSSGood/IMarket-refactoring ... IMarket refactoring	2024-08-26 22:48:23 +03:00
Ivan Savenko	7b746bcaec	Merge pull request #4496 from Laserlicht/statistic_improve ... Statistics improve	2024-08-26 19:12:56 +03:00
Ivan Savenko	e65eaf0e06	Merge pull request #4506 from mikeiit/add_missisng_stack_artifact_description ... Added missing stack artifact description	2024-08-26 19:10:48 +03:00
Ivan Savenko	3d39963a1c	Merge branch 'master' into 'develop'	2024-08-26 14:01:00 +00:00
MichalZr6	2a6525c5ef	Check battleInt->curInt instead of battleInt	2024-08-25 19:43:21 +00:00
MichalZr6	619b35ab33	Allow dialogs when in battle interface ... But also it is not our turn	2024-08-25 19:43:14 +00:00
Laserlicht	2c5a1bcbb4	remove comment out line	2024-08-25 11:48:17 +02:00
Laserlicht	d9d82fc836	add horicaontal grid + fixes	2024-08-25 02:21:24 +02:00
Mike	3671079754	Added artifact description	2024-08-24 16:37:11 -07:00
Laserlicht	95d2fbc9b7	fix grid	2024-08-25 00:43:55 +02:00
Laserlicht	62790e9aad	scaling anim have problems -> use other icon	2024-08-25 00:33:36 +02:00
Laserlicht	6e33b86dcb	fix days surived	2024-08-24 23:36:01 +02:00
Ivan Savenko	6d8bc9b859	Merge pull request #4500 from MichalZr6/allow_dialogs_when_in_battle ... Allow dialogs when in battle interface but not on the players turn	2024-08-24 16:18:20 +03:00
Ivan Savenko	c22820f484	Merge pull request #4484 from Laserlicht/text_len ... campaign text length	2024-08-24 16:06:31 +03:00
Ivan Savenko	3e605253db	Merge pull request #4481 from Laserlicht/fix_hota ... fix for 8th creature	2024-08-24 16:06:12 +03:00
SoundSSGood	4035ab1550	added CMarketWindow::getMarketTitle()	2024-08-24 13:52:54 +03:00
MichalZr6	9daabd0710	Check battleInt->curInt instead of battleInt	2024-08-23 23:30:50 +02:00
MichalZr6	d0e0ab767c	Allow dialogs when in battle interface ... But also it is not our turn	2024-08-23 18:03:58 +02:00
Ivan Savenko	45558552d6	Merge 'vcmi/beta' into beta_fix	2024-08-23 13:18:09 +00:00
Laserlicht	463d18b92d	add grid for weeks/months	2024-08-23 00:46:46 +02:00
Laserlicht	d7ee268c76	touch hovering improvements	2024-08-22 23:27:21 +02:00
Ivan Savenko	b6cc409772	Fix excessive removal of dialogs, e.g. new week or timed events	2024-08-22 16:39:30 +00:00
Laserlicht	c2290f5f6e	fix	2024-08-21 23:01:32 +02:00
Laserlicht	45fd13bdcd	mapname len	2024-08-21 22:11:16 +02:00
Laserlicht	02002ce69d	Merge branch 'develop' into resource_generation	2024-08-21 21:52:08 +02:00
Laserlicht	61af23d258	text length	2024-08-21 21:43:54 +02:00
Laserlicht	43fc741a15	cleaner	2024-08-21 21:24:06 +02:00
Laserlicht	c36a6427c2	fix	2024-08-21 20:27:39 +02:00
Ivan Savenko	475a20124f	Fix crash on right-clicking spell component in some dialogs	2024-08-21 18:19:31 +00:00
Simeon Manolov	d05adfc5d5	Merge branch 'develop' into split-client+develop	2024-08-21 17:40:37 +03:00
Simeon Manolov	5a7dc7b552	Merge branch 'develop' into split-client+develop	2024-08-21 17:39:44 +03:00
Simeon Manolov	530c1f2bc1	[SPLIT-CLIENT+DEVELOP] android fix attempt	2024-08-21 16:07:30 +03:00
Ivan Savenko	ff33fbd3a0	Merge pull request #4480 from IvanSavenko/update_prebuilts ... Update ffmpeg	2024-08-21 15:57:50 +03:00
Laserlicht	e19194c3b8	fix for 8th creature	2024-08-21 00:17:25 +02:00
SoundSSGood	2e3e6b1553	market->getObjInstanceID()	2024-08-21 01:01:23 +03:00
Laserlicht	d8869a33da	remove resource	2024-08-20 22:45:11 +02:00
Ivan Savenko	50a4e3213d	Fix ffmpeg deprecation	2024-08-20 19:23:55 +00:00
Laserlicht	c56d667981	fix	2024-08-20 21:22:40 +02:00
Laserlicht	0901286f9d	fix	2024-08-20 20:38:38 +02:00
Laserlicht	01e55beef1	Merge branch 'develop' into resource_generation	2024-08-20 20:26:52 +02:00
Laserlicht	01c14ae9ce	Merge branch 'develop' into extended_statistic	2024-08-20 20:25:16 +02:00
SoundSSGood	58bb2b58e3	IMarket suggestions ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-08-20 18:49:48 +03:00
SoundSSGood	cd7ebea9e3	cleanup unused code	2024-08-20 18:49:47 +03:00
SoundSSGood	fd45b5144d	IMarket serializeable	2024-08-20 18:49:47 +03:00
Ivan Savenko	85f6030c7c	Merge pull request #4318 from IvanSavenko/upscaled_render ... Support for xBRZ upscaling filter	2024-08-20 14:23:30 +03:00
Laserlicht	6c1776e0b1	AssetGenerator: make it perfect	2024-08-20 03:13:21 +02:00
Laserlicht	f6d5cee24f	fix	2024-08-20 01:58:02 +02:00
Laserlicht	82480e3552	add clean adventure options	2024-08-20 01:46:07 +02:00
Laserlicht	c2b181dc0c	Merge branch 'develop' into resource_generation	2024-08-19 23:43:24 +02:00
Laserlicht	17cb45f692	fix	2024-08-19 23:33:23 +02:00
Laserlicht	fff0159ef6	resource generation	2024-08-19 23:18:14 +02:00
Ivan Savenko	6a6c13471c	Try more robust approach for waiting dialogs in battles in MP	2024-08-19 18:20:11 +00:00
Laserlicht	fec3d070b5	gui fixes for globallobby	2024-08-19 15:23:47 +00:00
Ivan Savenko	b94a61c255	Try to fix battle startup if player has waiting dialogs	2024-08-19 15:21:45 +00:00
Ivan Savenko	cc5564a7b1	Remove no longer used localization strings	2024-08-19 11:47:13 +00:00
Ivan Savenko	f1e63792f0	Greatly simplify town buildings logic	2024-08-19 11:47:13 +00:00
Simeon Manolov	90931cc3e3	android deploy fix attempt	2024-08-19 13:17:38 +03:00
Ivan Savenko	b3158c52ba	Fixes for Sonar issues	2024-08-17 20:54:29 +00:00
Ivan Savenko	40ece7142b	Set no filtering by default for now	2024-08-17 19:11:30 +00:00
Ivan Savenko	fb3147fbda	Do not initialize shadow on images that don't have shadow palette	2024-08-17 19:11:10 +00:00
Ivan Savenko	d6059b044d	Implement selection of upscaling filter in launcher	2024-08-17 15:25:26 +00:00
Ivan Savenko	f29a687234	Clean up scaling code, implemented image size optimization	2024-08-17 15:25:26 +00:00
Ivan Savenko	f0448acaa3	TBB is now a dependency of lib. Implemented multithreaded xBRZ scale	2024-08-17 15:25:26 +00:00
Ivan Savenko	6a17c08b7e	Implemeted wider lines for upscaled mode	2024-08-17 15:25:26 +00:00
Ivan Savenko	095f5b5e60	Fix cursor scaling	2024-08-17 15:25:26 +00:00
Ivan Savenko	5c11a10667	Fix selection highlight in combat	2024-08-17 15:25:26 +00:00
Ivan Savenko	000af42fcb	Fix spellbook page flip scaling	2024-08-17 15:25:26 +00:00
Ivan Savenko	ffba847f40	xBRZ-upscaled images now support common palette-transform effects: ... - Player coloring - Flag color for map - Glue selection for combat	2024-08-17 15:25:26 +00:00
Ivan Savenko	2d12cecded	Added draw method to ISharedImage interface	2024-08-17 15:25:26 +00:00
Ivan Savenko	502f47c6b5	Rename IConstImage to more clear ISharedImage	2024-08-17 15:25:26 +00:00
Ivan Savenko	f75a25e369	Fix positioning & scale of video files	2024-08-17 15:25:26 +00:00
Ivan Savenko	3bc31a2ea0	Fix rendering of minimap radar border	2024-08-17 15:25:26 +00:00
Ivan Savenko	216ef2a943	H3 fonts now use atlas for font data. Implemented xBRZ scaling for fonts	2024-08-17 15:25:26 +00:00
Ivan Savenko	85bb133561	Fix transparency on dialog box corners when xBRZ is in use	2024-08-17 15:25:26 +00:00
Ivan Savenko	0f4bd7253d	Fix adventure map rendering	2024-08-17 15:25:26 +00:00
Ivan Savenko	954b6b0947	Implemented scaling of mouse input events	2024-08-17 15:25:26 +00:00
Ivan Savenko	748a3a1b64	Fixed minimap generation when upscaled mode is used	2024-08-17 15:25:26 +00:00
Ivan Savenko	b527c0d09e	Fix warnings in xBRZ	2024-08-17 15:25:26 +00:00
Ivan Savenko	4838b51b9d	Convert xbrz.cpp to utf-8	2024-08-17 15:25:26 +00:00
Ivan Savenko	0529b80bc9	Use unix file endings for xBRZ	2024-08-17 15:25:26 +00:00
Ivan Savenko	020a825ecd	TTF fonts will now be rendered correctly in upscaling mode ... Note that TTF rendering bypasses xBRZ - TTF fonts are rendered at larger point size	2024-08-17 15:25:26 +00:00
Ivan Savenko	fa65b0019c	First working version of xBRZ upscaler	2024-08-17 15:25:26 +00:00
Ivan Savenko	4171026035	First iteration of upscaled rendering	2024-08-17 15:25:25 +00:00
Ivan Savenko	7f5cd8a7aa	newSurface method now accepts Point instead of two integers	2024-08-17 15:25:25 +00:00
Ivan Savenko	20ba63bba3	Added xBRZ 1.8 library to source code	2024-08-17 15:25:25 +00:00
Laserlicht	0c836e0797	code review	2024-08-17 12:25:16 +02:00
Laserlicht	f7e01eaf67	sonarcloud	2024-08-16 00:03:45 +02:00
Laserlicht	00692888df	sonar cloud fixes	2024-08-15 23:09:04 +02:00
Laserlicht	ba77107e71	fix some sonar cloud issues	2024-08-15 21:48:35 +02:00
Simeon Manolov	be58f61c35	fix indentation	2024-08-15 10:19:20 +03:00
Laserlicht	4796f46c24	fix defeat icon	2024-08-15 00:53:38 +02:00
Laserlicht	5743f151a1	icon drawing	2024-08-15 00:21:02 +02:00
Simeon Manolov	9b655ac43e	ios fix attempt	2024-08-15 00:27:18 +03:00
Laserlicht	b693ce120a	code review	2024-08-14 22:36:54 +02:00
Laserlicht	a42afa2910	code review	2024-08-14 21:51:08 +02:00
Laserlicht	e1fdac42fd	code review	2024-08-14 21:50:53 +02:00
Laserlicht	3551470919	adjusted texts	2024-08-14 21:15:18 +02:00
Laserlicht	39aaa6fe32	data to clipboard; simplify types	2024-08-14 21:01:37 +02:00
Laserlicht	81b1704e39	Merge branch 'vcmi:develop' into extended_statistic	2024-08-14 20:32:47 +02:00
Laserlicht	df8e491b72	prepare icons	2024-08-14 21:11:57 +02:00
Laserlicht	ec2163b974	add val; stat at end turn; events	2024-08-14 19:24:40 +02:00
Simeon Manolov	6767f90066	move ios/ folder	2024-08-14 19:55:22 +03:00
Simeon Manolov	bc162f514e	fix invalid file ref	2024-08-14 19:41:44 +03:00
Simeon Manolov	f2cddaa21b	Split vcmiclient in two ... Similar to vcmiserver (app) and vcmiservercommon (lib), now there is vcmiclient (app) and vcmiclientcommon (lib).	2024-08-14 19:20:01 +03:00
Ivan Savenko	49c5f650f7	Merge pull request #4437 from IvanSavenko/battle_sides ... Unified handling of battle sides ID's	2024-08-14 18:37:05 +03:00
Ivan Savenko	5c7c4a7810	Merge pull request #4443 from IvanSavenko/fix_sonar ... Fix miscellaneous issues discovered by Sonar	2024-08-14 17:12:27 +03:00
Ivan Savenko	89dca5061d	Merge pull request #4384 from Laserlicht/shortcut ... add shortcut for list item ordering	2024-08-14 17:04:45 +03:00
Ivan Savenko	38311244a4	Merge pull request #4402 from Laserlicht/8th_creature ... support for 8th creature (Factory)	2024-08-14 17:04:32 +03:00
Laserlicht	e83a30ea11	darkened; added values	2024-08-14 02:49:54 +02:00
Laserlicht	70bb918872	added values	2024-08-14 01:38:18 +02:00
Laserlicht	4b042aa153	table fill	2024-08-14 01:06:29 +02:00
Laserlicht	504aec3b52	statistic selection	2024-08-13 23:32:12 +02:00
Laserlicht	795a9e131f	resource selection	2024-08-13 22:40:37 +02:00
Laserlicht	fac0450256	selectionwindow	2024-08-13 22:07:09 +02:00
Laserlicht	4f8b965b36	selection	2024-08-13 21:30:54 +02:00
Laserlicht	6e6ca16d4e	gui stuff	2024-08-13 20:41:55 +02:00
Laserlicht	3bf377984a	fix	2024-08-13 01:07:55 +02:00
Laserlicht	cac778ffed	fix	2024-08-13 00:50:10 +02:00
Laserlicht	9e9a6f1c5f	Merge branch 'develop' into extended_statistic	2024-08-13 00:49:51 +02:00
Laserlicht	1980f56668	statusbar	2024-08-13 00:17:12 +02:00
Laserlicht	0c58c9ca9c	diagram rendering works	2024-08-12 23:28:08 +02:00
Laserlicht	47330653da	basic diagram functionality	2024-08-12 21:47:59 +02:00
Ivan Savenko	a7e6d4146e	Fix activation of tabs in lobby menu	2024-08-12 18:44:45 +00:00
Ivan Savenko	97f1a310df	Fix miscellaneous issues discovered by Sonar	2024-08-12 18:26:30 +00:00
Laserlicht	37283e51c3	basic diagram	2024-08-12 20:14:36 +02:00
Laserlicht	52b1219db6	code review	2024-08-12 17:53:24 +02:00
Ivan Savenko	39d3217d20	Merge pull request #4428 from Laserlicht/vcmp_rework ... VCMP format -> change to zip	2024-08-12 17:20:22 +03:00
Ivan Savenko	79c55bc898	Merge pull request #4425 from IvanSavenko/ui_cleanup ... Remove old code from UI system	2024-08-12 17:16:03 +03:00
Laserlicht	ca99dfd12f	csv export	2024-08-12 02:56:33 +02:00
Laserlicht	da86a49ea1	save var	2024-08-12 01:19:00 +02:00
Laserlicht	c9a3ea28bf	enableUiEnhancements flag	2024-08-12 01:10:47 +02:00
Laserlicht	1e298534ae	shortcut	2024-08-12 01:07:58 +02:00