6060 Commits

Author	SHA1	Message	Date
Ivan Savenko	c8d024ae11	Merge pull request #3354 from dydzio0614/antimagic-garrison ... Add missing antimagic functionality to antimagic garrisons	2023-12-22 16:33:39 +02:00
Ivan Savenko	70ee87e1d1	Merge pull request #3356 from Laserlicht/hero_info_levelup ... [1.4.2?] Possibility to show hero info in levelup window	2023-12-22 16:33:31 +02:00
Ivan Savenko	4ed283a357	Merge pull request #3359 from IvanSavenko/crashfixes ... Crashfixes	2023-12-22 15:17:59 +02:00
Ivan Savenko	d8b601e759	Fix crash on disconnecting	2023-12-22 14:03:05 +02:00
Ivan Savenko	ee976d676d	Fix crash on closing vcmi while opening is playing	2023-12-22 14:03:05 +02:00
Laserlicht	c20f0bdc3e	using CHeroArea	2023-12-22 01:30:41 +01:00
Laserlicht	f75ccc308b	right click opens hero info	2023-12-22 00:07:41 +01:00
Dydzio	39c3db04f3	Add missing antimagic functionality to antimagic garrisons	2023-12-21 18:09:33 +01:00
Ivan Savenko	27d2fc0a13	Merge pull request #3186 from SoundSSGood/quick-backpack-part1 ... Quick backpack window	2023-12-21 17:10:15 +02:00
Laserlicht	c6434c31fb	small fix	2023-12-20 20:34:57 +01:00
Laserlicht	1dd2a28760	small fix	2023-12-20 20:23:35 +01:00
Laserlicht	ed671fa2fa	big spellbook optimize	2023-12-20 20:16:23 +01:00
SoundSSGood	e5c532beb4	gesture for quick backpack window	2023-12-20 16:55:38 +02:00
Ivan Savenko	fee0e0f9a0	Merge pull request #3348 from dydzio0614/no-alttab-console ... No alt-tab console	2023-12-20 16:29:23 +02:00
Dydzio	83c2c22a6d	Change client's polling rate for server startup to 200 ms	2023-12-19 22:02:26 +01:00
Dydzio	30a9a32549	Do not trigger console via alt->tab	2023-12-19 20:02:45 +01:00
SoundSSGood	5099b52a4f	Quick backpack. Spells on scrolls view	2023-12-19 19:01:56 +02:00
SoundSSGood	21b02414bf	Refactoring. Callbacks have been encapsulated. Added cursorPosition	2023-12-19 19:01:56 +02:00
SoundSSGood	29b61081f3	Quick backpack	2023-12-19 19:01:56 +02:00
Ivan Savenko	103151f1f7	Merge pull request #3343 from IvanSavenko/fix_spellbook_animation ... Fix spellbook page flip animation	2023-12-18 13:32:30 +02:00
Ivan Savenko	732cdfec73	Merge pull request #3254 from Laserlicht/spell_search ... search spells	2023-12-18 13:23:06 +02:00
Ivan Savenko	44a79c1ff4	Merge pull request #3327 from Laserlicht/datetime ... date time format	2023-12-18 13:21:01 +02:00
Ivan Savenko	f575e46ba0	Clear only part of screen covered by video - required for spellbook	2023-12-18 01:01:02 +02:00
Laserlicht	77505af71b	remove removefoucs	2023-12-17 22:17:32 +01:00
Laserlicht	9299eaed36	code review	2023-12-16 21:10:27 +01:00
Laserlicht	56562ad8dc	date time format	2023-12-16 18:57:38 +01:00
Ivan Savenko	9f8a5119f9	Less strict check for Armageddon's Blade data files presence	2023-12-16 15:04:41 +02:00
Ivan Savenko	5f4608c9f0	Fixed memory corruption on usage of radial wheel to reorder towns/heroes	2023-12-16 13:46:29 +02:00
Ivan Savenko	16e845e1c8	- Check for presence of AB files on startup	2023-12-16 13:46:29 +02:00
Ivan Savenko	a1f34e059a	Fix possible crash on starting 2nd battle while intro sound from 1st one ... is still playing	2023-12-13 19:35:02 +02:00
Ivan Savenko	873fd33e7a	Workaround for mingw and armeabi Android build	2023-12-13 19:23:32 +02:00
Ivan Savenko	76cb5387c5	Access CHero in a way that will throw exception on invalid access ... instead of crash	2023-12-13 16:50:56 +02:00
Ivan Savenko	0dce278a3b	Attempt to fix crash on app exit on Android	2023-12-13 16:50:13 +02:00
Ivan Savenko	4fa33c8d2e	Merge pull request #3279 from Laserlicht/smooth_scroll_fix ... smooth scroll fix and gui option to disable	2023-12-10 22:49:43 +02:00
Ivan Savenko	e44a8ebfd9	Merge pull request #3291 from Laserlicht/audio_mute_setting ... audio mute on focus lost setting	2023-12-10 22:48:52 +02:00
Laserlicht	df2a5f05d8	audio mute on focus lost setting	2023-12-10 14:49:27 +01:00
Laserlicht	e74c2262c3	add option to gui to disable smooth dragging	2023-12-10 13:38:58 +01:00
Laserlicht	b8e40978a0	stop smooth scroll when using window borders to scroll	2023-12-09 17:29:57 +01:00
Ivan Savenko	902db091da	Simple fix for slider activation when clicking on left/right buttons	2023-12-09 18:09:10 +02:00
Laserlicht	dfb10bdfcb	search rectangle	2023-12-08 22:52:34 +01:00
Laserlicht	95ff89f622	search spells	2023-12-08 22:46:05 +01:00
Ivan Savenko	edbe25b33a	Updated layout and localizations	2023-12-07 16:36:44 +02:00
Ivan Savenko	861c53059e	Added callbacks for preset dropdowns	2023-12-07 13:57:16 +02:00
Ivan Savenko	653304b004	Implemented accumulating timers, rename creature timer to unit timer	2023-12-07 13:57:16 +02:00
Ivan Savenko	1f0bcbc194	Added option to configure dropdown position	2023-12-07 13:57:16 +02:00
Ivan Savenko	0fd966818f	Remove 'visible' property from images, replaced with enable/disabled ... call	2023-12-07 13:57:16 +02:00
Ivan Savenko	3b3c4860b2	Avoid creation of new threads without mutex protection	2023-12-03 15:58:03 +02:00
Andrii Danylchenko	26b6d1cf74	NKAI: fix capturing shipyards	2023-12-02 14:03:54 +02:00
Ivan Savenko	be9c7f2099	Merge pull request #3239 from IvanSavenko/pathfinder_fixes ... Pathfinder fixes	2023-12-02 12:20:44 +02:00
Ivan Savenko	d919cb0eac	Merge pull request #3240 from IvanSavenko/bugfixing ... [1.4.0] Bugfixing for beta	2023-12-02 12:20:37 +02:00
Ivan Savenko	55ad903ffb	Merge pull request #3231 from dydzio0614/large-spellbook-setting ... Split large spellbook from UI enhancements setting	2023-12-02 12:13:06 +02:00
Dydzio	fc035b1b55	Change large spellbook config section to gameTweaks	2023-11-28 22:30:50 +01:00
Ivan Savenko	ea8995e901	Fixed check for free slots when recruiting in towns	2023-11-28 16:25:11 +02:00
Ivan Savenko	42ad860850	Merge pull request #3230 from dydzio0614/connection-button-fix ... Display disabled connect button on server autojoin	2023-11-28 12:37:18 +02:00
Ivan Savenko	a7c45d8ec8	Remove assert - confirmed to be legal scenario	2023-11-28 12:32:24 +02:00
Ivan Savenko	48907f5e8b	Merge pull request #3237 from IvanSavenko/regressions_fix ... Fixes for unresolved regressions	2023-11-28 12:24:24 +02:00
Ivan Savenko	5df53f6ea2	Hota compatibility fix - allow stack selection border to have different ... size than creature icon	2023-11-27 23:20:24 +02:00
Ivan Savenko	02f7193260	Fix regression from map translation - properly translate custom main ... hero name	2023-11-27 20:27:10 +02:00
Ivan Savenko	b8a4091356	Fix regressions from timers - client may be destroyed while receiving ... timer update or pack reply	2023-11-27 20:27:10 +02:00
Ivan Savenko	d5f8db2222	Fixed undefined behavior on accessing array with -1 index	2023-11-27 14:09:08 +02:00
Ivan Savenko	e21e3f8386	Do not display "Spell Cancelled" message on right-click when no stack is ... active	2023-11-27 14:09:08 +02:00
Ivan Savenko	d06ae15c6e	Fix teleporting animation	2023-11-27 14:08:49 +02:00
Ivan Savenko	344d8891e4	Fix display of creatures to sell in Freelancer Guild	2023-11-27 14:08:49 +02:00
Ivan Savenko	81a48f2d80	Do not attempt to resize text box to zero-width	2023-11-27 14:08:49 +02:00
Dydzio	a4d76b2529	Split large spellbook from UI enhancements setting	2023-11-26 19:16:53 +01:00
Dydzio	4b57b9f9a9	Display disabled connect button on server autojoin	2023-11-26 18:39:51 +01:00
Laserlicht	2eada0efca	allow shortcout if any town has a marketplace	2023-11-25 03:14:31 +01:00
Laserlicht	1954447a9e	fix image order	2023-11-25 02:58:06 +01:00
Ivan Savenko	e5e01ab35d	Disable spectator mode in single player to avoid confusing players	2023-11-20 14:38:57 +02:00
Ivan Savenko	aaefc07182	Merge pull request #3198 from IvanSavenko/ai_optimize ... AI optimizations	2023-11-20 14:06:25 +02:00
Ivan Savenko	07990644b5	Merge pull request #3191 from Laserlicht/touch-introduction ... Touch introduction	2023-11-20 14:05:47 +02:00
Ivan Savenko	a3f9450d83	Relax UI locking to reduce delays in AI actions	2023-11-18 19:41:00 +02:00
Laserlicht	70b6906e6d	adjust messages, add radial wheel	2023-11-17 18:23:11 +01:00
Laserlicht	a6dd5c2887	translation	2023-11-16 23:03:41 +01:00
Laserlicht	1bf05d43a1	fix video implementation error; implement paging; video loading	2023-11-16 22:39:50 +01:00
Ivan Savenko	76956cfe3a	Merge pull request #3188 from IvanSavenko/remove_identifier_implicit_int_conversion2 ... Remove implicit conversion of identifier to integer	2023-11-16 17:26:32 +02:00
Ivan Savenko	de02507fff	Merge pull request #3193 from IvanSavenko/warn_mod_dependencies ... Show message about mods that failed to load on opening main menu	2023-11-16 17:26:19 +02:00
Laserlicht	2cfbcd067b	videos	2023-11-16 02:58:43 +01:00
Ivan Savenko	d1a4e84255	Show message about mods that failed to load on opening main menu	2023-11-15 17:57:40 +02:00
Ivan Savenko	0705604129	Merge pull request #3185 from IvanSavenko/memleak_fix ... Memory leak fixes	2023-11-15 16:00:38 +02:00
Ivan Savenko	52050d0ef1	Fix build	2023-11-15 15:55:19 +02:00
Ivan Savenko	6cb1f6ff11	Remove all remaining implicit conversion in lib	2023-11-15 15:55:19 +02:00
Ivan Savenko	13763cad8e	Remove few more implicit conversions	2023-11-15 15:55:19 +02:00
Ivan Savenko	0842f5afee	Removed remaining usages of std::vector<bool>	2023-11-15 15:55:18 +02:00
Ivan Savenko	a9f868b379	Merge pull request #3166 from IvanSavenko/simturns_ui ... UI for Simturns	2023-11-15 14:10:57 +02:00
Ivan Savenko	060e1cef21	Merge pull request #3182 from Alexander-Wilms/fix-fps-counter ... Move FPS counter to bottom left, set width of black background to suf…	2023-11-15 13:56:27 +02:00
Laserlicht	05efb12d82	format fix	2023-11-14 22:50:22 +01:00
Laserlicht	cb92778e00	add ui	2023-11-14 22:39:11 +01:00
Laserlicht	f7a31865f3	basic touch introduction implementation	2023-11-14 21:52:30 +01:00
Ivan Savenko	f65f4b1285	Disable new UI if enhancements are off	2023-11-13 19:49:41 +02:00
Ivan Savenko	d1ae5bbee5	Implement AI simturns checkbox	2023-11-13 19:06:56 +02:00
Ivan Savenko	c5eeaa6526	Added non-linear slider for better simturn duration selection	2023-11-13 19:06:56 +02:00
Ivan Savenko	7d54f6a9c0	Implemented basic support for plural forms in translations	2023-11-13 19:06:56 +02:00
Ivan Savenko	e160b8557b	Implement min/max simturns callbacks	2023-11-13 19:06:56 +02:00
Ivan Savenko	32633d5f52	Initial version of Turn Options tab screen	2023-11-13 19:06:56 +02:00
Ivan Savenko	3268ebe27c	Moved some code from OptionTab to separate class, OptionTabBase	2023-11-13 19:06:56 +02:00
Ivan Savenko	301ac2457a	Cleanup	2023-11-13 17:48:55 +02:00
Ivan Savenko	af0afb251e	Correctly shutdown client media handlers	2023-11-13 16:27:15 +02:00
Ivan Savenko	a6f37b7cd7	Fixed few more memory leaks in client	2023-11-13 16:27:15 +02:00
Ivan Savenko	20ef3a69e7	Fix most of memleaks discovered by valgrind	2023-11-13 16:27:15 +02:00
Ivan Savenko	1192dbff15	Merge pull request #3180 from IvanSavenko/bugfixing ... Fixes for miscellaneous accumulated issues	2023-11-13 16:26:33 +02:00
Alexander Wilms	c0c16fed75	Move FPS counter to bottom left, set width of black background to suffice for 3 digit FPS ... Fixes #3171	2023-11-13 02:52:19 +01:00
Ivan Savenko	c6f9434c8e	Merge pull request #3170 from gamestales/gamestales/2903-morale-description-1442 ... #2903-morale-description-#1442	2023-11-13 01:53:29 +02:00
Ivan Savenko	b86060d729	Merge pull request #3169 from Alexander-Wilms/intro-clear-screen ... CVideoHandler.cpp: Clear screen before rendering each frame of the intro	2023-11-12 19:38:02 +02:00
Ivan Savenko	bc51d9c772	Merge pull request #3161 from SoundSSGood/art-swap-optimization ... Artifacts swap optimization	2023-11-12 19:37:25 +02:00
Ivan Savenko	833051cced	Display exit confirmation dialog on Alt-F4	2023-11-12 17:35:43 +02:00
Ivan Savenko	59806bf112	Fix right-click tooltips for starting hero/towns	2023-11-12 17:17:07 +02:00
Ivan Savenko	07472d3b05	Merge pull request #3147 from IvanSavenko/serialization_refactor ... Serialization refactor - remove VLC from saved games	2023-11-11 17:35:01 +02:00
Ivan Savenko	5c810df36f	Reorganized types registration code	2023-11-11 00:39:08 +02:00
gamestales-com	a574f18e69	#2903-morale-description-#1442	2023-11-10 15:58:19 +01:00
Alexander Wilms	eee1a4d061	CVideoHandler.cpp: Clear screen before rendering each frame of the intro ... This way, the background is black instead of showing glitchy artifacts when one resizes the window	2023-11-10 03:37:42 +01:00
Ivan Savenko	359af84d59	Fix crash on starting battle in MP	2023-11-09 01:22:09 +02:00
Ivan Savenko	864462b84a	Reduce excessive updates of garrisons. Fixes selection reset in simturns	2023-11-09 00:01:48 +02:00
Ivan Savenko	4a7fa9bf8c	Simplified CTypeList class	2023-11-08 22:05:36 +02:00
SoundSSGood	57e3abc548	ask assemble regression fixed	2023-11-08 21:59:55 +02:00
SoundSSGood	ce3d407396	artifacts swap optimization	2023-11-08 21:58:48 +02:00
Ivan Savenko	eb167d94a6	Mod compatibility check is now in a separate class and not part of ... ModHandler	2023-11-08 21:27:05 +02:00
Ivan Savenko	6b81012f31	Use variant identifier in netpacks where applicable	2023-11-08 14:00:23 +02:00
Ivan Savenko	0b4fa20bdc	Merge pull request #3152 from SoundSSGood/CAltar-widget ... Altar rework	2023-11-08 13:42:00 +02:00
SoundSSGood	41ee52d9d4	fix build & suggested changed	2023-11-08 01:51:13 +02:00
Ivan Savenko	86a3806bec	MetaString refactor to eliminate integer usage for identifiers ... - entity names are now stored and serialized as text ID's - added helper methods for convenience to get entities names to metastring	2023-11-07 22:47:10 +02:00
Ivan Savenko	f4feaea177	Merge pull request #3141 from IvanSavenko/better_tooltips ... Better tooltips	2023-11-07 22:46:02 +02:00
Tomasz Zieliński	c909bd766e	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # lib/rmg/CMapGenOptions.cpp # lib/rmg/CMapGenOptions.h	2023-11-07 20:54:04 +01:00
Ivan Savenko	f039b20653	Improvement for wandering monster tooltip/hover text: ... - show Visions information only on right-click (H3 logic) - show threat level only on right-click and only if UI tweaks are on	2023-11-06 20:37:07 +02:00
SoundSSGood	539b2e596d	adjusting the placement of artifact slots	2023-11-06 14:31:32 +02:00
SoundSSGood	75ebd954af	Creatures altar & Artifacts altar	2023-11-06 14:31:32 +02:00
SoundSSGood	9f9317a8a0	CTradeBase initial commit	2023-11-06 14:31:31 +02:00
SoundSSGood	fbe3e0fe12	CArtPlace preparation	2023-11-06 14:01:13 +02:00
Andrii Danylchenko	0927d3e3e8	Merge pull request #3145 from vcmi/fix-3142 ... #3142 - fi custom campaign selection screen	2023-11-05 11:12:58 +02:00
Andrii Danylchenko	060079cfc6	Merge pull request #3146 from vcmi/fix-3006 ... #3006 - fix starting move from teleport	2023-11-05 11:12:41 +02:00
Ivan Savenko	8dc5837395	Merge pull request #3144 from IvanSavenko/remove_identifier_implicit_int_conversion ... Remove (some of) implicit conversions of Identifier to integer	2023-11-04 19:36:11 +02:00
Ivan Savenko	5487f07d3b	added toEntity overload that accepts generic Services class	2023-11-04 17:04:53 +02:00
Andrii Danylchenko	91c04f4718	#3006 - fix starting move from teleport	2023-11-04 15:43:08 +02:00
Andrii Danylchenko	d50ebd7d58	#3142 - fi custom campaign selection screen	2023-11-04 14:34:18 +02:00
Andrii Danylchenko	a8cc5e1d60	Merge pull request #3140 from vcmi/fix-3003 ... #3003 - fix hypnotize	2023-11-04 10:50:58 +02:00
Ivan Savenko	184f5a72cc	Use toEntity/toXXX methods in Identifier instead VLC objects access	2023-11-03 16:03:29 +02:00
Ivan Savenko	8d5fa41a19	Minor fixes	2023-11-03 16:03:29 +02:00
Ivan Savenko	87f6c7354b	Merge pull request #3139 from IvanSavenko/component_variant_identifier ... Refactoring of Component class	2023-11-03 15:52:07 +02:00
Ivan Savenko	4a24da3804	Merge pull request #3114 from Laserlicht/fix-highscore ... fix high scores screen	2023-11-03 15:51:37 +02:00
Ivan Savenko	7a254dd55f	Merge pull request #3135 from IvanSavenko/file_corruption_check ... Ignore corrupted .def files	2023-11-03 15:49:43 +02:00
Andrii Danylchenko	3b27e07385	#3003 - fix hypnotize	2023-11-03 13:50:16 +02:00
Ivan Savenko	056ef00f74	Bugfixing	2023-11-02 13:52:58 +02:00
Ivan Savenko	10e50548e7	Converted Component class to use VariantIdentifier instead of int	2023-11-02 12:00:04 +02:00
Ivan Savenko	0376873cb3	Merge pull request #3125 from IvanSavenko/reduce_subid_usage ... Reduce usage of CGObjectInstance::subID	2023-11-02 11:58:01 +02:00
Andrii Danylchenko	5cd16e5b27	Merge pull request #3124 from vcmi/fix-2977 ... #2977 - fix obstackle path deserialization	2023-11-01 15:27:14 +02:00
Ivan Savenko	8346d71c98	Remove more subID access	2023-11-01 14:44:05 +02:00
Ivan Savenko	7107b3202f	Merge pull request #3069 from SoundSSGood/artifact-location-id ... ArtifactLocation now use ID for artHolder identification	2023-11-01 14:41:36 +02:00
Laserlicht	8a9f10ec3a	fix asset failures	2023-10-31 22:05:22 +01:00
Ivan Savenko	858ba22a27	Ignore corrupted .def files	2023-10-31 12:11:41 +02:00
Tomasz Zieliński	6e7b68d0e6	Unused variable, unused code	2023-10-30 21:33:49 +01:00
Tomasz Zieliński	e105b23a37	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON # Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON # Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON # Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON # client/lobby/RandomMapTab.cpp	2023-10-30 20:08:13 +01:00
Tomasz Zieliński	f39edf9413	Update ally and enemy flags when selecting new template	2023-10-30 07:48:51 +01:00
Tomasz Zieliński	4f2cde018c	Fixed most of reported issues, removed unused code.	2023-10-29 21:25:39 +01:00
SoundSSGood	c2f658d638	Bulk move artifacts. id	2023-10-29 17:46:13 +02:00
SoundSSGood	3c5527a222	ArtifactLocation now use ID for artHolder identification part3	2023-10-29 17:46:13 +02:00
SoundSSGood	ab2f6abb87	ArtifactLocation now use ID for artHolder identification part2	2023-10-29 17:46:13 +02:00
SoundSSGood	61fc236d79	ArtifactLocation now use ID for artHolder identification part1	2023-10-29 17:46:13 +02:00
Andrii Danylchenko	73b89d4e84	#2977 - fix obstackle path deserialization	2023-10-29 16:07:00 +02:00
Alexander Wilms	5cbc75d3b7	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
Alexander Wilms	e677164ed0	client/widgets/Buttons.h: Fix const reference ... Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>	2023-10-29 13:34:19 +00:00
Alexander Wilms	5d7b83c10b	client/widgets/Buttons.cpp: Fix const reference ... Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>	2023-10-29 13:34:19 +00:00
Alexander Wilms	466cdb9d2b	client/widgetsImages.{h,cpp}: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char')	2023-10-29 13:34:19 +00:00
Alexander Wilms	f1bb6b999c	client/widgets/Buttons.{h,cpp}: Pass expensive to copy object "callback" by reference to const.	2023-10-29 13:33:57 +00:00
Ivan Savenko	0169c65937	Merge pull request #3100 from IvanSavenko/split_net_packs ... Split netpacks.h into multiple files	2023-10-29 13:46:40 +02:00
Tomasz Zieliński	368a185008	Cleaning up the code	2023-10-29 10:05:24 +01:00
Alexander Wilms	e4db6f2af8	CClient::removeGUI(): This function should be declared 'const'	2023-10-28 23:05:05 +00:00
Tomasz Zieliński	07dac8b6d4	Works more or less	2023-10-28 20:30:38 +02:00
Alexander Wilms	bb04ca46b5	client/NetPacksClient.cpp: Combine null pointer checks ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-27 23:43:39 +00:00
Alexander Wilms	92bab6dd08	client/NetPacksClient.cpp: Combine null pointer checks ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-27 23:43:39 +00:00
Alexander Wilms	d2c03773cd	client/NetpacksClient.cpp: Called C++ object pointer is null ... Null pointers should not be dereferenced	2023-10-27 23:43:39 +00:00
Alexander Wilms	ead1140b9b	client/icons/generate_icns.py: Replace print statement by built-in function. ... The "print" statement should not be used	2023-10-27 23:34:11 +00:00
Alexander Wilms	10ad5b6789	client/windows/CCastleInterface.cpp: Identical sub-expressions on both sides of operator "&&". ... Identical expressions should not be used on both sides of a binary operator	2023-10-27 18:19:17 +00:00
Alexander Wilms	f01ec55d21	Use the "nullptr" literal. ... "nullptr" should be used to denote the null pointer	2023-10-27 18:18:59 +00:00
Laserlicht	c1707bcc71	fix datatype	2023-10-27 18:52:25 +02:00
Alexander Wilms	3616235bb5	FramerateManager.cpp: Merge this "if" statement with the enclosing one. ... Collapsible "if" statements should be merged	2023-10-27 14:30:04 +00:00
Nordsoft91	8f2b50a5e2	Merge pull request #3095 from Laserlicht/team_alignment ... fix team alignments	2023-10-26 23:19:18 +02:00
Tomasz Zieliński	a817e481d0	Merge fix	2023-10-26 10:46:04 +02:00
Tomasz Zieliński	36911d1e0a	Merge remote-tracking branch 'origin/develop' into fix_rmg_teams ... # Conflicts: # client/lobby/RandomMapTab.cpp	2023-10-26 10:31:41 +02:00
Laserlicht	e28d14d16d	not needed anymore	2023-10-24 18:56:30 +02:00
Laserlicht	abb279f5b4	use config	2023-10-24 18:51:58 +02:00
Ivan Savenko	5523f05284	Moved ArtifactLocation to a separate file	2023-10-23 19:02:28 +03:00
Ivan Savenko	b88a8da4e8	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03:00
Ivan Savenko	3880ea58b9	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
Ivan Savenko	3867e512f7	Merge pull request #3064 from IvanSavenko/bonus_metaidentifier ... Type-safe bonus system	2023-10-22 18:34:12 +03:00
Ivan Savenko	a70ad7202f	Merge pull request #3088 from Laserlicht/non_squared ... Minimap keep aspect ratio (Letterboxing)	2023-10-22 16:55:58 +03:00
Ivan Savenko	ac925bb786	Renamed new types for consistency with code style	2023-10-22 16:55:19 +03:00
Ivan Savenko	80e6485965	MetaIdentifier now uses std::variant internally	2023-10-22 16:55:19 +03:00
Ivan Savenko	b394158dc9	Bonus Source ID now uses metaidentifier	2023-10-22 16:55:18 +03:00
Ivan Savenko	77facf9387	Implement missing functions, fixes linking errors	2023-10-22 16:54:56 +03:00
Ivan Savenko	454ba44ac5	Merge pull request #2988 from IvanSavenko/configurable_extensions ... Extension of configurable object functionality	2023-10-22 16:24:47 +03:00
Laserlicht	b67548e7cf	format	2023-10-22 15:06:12 +02:00
Laserlicht	7b370d1967	fix team alignments	2023-10-22 15:00:04 +02:00
Ivan Savenko	8752551786	Merge pull request #3086 from Laserlicht/show_random ... show random maps	2023-10-22 12:29:31 +03:00
Ivan Savenko	acc8e9db32	Merge pull request #3082 from SoundSSGood/crash-hotfix ... Сrash fixed and little optimization	2023-10-22 12:01:28 +03:00
Ivan Savenko	07cd894024	Merge pull request #3090 from Laserlicht/fix_town_selection ... [fix] no town selection on loadscreen	2023-10-22 12:01:00 +03:00
Laserlicht	0b0082eebc	format	2023-10-22 00:22:49 +02:00
Laserlicht	ab59c153b3	fix	2023-10-22 00:22:16 +02:00
Laserlicht	05a9f0fe39	move to EventReceiver	2023-10-22 00:05:14 +02:00
Laserlicht	6939989026	try to fix	2023-10-21 23:37:59 +02:00
Laserlicht	a042cc46c2	no town selection on loadscreen	2023-10-21 19:10:02 +02:00
Laserlicht	d215ffa011	optics	2023-10-21 18:45:45 +02:00
Laserlicht	737525756f	fix redraw	2023-10-21 17:28:23 +02:00
Laserlicht	e03f2a9d3a	improvements for non quadratic maps	2023-10-21 16:49:50 +02:00
Laserlicht	86e6f7d156	fix	2023-10-21 02:26:03 +02:00
Laserlicht	ceb70af528	fix	2023-10-21 02:22:22 +02:00
Laserlicht	9a116f9b20	small optimisation	2023-10-21 02:16:42 +02:00
Laserlicht	0eba0ee686	show random maps	2023-10-21 02:12:34 +02:00
Nordsoft91	f3acc939b9	Merge pull request #3062 from Laserlicht/sort_towns ... sort town/hero feature	2023-10-20 22:51:26 +02:00
Nordsoft91	12b179ef1f	Merge pull request #3057 from Laserlicht/rw_hero	2023-10-20 01:42:06 +02:00
SoundSSGood	068a7d5d4a	crash fixed	2023-10-20 01:11:10 +03:00
Johannes Schauer Marin Rodrigues	a1a5bc28c2	convert line endings from CRLF (Windows) to LF (Linux/Unix) ... Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073	2023-10-19 16:23:21 +02:00
Ivan Savenko	e0f6b582f5	Display object description only on right-click	2023-10-19 14:36:11 +03:00
Ivan Savenko	0f2922d064	Only show components if UI enhancements is on	2023-10-19 13:33:49 +03:00
Ivan Savenko	d295840c64	Merge pull request #3075 from josch/spelling ... some spelling fixes	2023-10-19 11:15:25 +03:00
Johannes Schauer Marin Rodrigues	f9e1b302c7	some spelling fixes	2023-10-18 01:41:02 +02:00
Alexandre Detiste	15e45f966c	typos found by lintian	2023-10-17 22:06:08 +02:00
Laserlicht	2fcbf78e4e	unused var	2023-10-17 21:22:27 +02:00
Laserlicht	464c65a595	fix	2023-10-17 21:17:57 +02:00
Laserlicht	e05102192b	heroes and more buttons	2023-10-17 21:13:08 +02:00
Laserlicht	464577be28	new icons	2023-10-17 20:06:35 +02:00
Ivan Savenko	927ce4e60e	Improvements to rewardable objects popups	2023-10-16 23:55:37 +03:00
Nordsoft91	1ffc246c8b	Merge pull request #3051 from Laserlicht/name_change ... possibility to change name in lobby	2023-10-16 22:28:31 +02:00
Laserlicht	be6ed36422	fix	2023-10-16 21:35:29 +02:00
Laserlicht	ecd093cae4	fix	2023-10-16 21:28:44 +02:00
Laserlicht	0a1578b797	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-16 21:24:59 +02:00
Laserlicht	d5b16ac96c	rename	2023-10-16 01:43:50 +02:00
Laserlicht	f3262a47c0	Update client/adventureMap/CList.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-16 01:42:01 +02:00
Laserlicht	f6843c0574	fix focus problem	2023-10-16 01:39:53 +02:00
Laserlicht	aeb559efb8	code review	2023-10-16 00:04:29 +02:00
Nordsoft91	ee997a291c	Merge pull request #3045 from Laserlicht/interface_improvement ... various interface shortcuts	2023-10-15 23:48:22 +02:00
Ivan Savenko	dd841bdaa7	Use enum instead of mix of bool's and int's for tile reveal	2023-10-16 00:12:38 +03:00
Ivan Savenko	98fd939ed6	Cartographer/Observatory is now configurable object	2023-10-16 00:12:38 +03:00
Laserlicht	4528f42cdf	fix segmentation fault; update townlist on adventuremap	2023-10-15 15:53:19 +02:00
Laserlicht	3b853bff08	sort town feature	2023-10-15 14:31:33 +02:00
Laserlicht	efcf6b71d7	formatting	2023-10-15 12:58:07 +02:00
Laserlicht	dd0033296f	docs	2023-10-15 12:28:13 +02:00
Laserlicht	5ae646bd15	Update client/windows/GUIClasses.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-10-15 12:19:44 +02:00
Laserlicht	23e1b0b0d5	radial wheel for hero	2023-10-15 02:43:42 +02:00
Laserlicht	78026f40eb	name opens town itself	2023-10-15 00:41:17 +02:00
Laserlicht	f6071ed181	fix	2023-10-15 00:09:32 +02:00
Laserlicht	c96cc405ed	town now updates	2023-10-14 23:41:12 +02:00
nordsoft	c8452355ce	Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-connection" ... This reverts commit 43636af2e4, reversing changes made to aed2e360ba. # Conflicts: # client/CServerHandler.cpp	2023-10-14 22:52:24 +02:00
Nordsoft91	aa25ab6488	Merge pull request #3035 from Nordsoft91/quests ... Quests rework	2023-10-14 21:38:15 +02:00
Laserlicht	b2396a61fa	code review	2023-10-14 13:34:39 +02:00
Laserlicht	7217992898	code review	2023-10-14 12:08:38 +02:00
Laserlicht	b89cdda718	Tavern also in infobox & haptics	2023-10-13 23:36:51 +02:00
Laserlicht	0c6b1ca3c8	possibility to change name	2023-10-13 23:04:35 +02:00
Laserlicht	5a84e7cd7f	Update client/windows/GUIClasses.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-13 19:56:56 +02:00
Laserlicht	08832eeeb4	fix	2023-10-13 19:56:56 +02:00
Laserlicht	3c117da4eb	fix tavern	2023-10-13 19:56:56 +02:00
Laserlicht	9e508fe2c2	interface improvements	2023-10-13 19:56:56 +02:00
Nordsoft91	802e1bb961	Merge pull request #3042 from Laserlicht/crash_preview ... [fix] crash with custom campaign preview	2023-10-13 10:57:02 +02:00
Nordsoft91	093c8149e5	Merge pull request #3040 from Laserlicht/infobox_next	2023-10-13 10:38:32 +02:00
Nordsoft91	ab36692847	Merge pull request #3037 from Laserlicht/missing_res	2023-10-13 10:36:33 +02:00
nordsoft	fadf086e61	Fix review comments	2023-10-12 13:30:01 +02:00
Nordsoft91	4ae123e2a1	Merge pull request #3038 from Alexander-Wilms/connection-error-window ... Show info dialog when connection to multiplayer server fails	2023-10-12 00:16:04 +02:00
nordsoft	7ccd4cdcb2	Refactor quests progress	2023-10-11 21:10:42 +02:00
Nordsoft91	ecd01fd53c	Merge pull request #3039 from Laserlicht/townhall_click	2023-10-11 18:43:59 +02:00
Laserlicht	abab917ef9	fix crash with custom campaign preview	2023-10-11 11:23:38 +02:00
Laserlicht	f9db3d131f	lastActivated with overload	2023-10-10 23:51:05 +02:00
nordsoft	bb238f9b72	New quests work	2023-10-10 23:44:29 +02:00
Nordsoft91	773fb965ba	Merge pull request #3028 from Nordsoft91/fixes ... Fix campaign advance crash	2023-10-10 23:41:52 +02:00
Nordsoft91	25952f8223	Merge pull request #3027 from Nordsoft91/turn-timer ... Add game pause	2023-10-10 23:41:36 +02:00
Laserlicht	8a3e58cd5e	red is the most liked color	2023-10-10 23:15:40 +02:00
Laserlicht	53ee843e7e	fixes problem with radial menu	2023-10-10 22:33:22 +02:00
Laserlicht	890c4ac19d	quick army managment click next	2023-10-10 22:11:06 +02:00
Laserlicht	926bf71814	make townhall clickable	2023-10-10 21:02:40 +02:00
Alexander Wilms	7c627d8163	Show info dialog when connection to multiplayer server fails	2023-10-10 18:11:11 +02:00
Ivan Savenko	e247c29269	Merge pull request #3021 from Laserlicht/video ... video loop fix and missing videos/sounds for battle result	2023-10-10 18:48:19 +03:00
Nordsoft91	b6da60b105	Merge pull request #3023 from Laserlicht/video_audio ... audio from SMK video file	2023-10-10 00:40:33 +02:00
Laserlicht	25f7bb40d0	new layout	2023-10-09 22:50:07 +02:00
Laserlicht	19788c6399	suggestion	2023-10-09 22:22:10 +02:00
Laserlicht	fa9d5e9971	show missing resources	2023-10-09 21:43:43 +02:00
Laserlicht	7ef9e91741	new approach	2023-10-08 21:19:04 +02:00
Laserlicht	89a39fcfc0	code review	2023-10-08 20:27:56 +02:00
nordsoft	fe7c01cd37	Fix 3024	2023-10-08 17:46:47 +02:00
Nordsoft91	43636af2e4	Merge pull request #2959 from Alexander-Wilms/faster-server-connection ... Sleep for 10 ms instead of 1000 ms while waiting for server connection	2023-10-08 17:21:57 +02:00
Nordsoft91	aed2e360ba	Merge pull request #2997 from Alexander-Wilms/fix-ios-pch ... Enable ccache for iOS and MSVC builds	2023-10-08 16:10:07 +02:00
nordsoft	d7d435dcb7	Add game pause	2023-10-08 16:03:57 +02:00
Laserlicht	a1f6e49f87	vcmi always uses only 2 channels	2023-10-08 14:09:07 +02:00
Laserlicht	639b6c6577	version	2023-10-08 12:49:59 +02:00
Laserlicht	66ff603456	remove crackle	2023-10-08 12:49:59 +02:00
Laserlicht	39e06ea5e1	fix error message	2023-10-08 12:49:59 +02:00
Laserlicht	3c647334b0	remove other pr	2023-10-08 12:49:59 +02:00
Laserlicht	be2b3afe48	implements sounds	2023-10-08 12:49:59 +02:00
Laserlicht	2bbce0f38b	decoding working	2023-10-08 12:49:59 +02:00
Laserlicht	8de4b88a1b	basically playing	2023-10-08 12:49:59 +02:00
Laserlicht	628de69a63	audio	2023-10-08 12:49:59 +02:00
Laserlicht	63fbaa8380	support raw audio	2023-10-08 12:49:59 +02:00
Nordsoft91	088ce9b948	Merge pull request #3013 from Nordsoft91/turn-timer	2023-10-08 12:11:44 +02:00
Laserlicht	42bf5fdd58	video fix	2023-10-07 14:31:49 +02:00
Alexander Wilms	732c39fcc6	Fix build	2023-10-07 00:08:22 +02:00
Alexander Wilms	c8f1512a3f	Use correct address to decide whether we're connecting to a remote server or a local one	2023-10-06 23:33:51 +02:00
nordsoft	9b54b25a6c	Show timer only for one player	2023-10-06 18:17:05 +02:00
nordsoft	a09c595cf4	Support simturn timers	2023-10-06 18:17:05 +02:00
nordsoft	043f54698b	Fix translations in map editor / fix crash on game end	2023-10-05 23:34:29 +02:00
Ivan Savenko	b75a67ef7c	Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor ... Improvements to type safety of Identifier class	2023-10-05 00:33:07 +03:00
Ivan Savenko	179def179f	Merge pull request #2969 from IvanSavenko/tavern_query ... Add query for Tavern, Dwelling and Market visits	2023-10-04 22:34:45 +03:00
Ivan Savenko	56d5c74a61	Merge pull request #2996 from Nordsoft91/fix-2992 ... Capture key event in chat box	2023-10-04 19:59:06 +03:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
Ivan Savenko	39a92cdde3	Add query for dwellings dialog	2023-10-04 17:47:12 +03:00
Ivan Savenko	898733eed7	Added Query to track visit duration for Taverns and Markets	2023-10-04 17:47:12 +03:00
Ivan Savenko	e322d0a084	Merge pull request #2966 from IvanSavenko/simplify_ui_lock ... Simplified locking of game UI state	2023-10-04 16:50:23 +03:00
Alexander Wilms	b58cca7770	100 connection attempts is not always enough	2023-10-03 22:06:32 +02:00
Alexander Wilms	a66d8ecb8f	Use ui16 instead of uint for connectionAttemptCount to fix MinGW build	2023-10-03 22:06:32 +02:00
Alexander Wilms	e1401d26c5	hostAddress can be localhost, return from justConnectToServer() is maximum number of attempts is exceeded	2023-10-03 22:06:32 +02:00
Alexander Wilms	39427d6658	Use different delay and maximum number of connection attempts for local and remote servers	2023-10-03 22:06:32 +02:00
Alexander Wilms	9f9930a9dd	CServerHandler::justConnectToServer(): Read settings only once	2023-10-03 22:06:32 +02:00
Alexander Wilms	614d000376	Sleep for 10 ms instead of 1000 ms while waiting for server connection	2023-10-03 22:06:32 +02:00
Laserlicht	ec8580b99e	Merge branch 'develop' into patch-4map_overview_rework	2023-10-02 21:03:16 +02:00
Nordsoft91	4620d2c96d	Merge pull request #2980 from Nordsoft91/proxy-reconnect ... Allow to reconnect to proxy server	2023-10-02 20:42:11 +02:00
Nordsoft91	c57d5545c2	Merge pull request #2971 from Nordsoft91/translations ... Multi-language support for network game and for VMAPs	2023-10-02 20:41:42 +02:00
Laserlicht	12ca3ea0ec	pos from texture	2023-10-01 19:44:04 +02:00
Alexander Wilms	46d785c371	Fix iOS build with ENABLE_PCH=OFF ... https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891 Fixes #2991	2023-10-01 18:16:41 +02:00
Laserlicht	cbd014ac88	code review	2023-10-01 17:35:56 +02:00
Ivan Savenko	b21a361b99	Merge pull request #2814 from SoundSSGood/arts-counter-impovements ... Artifacts counter impovements	2023-10-01 17:53:51 +03:00
nordsoft	213d0c3553	Capture events in chat box	2023-10-01 16:40:26 +02:00
Nordsoft91	d695d87b99	Merge pull request #2964 from kambala-decapitator/fix-docs ... improve layout of developer docs	2023-10-01 14:08:38 +02:00
Nordsoft91	041ffceb07	Merge pull request #2952 from Alexander-Wilms/develop ... Enable VSync to prevent screen tearing while scrolling across map	2023-10-01 14:08:00 +02:00
Laserlicht	23b8a321f6	file ending	2023-10-01 00:46:29 +02:00
Laserlicht	648a37310f	description	2023-10-01 00:35:11 +02:00
Laserlicht	65c21064b5	added var	2023-10-01 00:18:25 +02:00
Laserlicht	58dfc55ca3	only calc minimaps once	2023-09-30 23:50:27 +02:00
Laserlicht	61aae7bccc	code review	2023-09-30 22:49:22 +02:00
Laserlicht	73a05d82e1	fix	2023-09-30 20:18:12 +02:00
Laserlicht	8b835c9253	load game support	2023-09-30 20:03:33 +02:00
Laserlicht	c6adcc40f5	add date; cleanup	2023-09-30 17:56:51 +02:00
Laserlicht	79e66c38df	layout	2023-09-30 17:14:22 +02:00
Laserlicht	718bafc8af	map overview rework	2023-09-30 15:05:12 +02:00
nordsoft	f3fa0f8652	Allow to reconnect to proxy server	2023-09-29 19:49:18 +02:00
Laserlicht	293214bb61	height fix	2023-09-29 00:08:25 +02:00
Ivan Savenko	9ba1aa652d	Merge pull request #2967 from IvanSavenko/bugfixing ... Miscellaneous bugfixing	2023-09-28 12:11:51 +03:00
nordsoft	6da605ff83	Campaign meta strings	2023-09-28 00:10:28 +02:00
nordsoft	5b97c323d3	Rename hero strings to text id	2023-09-28 00:04:05 +02:00
nordsoft	0ac893b80f	Rumors meta string	2023-09-27 23:22:45 +02:00
nordsoft	03c099d4fd	First steps	2023-09-27 22:53:13 +02:00
Ivan Savenko	71ad9d6707	Fix crash on starting map as non-red player	2023-09-27 21:23:54 +03:00
Ivan Savenko	03a939fd52	Remove redundant thread name - this method is not thread entry point	2023-09-27 19:13:26 +03:00
Ivan Savenko	195320dcf2	Removed remaining references to 'pim' name	2023-09-27 18:50:01 +03:00
Ivan Savenko	0dcfd6e65c	Removed optional locking in waitWhileDialog method	2023-09-27 18:44:08 +03:00
Ivan Savenko	d6b9fa8fbd	Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock ... - Removed CPlayerInterface::pim since this lock does not actually protects LOCPLINT but rather entire game UI state - added more logical CGuiHandler::interfaceLock - interface lock is now non-recursive and is locked only once by initial caller that want to access GUI	2023-09-27 18:33:52 +03:00
Ivan Savenko	c330998518	Fix freeze on moving through teleporters without set path	2023-09-27 17:17:06 +03:00
Alexander Wilms	f52562eeb7	Fix freezing of hero and long enemy turns without sleeping in FramerateManager::framerateDelay()	2023-09-27 16:09:52 +02:00
Ivan Savenko	97097c20ad	Merge pull request #2874 from SoundSSGood/exchange-window-update ... Exchange window update	2023-09-27 15:50:52 +03:00
Ivan Savenko	71a1ed816a	Merge pull request #2892 from Laserlicht/highscore_menu ... Highscore Menu & end video	2023-09-27 15:48:47 +03:00
Ivan Savenko	efe3393408	Merge pull request #2947 from Laserlicht/enableUiEnhancements_button ... enableUiEnhancements button	2023-09-27 15:47:25 +03:00
Ivan Savenko	94dbde05a0	Merge pull request #2868 from IvanSavenko/simultaneous_turns ... Simultaneous turns	2023-09-27 15:45:02 +03:00
Ivan Savenko	d0046d29f2	Merge pull request #2957 from ProjectMutilation/fix-pvs-issues ... Fixed some issues found by pvs	2023-09-27 15:40:37 +03:00
Ivan Savenko	9147fd49ab	Merge pull request #2932 from Laserlicht/mainmenu_layer ... fix layer problem in mainmenu	2023-09-27 15:37:40 +03:00
Andrey Filipenkov	764fbebb35	make script executable	2023-09-27 15:12:50 +03:00
Maxim Korotkov	59acf639da	client: render: fixed copy-past errror in genFromJson() ... Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>	2023-09-27 09:05:58 +03:00
Alexander Wilms	0d11c5197d	Remove superfluous vsyncEnabled attribute	2023-09-26 23:48:53 +02:00
Alexander Wilms	ecc7648ef8	Use display index from settings	2023-09-26 23:05:48 +02:00
Alexander Wilms	e2eeec96a9	Fix stuttering animations when using high frame rate limit or vsync	2023-09-26 22:53:45 +02:00
Laserlicht	242e0ffa4a	fix playername	2023-09-26 22:06:04 +02:00
Laserlicht	2738dc3190	better approach for redrawing	2023-09-26 21:12:04 +02:00
Nordsoft91	8c6381b497	Merge pull request #2951 from Laserlicht/spell_icon ... specific spell icon (artifacts)	2023-09-26 20:13:19 +02:00
Nordsoft91	12eac2d4ba	Merge pull request #2941 from Laserlicht/spellbook ... Big Spellbook	2023-09-26 20:12:30 +02:00
Nordsoft91	c803b57c33	Merge pull request #2889 from Nordsoft91/mod-compatibility-check ... Proper mod compatibility check logic	2023-09-26 19:29:46 +02:00
Alexander Wilms	bfa5ef7990	Don't sleep in FramerateManager::framerateDelay() if VSync is enabled	2023-09-26 18:55:25 +02:00
Alexander Wilms	23d1638d70	Add VSync to settings	2023-09-26 18:55:25 +02:00
Alexander Wilms	73ea52c615	Enable VSync to prevent screen tearing while scrolling across map ... Fixes #2935	2023-09-26 18:55:25 +02:00
Ivan Savenko	42030ed10f	Fix hotseat	2023-09-26 17:28:50 +03:00
Laserlicht	ac5f552219	fix	2023-09-26 15:56:39 +02:00
Laserlicht	93e2826e3e	new constructor	2023-09-26 15:53:44 +02:00
nordsoft	056cba55a8	Show loading screen immediately on restart	2023-09-26 15:45:46 +02:00
Ivan Savenko	49c148502b	Correctly close dialogs on end of turn	2023-09-26 15:54:24 +03:00
Ivan Savenko	54adeef29f	Added temporary UI for simturns testing	2023-09-26 13:42:20 +03:00
Ivan Savenko	5b21a5ffbc	Simturn duration is now part of StartInfo	2023-09-26 13:42:20 +03:00
Ivan Savenko	d257fb37f0	Use optional instead of Json for queries	2023-09-26 13:42:20 +03:00
Ivan Savenko	56074e18a9	Block turn end button after player ends turn	2023-09-26 13:42:20 +03:00
Ivan Savenko	64c82c9133	Fixed UI locking in simturns	2023-09-26 13:42:20 +03:00
Laserlicht	ab55615359	remove double code	2023-09-26 10:28:10 +02:00
Laserlicht	6b5f6030e2	header	2023-09-25 23:02:16 +02:00
Laserlicht	096036dc9f	spell icon	2023-09-25 22:58:59 +02:00
Laserlicht	c3373ea34c	code review	2023-09-25 18:06:40 +02:00
Laserlicht	7cf654992f	code review	2023-09-25 16:34:36 +02:00
Laserlicht	5061792cce	enableUiEnhancements button	2023-09-25 13:11:08 +02:00
Laserlicht	28f4046937	ready	2023-09-25 01:04:06 +02:00
Laserlicht	3e4a5b7d80	border and variable	2023-09-25 00:31:32 +02:00
Laserlicht	a6b68be2df	offsets	2023-09-24 23:50:50 +02:00
Laserlicht	8b5c9db21b	basic offset	2023-09-24 23:15:09 +02:00
Laserlicht	240d291de9	big spellbook	2023-09-24 22:24:51 +02:00
Laserlicht	72e4941982	dimlevel as class variable	2023-09-24 12:08:27 +02:00
Laserlicht	68e536c290	code review	2023-09-24 02:00:42 +02:00
Laserlicht	b143c2786f	use dimming to hide screen	2023-09-24 00:58:48 +02:00
Laserlicht	e69b91fbdd	fix layer problem	2023-09-23 23:44:12 +02:00
Laserlicht	41b03e7c5b	fixed some edge cases	2023-09-23 23:11:17 +02:00
Laserlicht	96df11a6f2	always show actual entry	2023-09-23 22:45:38 +02:00
Laserlicht	8a0565eb9b	use vector	2023-09-23 22:15:05 +02:00
Laserlicht	c49d38b855	cheats + grail in town	2023-09-23 21:37:40 +02:00
Laserlicht	6f8b62d77d	codereview	2023-09-23 20:41:30 +02:00
Laserlicht	ca96749c45	workaround for missing video	2023-09-23 16:28:28 +02:00
Laserlicht	06895e6733	fine tuning	2023-09-23 15:11:48 +02:00
Laserlicht	e3edcb6cd8	rmb; bugfix; tabs	2023-09-23 14:51:39 +02:00
Laserlicht	d2398b804a	implement adding	2023-09-23 13:14:45 +02:00
Laserlicht	e18a4a09a9	forward declaration	2023-09-23 02:14:45 +02:00
Laserlicht	049f90159d	highlight preparation	2023-09-23 01:53:45 +02:00
Laserlicht	d3f007453d	win screen ready	2023-09-23 01:36:01 +02:00
Laserlicht	901a33bf1d	calculation	2023-09-23 01:03:15 +02:00
nordsoft	dce1ac1538	Redesign mod incompatibility message	2023-09-23 00:32:48 +02:00
Laserlicht	1a0f5cf159	calc preperation	2023-09-23 00:21:36 +02:00
Laserlicht	30c6cf3b98	video & audio correction; win/lose	2023-09-22 21:45:12 +02:00
Laserlicht	a4cb74f0dc	highscore input window	2023-09-22 20:39:20 +02:00
Laserlicht	909b06f7c1	draw images	2023-09-22 02:19:31 +02:00
Laserlicht	92b0e2b400	initial highscore support	2023-09-22 01:39:35 +02:00
Nordsoft91	ec582328b4	Merge pull request #2887 from Laserlicht/campaign_improvement ... campaign improvements	2023-09-22 01:01:59 +02:00
Laserlicht	9e78f9c69c	CodeReview	2023-09-21 23:41:00 +02:00
nordsoft	4691907f9c	Show root mods only	2023-09-21 22:28:29 +02:00
Laserlicht	5fd2eee3e8	code review	2023-09-21 21:27:06 +02:00
nordsoft	a05f8339ae	Proper mod compatibility check system	2023-09-21 04:31:08 +02:00
Laserlicht	4d8414bd3d	unlock functionality	2023-09-20 23:06:32 +02:00
Laserlicht	48231f5f4f	save results only if from set	2023-09-20 22:28:45 +02:00
Laserlicht	dfb5ccbeaf	add persistent storage & completed campaign support	2023-09-20 22:18:53 +02:00
Laserlicht	52b86eb9c1	get back to campaignmenu	2023-09-20 21:18:13 +02:00
Ivan Savenko	a9abd294da	Merge pull request #2876 from IvanSavenko/revisit_object_button_block ... Block revisit object shortcut if no visit is possible	2023-09-20 22:09:36 +03:00
Ivan Savenko	42d9ba6c82	Merge pull request #2877 from IvanSavenko/simturn_fixes ... Changes for simturns support	2023-09-20 22:09:25 +03:00
Nordsoft91	5a8c3b5ae2	Merge pull request #2869 from Laserlicht/audio ... disable audio on lost focus	2023-09-20 13:20:47 +02:00
Ivan Savenko	00db2e245f	Merge pull request #2872 from Laserlicht/bonus_selection ... fix bonus selection	2023-09-20 13:19:54 +03:00
Laserlicht	34182069f5	campaignset	2023-09-20 03:13:54 +02:00
Ivan Savenko	7b37c2353a	Merge pull request #2865 from IvanSavenko/market_ownership_check_fix ... Cleaned up and fixed ownership checks for market netpack	2023-09-19 23:43:33 +03:00
Nordsoft91	461aa97d7e	Merge pull request #2864 from Laserlicht/double_tap ... support double tap	2023-09-19 19:37:49 +02:00
Nordsoft91	648e8c7acb	Merge pull request #2856 from Laserlicht/hero_overview ... Hero overview	2023-09-19 19:36:19 +02:00
Ivan Savenko	d3ced6b703	Block revisit object shortcut if no visit is possible	2023-09-19 19:51:31 +03:00
Ivan Savenko	2af7d7c085	Ignore garrison update events of another towns for our castleInt	2023-09-19 19:24:35 +03:00
Ivan Savenko	8c0d78f1d9	Added initiator-player to packs that add/remove/move objects	2023-09-19 19:24:34 +03:00
SoundSSGood	48ec2d7e2a	Merge branch 'vcmi:develop' into exchange-window-update	2023-09-19 16:22:00 +03:00
SoundSSGood	6280e778dc	fix build	2023-09-19 16:04:37 +03:00
SoundSSGood	9cc623c981	Fixed move checks. Backpack buttons.	2023-09-19 13:31:59 +03:00
SoundSSGood	f47def3588	refactoring	2023-09-19 13:31:57 +03:00
SoundSSGood	a83f290e13	bulk move artifacts only equipped, only backpack	2023-09-19 13:31:42 +03:00
Laserlicht	a2174dc83f	fix window open while sound playing	2023-09-19 11:20:16 +02:00
Laserlicht	6ae09d8458	newday	2023-09-19 09:52:32 +02:00
Laserlicht	babf858112	format	2023-09-19 01:50:42 +02:00
Laserlicht	4ac3e3c2e5	fix bonus selection	2023-09-19 01:48:26 +02:00
Laserlicht	bcf32984ce	always sound at chat message	2023-09-19 01:08:49 +02:00
Laserlicht	996036bdf2	disable audio on lost focus	2023-09-18 21:28:23 +02:00
Laserlicht	2d2c7ee8e0	added tolerance	2023-09-18 20:35:23 +02:00
Ivan Savenko	219f81d28b	Added explicit "PlayerEndsTurn" netpack ... - PlayerEndsTurn pack is now sent when player ends turn - YourTurn pack has been renamed to PlayerStartsTurn for consistency - PlayerStartsTurn will no longer replace list of acting players - PlayerEndsGame and PlayerEndsTurn will remove player from acting list	2023-09-18 20:55:01 +03:00
Ivan Savenko	54ff039c51	Merge pull request #2850 from IvanSavenko/remove_hero_move_thread ... Remove hero movement thread	2023-09-18 20:54:13 +03:00
Ivan Savenko	f1c40466d3	Changes according to review	2023-09-18 18:17:26 +03:00
Laserlicht	71659f1423	fix	2023-09-18 16:43:16 +02:00
Ivan Savenko	3d04e9c9ed	Cleaned up and fixed ownership checks for market netpack	2023-09-18 17:22:30 +03:00
Laserlicht	7321bb1d25	support double tap	2023-09-18 16:05:39 +02:00
Laserlicht	5125bcc67f	added probabilities	2023-09-17 23:01:18 +02:00
Laserlicht	7978e5a9b7	adjusted army and warmachine space	2023-09-17 21:55:35 +02:00
Laserlicht	21f37cfafb	simplified	2023-09-17 21:41:55 +02:00
Laserlicht	05fad115b5	Added new Widgets an functions for simplification	2023-09-17 20:34:31 +02:00
Laserlicht	d33101187b	simplify	2023-09-17 16:55:26 +02:00
Laserlicht	a994fa00aa	fixes; translation	2023-09-17 16:15:17 +02:00
Laserlicht	69da4d59bf	basic function ready	2023-09-17 15:28:05 +02:00
Laserlicht	cfc5bac540	layout	2023-09-17 14:31:07 +02:00
Laserlicht	59b5c46a32	right side draft	2023-09-17 13:22:39 +02:00
Laserlicht	79e872da68	left side ready	2023-09-17 04:10:08 +02:00
Laserlicht	b674682fe3	left side	2023-09-17 03:21:29 +02:00
Laserlicht	73fe924544	draw background	2023-09-17 02:14:03 +02:00
Laserlicht	ff96b1af0a	initial hero overview	2023-09-17 00:32:10 +02:00
Ivan Savenko	348eddcc17	Fix looped playback of video files	2023-09-17 01:31:31 +03:00
Ivan Savenko	b7de685483	Fixed paths through teleport, formatting cleanup	2023-09-16 20:35:04 +03:00
Ivan Savenko	f08028a158	Fixed moving through garrisons & teleporters	2023-09-16 20:07:26 +03:00
Ivan Savenko	2355aab139	Correctly end movement on battle start	2023-09-16 20:07:26 +03:00
Ivan Savenko	c8e6a7cd27	Fixed most common cases of movement actions	2023-09-16 20:07:26 +03:00
Ivan Savenko	0afc244934	Split massive methods into smaller chunks	2023-09-16 20:07:26 +03:00
Ivan Savenko	80b80a0ae6	Minor cleanup of hero movemen code	2023-09-16 20:07:26 +03:00
Ivan Savenko	347ce01dbe	Moved hero movement logic to a new class from PlayerInterface	2023-09-16 20:07:26 +03:00
Nordsoft91	717a765123	Merge pull request #2813 from Laserlicht/textcolor ... Textcolor support	2023-09-16 14:12:17 +02:00
Ivan Savenko	ed60675a01	Merge pull request #2808 from Laserlicht/credits ... VCMI credits	2023-09-16 12:02:32 +03:00
Nordsoft91	2d6ef9049a	Merge pull request #2827 from Laserlicht/select_instead_path	2023-09-15 20:28:51 +02:00
Laserlicht	063c7f3ca0	move function; optional; json static	2023-09-15 15:27:26 +02:00
Laserlicht	922a775108	Update CMessage.h	2023-09-15 15:27:26 +02:00
Laserlicht	f5505c9f6d	support for predefined colors	2023-09-15 15:27:26 +02:00
Laserlicht	f776422c67	color linesplit	2023-09-15 15:27:26 +02:00
Laserlicht	d948cb72a0	Alignment	2023-09-15 15:27:26 +02:00
Laserlicht	dd4c95bd04	textcolor	2023-09-15 15:27:26 +02:00
Laserlicht	1c68937d95	new approach	2023-09-15 15:26:14 +02:00
Laserlicht	42d2257f19	VCMI credits	2023-09-15 15:26:14 +02:00
Laserlicht	39838fdd3c	extend for all selections	2023-09-15 15:24:17 +02:00
Laserlicht	03316c62bf	Easy choosing for a secondary skill in Level Up Dialog by double clicking it	2023-09-15 15:24:17 +02:00
Laserlicht	19693d251d	comments	2023-09-15 15:15:33 +02:00
Laserlicht	6d69326c1a	alternative implementation	2023-09-15 15:15:33 +02:00
Laserlicht	8d160101ed	alt mode to select instead of changing path	2023-09-15 15:15:33 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Ivan Savenko	e2e4168966	Merge pull request #2828 from dydzio0614/commander-abilities-requirements ... Commander abilities requirements	2023-09-14 14:57:19 +03:00
Ivan Savenko	717fff3d28	Merge pull request #2822 from IvanSavenko/float_comparison_fix ... Attempt to fix freeze during map animations	2023-09-14 12:18:09 +03:00
Dydzio	56c969be4f	Fix commanders requirements for special skills to match WoG	2023-09-13 23:08:22 +02:00
Dydzio	aabb26d210	Erase outdated path that was previously available	2023-09-13 22:25:33 +02:00
Ivan Savenko	70d44d435e	Attempt to fix freeze during map animations	2023-09-13 18:48:36 +03:00
Laserlicht	9cf274362e	small folder optimation	2023-09-12 20:28:54 +02:00
Ivan Savenko	d070953c28	Fix open backpack strings	2023-09-12 21:28:36 +03:00
Ivan Savenko	538665fe42	Fix "Start game" blocking status: ... - Start game is now initially blocked - Receiving valid startInfo from server will unlock button	2023-09-12 21:15:15 +03:00
Ivan Savenko	60cbb939ab	Fix crash on window resize	2023-09-12 21:15:15 +03:00
Ivan Savenko	a09147a433	Do not block map layer toggles in world view mode	2023-09-12 21:15:14 +03:00
Ivan Savenko	a5e42755be	Correctly redraw map in world view mode	2023-09-12 21:15:14 +03:00
SoundSSGood	82eb2f8a2b	Artifact assembling changes	2023-09-12 19:17:35 +03:00
Nordsoft91	0a799ecc46	Merge pull request #2740 from Laserlicht/fix_cursor_issue	2023-09-11 22:20:11 +02:00
Laserlicht	994da3fcf2	code review	2023-09-11 14:44:07 +02:00
Laserlicht	fa19ed4e7c	format	2023-09-11 14:11:16 +02:00
Laserlicht	00f07f93d1	wait while audio playing; no audio on custom campaigns	2023-09-11 14:04:44 +02:00
Laserlicht	fc1ce85a72	basic voice support	2023-09-11 12:57:10 +02:00
Laserlicht	2cb28178ae	code review	2023-09-10 20:52:35 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	89c31d0d52	Fix typo	2023-09-08 16:54:51 +03:00
Ivan Savenko	fccd564d8d	Merge pull request #2769 from IvanSavenko/touch_tolerance ... (1.3.2) Implemented tolerance for touch events	2023-09-08 16:45:04 +03:00
Ivan Savenko	8112b8082e	Add new option to settings	2023-09-08 13:23:18 +03:00
Ivan Savenko	9e6424c545	Merge pull request #2775 from IvanSavenko/radial_fill_ones ... (1.3.2) Add "Fill with single creatures" option to radial wheel	2023-09-08 13:16:00 +03:00
Ivan Savenko	5d67481aaf	Merge pull request #2774 from IvanSavenko/beta_bugfixing ... (1.3.2) Beta bugfixing	2023-09-08 13:15:52 +03:00
Ivan Savenko	72858cd0d8	Merge pull request #2768 from IvanSavenko/cherry_picked_fixes ... (1.3.2) Cherry picked fixes	2023-09-08 13:15:34 +03:00
Ivan Savenko	635884cb05	Replaced show unit info with fill with one's option in radial	2023-09-07 13:55:58 +03:00
SoundSSGood	1b810b5b93	combined arts assembling fixed	2023-09-07 11:54:52 +03:00
SoundSSGood	f1a6116088	CHeroArea fix	2023-09-07 11:54:50 +03:00
SoundSSGood	3675d88730	fixed highlighting slots	2023-09-07 11:39:29 +03:00
Ivan Savenko	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	346eead8e0	Show spell cursor when casting spell in touch input mode	2023-09-06 23:01:43 +03:00
Ivan Savenko	d7fb2bcf83	Show message on cancelling spell in combat	2023-09-06 21:54:26 +03:00
Ivan Savenko	9fa7a93fb0	Properly pass battleID in all battle netpack's	2023-09-06 16:03:47 +03:00
Ivan Savenko	747e28947a	Fix build	2023-09-06 16:03:47 +03:00
Ivan Savenko	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Ivan Savenko	036df2e0ad	Support multiple battles in AI	2023-09-06 16:03:46 +03:00
Michael	287c0daaff	add also savegame	2023-09-06 12:34:31 +03:00
Michael	36ab973dc8	fix difficulty widget	2023-09-06 12:34:23 +03:00
Ivan Savenko	3973624278	Implemented tolerance for touch events	2023-09-06 01:06:01 +03:00
Alexander Wilms	c0f0211098	Update VCMI icon (#2672) ... * Update VCMI icon Fixes #1993 Sources will be added to https://github.com/vcmi/vcmi-assets * Use entire canvas height for shield, add remaining icons * Use a slighty more saturated brown * Align VCMI letters to pixel grid for 32px icons * Align VCMI letters to pixel grid for 48px icon * Align VCMI letters to pixel grid for 64px icon * Add 96px icon to .ico * Update Android and iOS icons * Install 22px icon on Linux * Update macOS .icns file * Add more icons * Update iOS icons * Add more sizes to .ico files * Don't use .png inside .ico * Only include resolutions up to 256px in .ico files * Center map editor icon	2023-09-05 23:57:19 +03:00
Gwart	707400d764	#2646 add a null check if creature is empty	2023-09-05 23:32:12 +03:00
Ivan Savenko	64adb538fe	Do not allow stopping movement while using water walk over water	2023-09-05 23:32:02 +03:00
Ivan Savenko	63a8cd9642	Fix quest log button block status	2023-09-05 23:31:26 +03:00
Ivan Savenko	47249ee5ed	Fix resource bar UI in hotseat	2023-09-05 23:31:20 +03:00
Ivan Savenko	f7b67a5abe	Remove incorrect message on another player defeat	2023-09-05 23:31:14 +03:00
Ivan Savenko	5d1d559d81	Fix possible unprotected access to battleint	2023-09-05 23:31:07 +03:00
Ivan Savenko	211bcb6e82	Merge pull request #2720 from SoundSSGood/backpack-variable-cap ... Support for different backpack window capacities	2023-09-05 13:40:39 +03:00
Ivan Savenko	f30355839f	Fix build	2023-09-05 00:55:54 +03:00
Ivan Savenko	12c4f8d18c	Fixed serialization of PlayerColor in json	2023-09-04 22:22:24 +03:00
Ivan Savenko	86a7f5f5cd	Removed getStr(bool), replaced with similar toString()	2023-09-04 22:21:02 +03:00
SoundSSGood	a7cedea73c	Support for different backpack capacities	2023-09-04 20:59:24 +03:00
Ivan Savenko	1d0e696db6	Added RenderHandler that acts as factory for images and animations	2023-09-04 18:22:34 +03:00
Ivan Savenko	9cfcf5ea19	Fix regressions	2023-09-04 18:22:34 +03:00
Ivan Savenko	0f88b8969b	Removed some usages of std string as resource path	2023-09-04 18:22:34 +03:00
Ivan Savenko	8dfdfffd87	Use ResourcePath for audio files	2023-09-04 18:22:34 +03:00
Ivan Savenko	97b7d44c88	Use ResourcePath for video accessing	2023-09-04 18:22:34 +03:00
Ivan Savenko	6f0108e462	Use ResourcePath for referencing texts and json's	2023-09-04 18:22:34 +03:00
Ivan Savenko	823ffa7a07	Always use ResourcePath for referencing images and animations	2023-09-04 18:22:34 +03:00
Ivan Savenko	e2b5ff13f1	Merge pull request #2746 from wb180/teamsPopup ... Show only non-empty teams in teams popup	2023-09-03 22:23:32 +03:00
Ivan Savenko	7ccc8605ac	Merge pull request #2733 from SoundSSGood/empty-bulk-move-fix ... Arts bulk move crash fixed	2023-09-03 22:06:57 +03:00
Nordsoft91	2eaed0c983	Merge pull request #2743 from Laserlicht/fix_difficulty_widget ... [fix] difficulty widget	2023-09-03 17:57:43 +04:00
Nordsoft91	2057624cbc	Merge pull request #2741 from Laserlicht/folder_order ... [fix] folder order	2023-09-03 17:56:56 +04:00
Evgeniy Meshcheryakov	b6e2c454c0	Show only non-empty teams in teams popup	2023-09-03 08:05:02 +03:00
Michael	53277306cd	add also savegame	2023-09-02 20:39:16 +02:00
Michael	3d08518dac	fix difficulty widget	2023-09-02 19:37:56 +02:00
Michael	e0460a0dec	up should be first	2023-09-02 19:04:06 +02:00
Michael	20fd0d8901	fix cursor issue	2023-09-02 18:35:32 +02:00
Gwart	05ba56a873	#2646 add a null check if creature is empty	2023-09-02 16:21:54 +02:00
SoundSSGood	3126875e6a	arts bulk move crash fixed	2023-09-02 14:36:57 +03:00
Ivan Savenko	cab2bddf7e	Merge pull request #2712 from Laserlicht/dim_map ... Dim adventuremap	2023-09-01 22:37:10 +03:00
Alexander Wilms	d2f0a80573	Update VCMI icon (#2672) ... * Update VCMI icon Fixes #1993 Sources will be added to https://github.com/vcmi/vcmi-assets * Use entire canvas height for shield, add remaining icons * Use a slighty more saturated brown * Align VCMI letters to pixel grid for 32px icons * Align VCMI letters to pixel grid for 48px icon * Align VCMI letters to pixel grid for 64px icon * Add 96px icon to .ico * Update Android and iOS icons * Install 22px icon on Linux * Update macOS .icns file * Add more icons * Update iOS icons * Add more sizes to .ico files * Don't use .png inside .ico * Only include resolutions up to 256px in .ico files * Center map editor icon	2023-09-01 22:36:32 +03:00
Konstantin	e554a2766d	BattleActions: do not pass unnecessary targetStack ... It was unused for everything except teleport, so pass it only wher we attempt to teleport. Reworking sacrifice is out of scope from beta	2023-08-31 23:44:00 +03:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00
Michael	1721fe1ad6	optimize if disabled	2023-08-31 21:03:54 +02:00
Michael	3593911dde	improve readability	2023-08-31 21:00:02 +02:00
Ivan Savenko	ab2d4ba471	Merge pull request #2708 from Laserlicht/disable_unavilable_heroes ... disable unavailable heroes in selection	2023-08-31 15:45:32 +03:00
Ivan Savenko	7255dda624	Merge pull request #2629 from dydzio0614/neutral-creature-popup ... Improve neutral creature adventure map popup	2023-08-31 15:44:19 +03:00
Ivan Savenko	a59d7b5fc9	Merge pull request #2687 from Nordsoft91/filledTexturePlayerColored ... Support FilledTexturePlayerColored in configurable interface	2023-08-31 15:43:40 +03:00
Ivan Savenko	3ce99e8613	Merge pull request #2710 from dydzio0614/artifacts-backpack-graphics ... Split artifacts bag button background and icon	2023-08-31 15:42:50 +03:00
Ivan Savenko	2e411eca19	Do not allow stopping movement while using water walk over water	2023-08-31 01:38:16 +03:00
Michael	31e0558809	remove unneeded headers	2023-08-30 21:43:59 +02:00
Michael	e650f0100b	setting + all non popups	2023-08-30 21:41:28 +02:00
nordsoft	cc3ca9a41e	Timers fixes	2023-08-30 03:33:59 +04:00
nordsoft	9a42abe2a7	Extended timer info to exhange between client and server	2023-08-30 03:11:46 +04:00
Dydzio	e1e41d1107	Implement TOPCENTER text alignment	2023-08-30 00:35:31 +02:00
nordsoft	b4c20734f3	Support timer logic for pve and pvp	2023-08-30 02:17:29 +04:00
Michael	1d6469ab36	battlewindow	2023-08-29 22:43:37 +02:00
Michael	40c7ddcaf4	dim adventuremap	2023-08-29 22:22:22 +02:00
Michael	b6000841f1	code review	2023-08-29 21:08:18 +02:00
Dydzio	03ef5b6b0f	Split artifacts bag button background and icon	2023-08-29 18:53:50 +02:00
nordsoft	c8243313b8	Translations for turn timers	2023-08-29 14:53:15 +04:00
Michael	196cd41e35	fix multiplayer	2023-08-29 02:04:32 +02:00
Dydzio	bafe8baa15	Fix "ghost" icons in commander grandmaster abilities list	2023-08-29 00:20:44 +02:00
Michael	44ece25042	disable unavailable heroes	2023-08-29 00:14:49 +02:00
Dydzio	2769782d0a	Fix broken grandmaster ability description updating on select/deselect	2023-08-28 23:49:07 +02:00
Dydzio	dacf6c9d08	Add border around selected commander "grandmaster ability" on levelup	2023-08-28 23:36:45 +02:00
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
Ivan Savenko	eafa9cbae1	Merge pull request #2684 from dydzio0614/creature-spellcasting-fixes ... Better default stack action handling + "F shortcut" mode fixes	2023-08-28 20:01:04 +03:00
Ivan Savenko	5be87b30c1	Merge pull request #2625 from dydzio0614/artifacts-backpack-gui ... Artifacts backpack GUI	2023-08-28 19:59:11 +03:00
Ivan Savenko	a30939ad8e	Merge pull request #2685 from dydzio0614/mana-drain-ui-refresh ... Fix mana drain not refreshing battle hero window mana	2023-08-28 19:56:29 +03:00
nordsoft	432ed18579	Fix overlap of timer and fps widgets	2023-08-28 19:46:09 +04:00
nordsoft	b5417c667c	Hold timer client counter	2023-08-28 19:46:09 +04:00
nordsoft	4ee47b01ae	Make possible to play with different timers independently	2023-08-28 19:45:15 +04:00
nordsoft	71cbb0e2e7	Change query reply method	2023-08-28 18:56:36 +04:00
nordsoft	98f7ed9dfd	Implement player start turn query	2023-08-28 18:56:36 +04:00
nordsoft	78397d6d1a	Fix compiling	2023-08-28 17:21:38 +04:00
nordsoft	439254f921	Fix mistake	2023-08-28 17:21:38 +04:00
nordsoft	49a76ac14c	Code review tweaks	2023-08-28 17:21:38 +04:00
nordsoft	44791b6665	Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9" ... This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.	2023-08-28 17:21:38 +04:00
nordsoft	de8bd48398	Added right click pop-up for text inputs	2023-08-28 17:21:38 +04:00
nordsoft	614a285fb8	Fix hot seat timer visualization	2023-08-28 17:21:38 +04:00
nordsoft	e4e9bcfb9b	Show time for other player during battle	2023-08-28 17:19:04 +04:00
nordsoft	fdaf05514a	Correct network data exchange and time parsing	2023-08-28 17:10:52 +04:00
nordsoft	1e527a6942	Minor changes	2023-08-28 17:10:52 +04:00
nordsoft	86e0ea15fb	Fix turn timer settings	2023-08-28 17:10:52 +04:00
nordsoft	d758727c23	Basic timer ui is almost complete	2023-08-28 17:10:52 +04:00
nordsoft	c7ded69edc	Minor changes	2023-08-28 17:10:52 +04:00
nordsoft	c064b805c2	Refactor combo box	2023-08-28 17:10:52 +04:00
nordsoft	39fbdd300d	Refactor combo box	2023-08-28 17:10:52 +04:00
Nordsoft91	1586c6c6a0	Merge pull request #2668 from IvanSavenko/remove_current_player ... Remove "currentPlayer" from gamestate	2023-08-28 17:10:28 +04:00
Nordsoft91	6394a77270	Merge pull request #2683 from Laserlicht/zoom_dead_area ... dead area for zooming	2023-08-28 17:09:15 +04:00
Nordsoft91	ffc4b989f0	Merge pull request #2679 from Laserlicht/smooth_scroll ... Smooth scroll	2023-08-28 17:08:57 +04:00
Michael	3c1892a7d2	adjust timing	2023-08-28 10:03:50 +02:00
Michael	220145bd9b	reintroduce setting to zero while holding	2023-08-28 00:59:08 +02:00
Michael	9f51f42128	use fps in calculation	2023-08-28 00:49:32 +02:00
Michael	b61890355f	Update MapViewController.cpp	2023-08-27 23:17:47 +02:00
Dydzio	cba9ddd66a	Update client/battle/BattleActionsController.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-08-27 23:01:04 +02:00
Michael	1c89c71031	Update MapViewController.cpp	2023-08-27 22:55:05 +02:00
Michael	3ce9d022d5	try to remove glitch	2023-08-27 22:00:20 +02:00
Michael	da3014bd54	Haptic feedback and increased dead zone	2023-08-27 21:40:56 +02:00
Michael	3960e5aa32	Update client/mapView/MapView.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-08-27 20:55:37 +02:00
nordsoft	3e502955b3	Support FilledTexturePlayerColored in configurable interface	2023-08-27 22:34:02 +04:00
Dydzio	321c9c2ca6	Remove now unused enum	2023-08-27 20:18:19 +02:00
Dydzio	207a73b9de	Fix mana drain not refreshing battle hero window mana	2023-08-27 18:58:07 +02:00
Dydzio	e1eb245565	Better default stack action handling + "F shortcut" mode fixes	2023-08-27 17:33:10 +02:00
Michael	f16b93c391	dead area for zoom	2023-08-27 14:00:40 +02:00
Michael	b77bccdc24	code review	2023-08-27 12:09:26 +02:00
Michael	d1d0d6d62e	fps independent	2023-08-27 02:35:10 +02:00
Michael	4137a66f2a	fix division by zero edge case	2023-08-27 00:53:09 +02:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Michael	bbd69fd430	added setting	2023-08-27 00:33:52 +02:00
Michael	4eecca2d9a	code review	2023-08-27 00:22:29 +02:00
Michael	6b71820197	avoid some edge cases	2023-08-26 23:25:46 +02:00
Michael	a354a7f696	compatible with older sdl	2023-08-26 22:30:02 +02:00
Michael	cde22b3755	fix	2023-08-26 21:37:29 +02:00
Michael	e57e9e8e9f	ready draft	2023-08-26 21:29:24 +02:00
Michael	2286e0c7b1	implement speed and move	2023-08-26 21:13:33 +02:00
Michael	fe6d96f4a0	angle calc	2023-08-26 20:19:25 +02:00
Michael	bd0f9bb280	preparation	2023-08-26 19:53:36 +02:00
Ivan Savenko	edd029c79c	Replace "currentPlayer" from gamestate with "activePlayers" ... - Allows multiple active players at once, e.g. simturns - Cleared up validation of netpacks by server, e.g. always check for pack sender	2023-08-25 18:56:15 +03:00
Ivan Savenko	b61c9a9e35	Fix build	2023-08-25 13:46:42 +03:00
Ivan Savenko	e2718db791	Converted several enumerations into constants	2023-08-25 13:38:02 +03:00
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	0240ee886d	Converted (almost) all namespace enum's to enum classes	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	ec8d31bbfc	First step at unifying game identifiers code	2023-08-25 13:38:01 +03:00
SoundSSGood	730ab449b6	backpack window fix	2023-08-25 10:08:08 +03:00
Ivan Savenko	43096f0ed1	Merge pull request #2617 from dydzio0614/configurable-autobattle-spells ... Configurable autobattle spells usage	2023-08-25 01:29:16 +03:00
Ivan Savenko	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Ivan Savenko	f9410145d6	Fix handling of "7 days without town" loss condition	2023-08-24 23:34:33 +03:00
Ivan Savenko	b057230d85	Fix quest log button block status	2023-08-24 23:34:33 +03:00
Ivan Savenko	c171a3d6be	Fix resource bar UI in hotseat	2023-08-24 23:34:33 +03:00
Ivan Savenko	97ef69c9ab	Remove incorrect message on another player defeat	2023-08-24 23:34:33 +03:00
Ivan Savenko	e40dc76304	Fix giving commands in battles in hotseat	2023-08-24 23:34:33 +03:00
Nordsoft91	979cf129bc	Merge pull request #2637 from Laserlicht/autosave	2023-08-25 00:09:49 +04:00
Nordsoft91	07210973f4	Merge pull request #2653 from Nordsoft91/turn-timer	2023-08-25 00:09:00 +04:00
Michael	37e2292720	count unicode chars to extra function	2023-08-24 18:34:00 +02:00
Andrii Danylchenko	f459c13bc3	Merge pull request #2661 from Nordsoft91/loading-bar ... Fix removing loading screen	2023-08-24 16:34:11 +03:00
nordsoft	6efccb2503	Fix removing loading screen	2023-08-24 15:01:43 +04:00
Michael	e6f1677d3a	missing header...	2023-08-23 23:34:33 +02:00
Michael	9f68a0bf49	avoid destroing utf-8; no extra Autosave text	2023-08-23 23:25:48 +02:00
Michael	485af4b4b5	avoid forbidden chars in path	2023-08-23 22:23:05 +02:00
Michael	b22a9ff2d0	Merge branch 'develop' into autosave	2023-08-23 21:39:04 +02:00
Michael	1586b9fbd1	possibility to restart	2023-08-23 21:37:44 +02:00
Michael	4784ae94b5	revert uuid	2023-08-23 20:03:40 +02:00
Ivan Savenko	a5501abd01	Fix skipping battle intro via click	2023-08-23 18:46:56 +03:00
Ivan Savenko	81242d3500	Fixed ending of battles due to retreat/surrender	2023-08-23 18:46:56 +03:00
nordsoft	b8ab64f448	Make options tab configurable	2023-08-23 19:29:50 +04:00
Konstantin	d746a96d55	vcmi: use SpellSchool identifier instead of enum ... Use identifier instead of enum inside callbacks. It is better and more expandable solution.	2023-08-23 17:53:09 +03:00
Konstantin	344593e891	vcmi: made some CSpell properties private ... There are getters for it.	2023-08-23 17:53:08 +03:00
Konstantin	8724181a0f	vcmi: spell resistance rework ... Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY. All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY, and all previous bonuses of subtype 1 is covered by NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.	2023-08-23 17:52:16 +03:00
Ivan Savenko	3eb19e6ed7	Fix possible unprotected access to battleint	2023-08-23 16:32:29 +03:00
Ivan Savenko	a44c08a847	Slightly better thread names	2023-08-23 16:32:29 +03:00
Ivan Savenko	0613756abc	Remove unused code	2023-08-23 16:32:29 +03:00
Ivan Savenko	dfe8ca3d61	Use more lightweight scoped_lock	2023-08-23 16:32:29 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Ivan Savenko	87957e74c1	Replaced boost::thread_specific_ptr with thread_local	2023-08-23 16:32:29 +03:00
Ivan Savenko	142889e3a5	Give all threads created by client human-readable name for debug	2023-08-23 16:32:29 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
Michael	d2bbe0f35a	starttime in foldername	2023-08-23 01:47:55 +02:00
Michael	fed9ae5157	Merge branch 'develop' into autosave	2023-08-23 00:37:15 +02:00
Michael	51ba22a631	code review	2023-08-23 00:35:44 +02:00
Nordsoft91	e09b13c00a	Merge pull request #2576 from Nordsoft91/turn-timer ... Implement turn timer feature	2023-08-23 01:48:12 +04:00
nordsoft	937935ce8c	Fix compiling (how does it work on mac?)	2023-08-23 01:20:29 +04:00
Michael	68a1b883eb	autosave folders	2023-08-22 20:43:44 +02:00
nordsoft	dfaf778d16	Redesign loading solution	2023-08-22 20:10:20 +04:00
nordsoft	d9a2a7bfd0	Fix minor points	2023-08-22 16:00:14 +04:00
Nordsoft91	ec4da06b56	Merge pull request #2631 from Laserlicht/date_alignment ... date alignment	2023-08-22 02:00:49 +04:00
nordsoft	d50edc28ab	Merge remote-tracking branch 'upstream/develop' into turn-timer ... # Conflicts: # server/CGameHandler.cpp # server/CGameHandler.h	2023-08-22 00:54:38 +04:00
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00
nordsoft	b1bfc2239f	Backward compatibility with mods	2023-08-22 00:32:26 +04:00
Michael	0dab3b83a0	date alignment	2023-08-21 20:45:00 +02:00
nordsoft	a60d503078	Fix progress bar	2023-08-21 19:21:32 +04:00
nordsoft	45f13c7964	Progress update on client side	2023-08-21 19:21:27 +04:00
nordsoft	584dd20943	Progress on server side for rmg	2023-08-21 19:21:22 +04:00
Dydzio	28fe28adf5	Fix player coloring	2023-08-21 17:08:15 +02:00
Dydzio	b73f9325ad	Fixes from code review	2023-08-21 16:56:50 +02:00
Ivan Savenko	1c552ba9d9	Remove unused code	2023-08-21 17:55:49 +03:00
Ivan Savenko	013417fb7e	Code cleanup	2023-08-21 17:55:49 +03:00
Ivan Savenko	6297140bf5	Start of stabilization - battles now start correctly	2023-08-21 17:55:49 +03:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Nordsoft91	4edee00a97	Merge pull request #2605 from Laserlicht/map_preview ... Map preview	2023-08-21 14:56:21 +04:00
Michael	05a88bd8ac	another try...	2023-08-20 23:34:09 +02:00
Michael	080630b39f	try to fix	2023-08-20 22:22:46 +02:00
Dydzio	b53894ac2d	Add artifact slots backgrounds	2023-08-20 18:57:53 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Michael	5c5576313b	handle long texts better; big window also for only one layer	2023-08-20 16:58:13 +02:00
nordsoft	989a0859ef	Fix tutorial loading	2023-08-20 17:58:40 +04:00
Nordsoft91	ef4fddd0c4	Merge pull request #2570 from Laserlicht/town_selection_window ... Town selection window	2023-08-20 17:37:45 +04:00
Michael	952ce3061b	avoid crash if any error in map	2023-08-20 14:28:10 +02:00
Michael	e3a4c65100	code review	2023-08-20 14:14:47 +02:00
Michael	1d94536299	code review	2023-08-20 13:16:39 +02:00
Michael	52ed824100	add sound; possibility to click outside to close	2023-08-20 13:05:25 +02:00
Ivan Savenko	b92e45d7b4	Merge pull request #2616 from dydzio0614/battle-hero-window-mana-fix ... Fix updating opponent hero spellpoints in battle window	2023-08-20 10:54:30 +03:00
nordsoft	a09cb23a85	Better handling other players for turn timer	2023-08-20 04:06:52 +04:00
Dydzio	f24910e5d2	Artifacts backpack window GUI improvements	2023-08-20 00:52:03 +02:00
Dydzio	f409b6ced9	Fix counting wood mines starting from 8 in kingdom overview	2023-08-19 21:09:02 +02:00
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
nordsoft	2fff74deea	Remove uninitialized variable	2023-08-19 18:59:31 +04:00
Nordsoft91	4a6deedd5e	Merge pull request #2530 from Nordsoft91/tutorial ... Support tutorial	2023-08-19 18:06:15 +04:00
Dydzio	6cb6a6d785	Fix updating opponent hero spellpoints in battle window	2023-08-18 20:24:31 +02:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Michael	8635c24166	fix	2023-08-18 00:15:47 +02:00
Michael	f9fa27b180	fix	2023-08-17 23:40:19 +02:00
Michael	e44f713f01	side by side map; player colors	2023-08-17 23:09:20 +02:00
Michael	af347242b4	fix compile error	2023-08-17 20:34:31 +02:00
Michael	ac64b9f2b5	fix	2023-08-17 18:52:00 +02:00
Michael	077ec65bf6	simplify	2023-08-17 18:15:42 +02:00
Michael	e61dc2ec23	constants	2023-08-17 17:54:53 +02:00
Michael	e1e16018d1	code review first batch	2023-08-17 17:29:31 +02:00
Ivan Savenko	ec0a51bd5c	Fixed border scrolling when game window is maximized	2023-08-17 12:25:02 +03:00
Michael	edc11fd451	Map preview initial draft	2023-08-17 09:56:50 +02:00
Ivan Savenko	074fd42d84	Added missing includes	2023-08-17 10:26:01 +03:00
Nordsoft91	96e820ddac	Merge pull request #2517 from Laserlicht/folders	2023-08-17 10:09:37 +04:00
nordsoft	647c7c15a3	Add sound notification for timer	2023-08-17 01:10:03 +04:00
Michael	71bcc611f5	review	2023-08-15 20:19:13 +02:00
Michael	0452dbd80d	remove copy of cropped asset	2023-08-14 23:08:20 +02:00
Michael	b2c8cab9f1	use playerColored	2023-08-14 22:22:43 +02:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
Tomasz Zieliński	c59014ce18	Merge remote-tracking branch 'origin/beta' into fix_rmg_teams	2023-08-14 18:59:45 +02:00
nordsoft	0c76ae89f8	Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2" ... This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.	2023-08-14 16:33:41 +04:00
nordsoft	e426924930	Close window at time expiring	2023-08-14 15:37:21 +04:00
nordsoft	0c38187916	Fix freezes while turn ends at hero move	2023-08-14 04:06:26 +04:00
Michael	079e8ba1ba	naming	2023-08-14 00:40:12 +02:00
Michael	7bfbfeb48f	missing	2023-08-14 00:16:53 +02:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
Michael	bb5ada3bb3	not from this PR	2023-08-14 00:10:06 +02:00
Michael	1d76f456ad	change servercode to make it more robust	2023-08-14 00:08:48 +02:00
nordsoft	f01973a4f0	Configurable turn timer	2023-08-14 01:13:37 +04:00
Michael	ae63088564	outline; squared	2023-08-13 22:58:49 +02:00
nordsoft	093e226bff	Fix compilation	2023-08-13 23:50:40 +04:00
Michael	9a63161866	added random; added names	2023-08-13 20:21:09 +02:00
Michael	e66a41e90b	simplify	2023-08-13 19:23:27 +02:00
Michael	c14448ee32	change design	2023-08-13 15:09:48 +02:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Ivan Savenko	abf7c48593	Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race ... Fix crash on video playback (and who knows how many more)	2023-08-13 00:45:24 +03:00
Michael	daa8bc547f	icon fix	2023-08-12 23:28:53 +02:00
Michael	f71f4a874b	Grid and Activaed	2023-08-12 22:59:45 +02:00
Michael	b73f9d6e30	calculate size	2023-08-12 21:50:40 +02:00
Michael	18b963f376	fix	2023-08-12 20:31:00 +02:00
Michael	3d08ecf024	rename	2023-08-12 20:02:36 +02:00
Michael	92159e57ef	Update SelectionTab.cpp ... fix possible -1	2023-08-12 19:51:18 +02:00
Michael	8bb7fd31cd	basically running...	2023-08-12 19:33:25 +02:00
Michael	481cd89dc8	drawing	2023-08-12 18:20:44 +02:00
Michael	c40c747ccf	saving states	2023-08-12 17:46:35 +02:00
Michael	876dc28e48	rework	2023-08-12 16:49:42 +02:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Michael	bc4d331888	Title	2023-08-12 15:19:40 +02:00
Michael	0c4f4daf70	base rendering	2023-08-12 15:05:26 +02:00
Michael	b4f6c7abab	big images; basic heroes support	2023-08-12 13:19:58 +02:00
Ivan Savenko	626664b8f6	Fix possible thread race on accessing GuiHandler from server handler ... thread without acquiring lock	2023-08-12 14:16:47 +03:00
Ivan Savenko	8cbc52364a	Merge pull request #2496 from IvanSavenko/saves_in_mods ... Allowed loading saves from inside mods	2023-08-12 11:27:15 +03:00
Ivan Savenko	e386309fbc	Merge pull request #2547 from IvanSavenko/instant_fadeout ... Make object fade-out / fade-in instant on instant movement speed	2023-08-12 11:23:26 +03:00
Michael	d0522b0fee	initial window	2023-08-12 02:41:48 +02:00
Michael	f0b60cf166	suggestions; use internally uppercase; fix; fullname	2023-08-11 23:56:20 +02:00
Michael	6ca5518ff1	Buxfix	2023-08-11 20:09:41 +02:00
nordsoft	70d04ad957	Replace thread approach with callback based	2023-08-11 20:04:14 +04:00
Ivan Savenko	20e10cd5ab	Fix potential access to empty std function on hero vs hero combat	2023-08-11 18:52:22 +03:00
SoundSSGood	119d51d1ef	altar sacrifice all fix	2023-08-11 18:51:59 +03:00
Ivan Savenko	ad2bd897d0	Replace boost::format with MetaString ... Looks like some of H3 localizations don't have string replacements for building / war machine name, resulting in exceptions on formatting attempt. MetaString handles this case silently.	2023-08-11 18:50:39 +03:00
Ivan Savenko	9d7f46f985	Fix crash on right-clicking player flags in RMG UI	2023-08-11 18:50:39 +03:00
Ivan Savenko	631e93e846	Fix missing lock of player interface	2023-08-11 18:50:39 +03:00
SoundSSGood	213eda5e1e	altar sacrifice all fix	2023-08-11 14:19:06 +03:00
Ivan Savenko	8ba3f771be	Merge pull request #2529 from IvanSavenko/hero_defeat_fix ... Fix potential access to empty std function on hero vs hero combat	2023-08-11 11:37:12 +03:00
Ivan Savenko	78bb7230a4	Merge pull request #2512 from IvanSavenko/obstacles_priority_fix ... Fixed rendering priority of battlefield background obstacles	2023-08-11 11:36:44 +03:00
Michael	2d9bb34825	format	2023-08-11 01:49:10 +02:00
Michael	2b093b8850	case handling	2023-08-11 01:46:22 +02:00
Michael	092a0d72a1	whitespace format	2023-08-11 00:19:24 +02:00
Michael	c260ce5814	current folder in first line	2023-08-10 23:52:16 +02:00
Michael	48747eea9d	bigger line for folder	2023-08-10 23:37:19 +02:00
Michael	f24c636d17	code review suggestions	2023-08-10 22:15:32 +02:00
Ivan Savenko	e9fb0c9b8c	Make object fade-out / fade-in instant on instant movement speed	2023-08-10 13:02:34 +03:00
nordsoft	ef7008a753	Unblock UI while tutorial loading	2023-08-10 01:27:13 +04:00
Michael	92fd317a84	erase -> pop_back	2023-08-09 20:27:24 +02:00
nordsoft	f4869cbfb0	Tutorial load game mode	2023-08-09 15:29:48 +04:00
nordsoft	04c0124759	Remove unnecessary strings	2023-08-09 14:59:26 +04:00
nordsoft	1def98a862	Tutorial implemented	2023-08-09 03:54:09 +04:00
Michael	6013549ef8	no old selection	2023-08-09 00:41:13 +02:00
Michael	8693dab9ec	fix filter	2023-08-09 00:13:02 +02:00
Ivan Savenko	dc2135da7f	Fix potential access to empty std function on hero vs hero combat	2023-08-09 00:46:55 +03:00
Michael	bbe04c747d	Folder Icon, Save, Folder on top...	2023-08-08 23:46:30 +02:00
Ivan Savenko	45215f12f3	Merged master into beta	2023-08-08 20:43:47 +03:00
Ivan Savenko	d947c14495	Few more H3 data validation checks	2023-08-08 12:50:16 +03:00
Michael	855b94b316	fix	2023-08-08 02:30:28 +02:00