5562 Commits

Author	SHA1	Message	Date
Ivan Savenko	f834cb3d99	Display different timers separately when applicable	2023-12-22 18:40:28 +02:00
Ivan Savenko	da9c0feebc	Reworked timer widget to show timers for all players	2023-12-22 18:40:28 +02:00
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