6721 Commits

Author	SHA1	Message	Date
Ivan Savenko	1a038b26ed	Merge pull request #4910 from Laserlicht/picture_regression ... fix picture (regression)	2024-11-15 19:17:52 +02:00
Ivan Savenko	90304e5c8a	Merge pull request #4900 from Laserlicht/chronicles_menu ... Chronicles menu	2024-11-15 19:15:28 +02:00
Ivan Savenko	df0c53af41	Merge pull request #4864 from Laserlicht/creature_window_rework ... Creature window rework	2024-11-15 19:13:58 +02:00
Laserlicht	ac12574f61	fix picture (regression)	2024-11-15 03:25:16 +01:00
Laserlicht	6199a13603	code review	2024-11-13 20:20:16 +01:00
Laserlicht	e73cb7f45b	Update client/windows/CCreatureWindow.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-11-13 20:03:20 +01:00
Ivan Savenko	7be44278d7	Merge pull request #4892 from SoundSSGood/artifact-related-fixes ... Artifact related fixes	2024-11-13 20:58:37 +02:00
Ivan Savenko	46e492be01	Merge pull request #4891 from kdmcser/fix_research_spell_crash ... fix spell research crash when no more spells can be researched	2024-11-13 20:50:24 +02:00
Ivan Savenko	1d0fdb1c0e	Merge pull request #4867 from Laserlicht/notFocusedClick ... notFocusedClick refactoring	2024-11-13 20:49:31 +02:00
SoundSSGood	27b59dd7ee	crash fixed	2024-11-13 06:39:37 +02:00
Laserlicht	719859cc62	optimize	2024-11-12 00:12:56 +01:00
Laserlicht	33220b2eb3	check if used in mainmenu	2024-11-11 23:52:35 +01:00
Laserlicht	6b33f4d969	skip campaigns from set	2024-11-11 22:44:48 +01:00
Laserlicht	9c55ebf2dd	chronicles campaign screen	2024-11-11 22:25:54 +01:00
kdmcser	51e742f475	Merge branch 'develop' into fix_research_spell_crash	2024-11-10 23:32:33 +08:00
kdmcser	2621d4f5bf	fix spell research crash when no more spells can be researched due to map limit	2024-11-10 23:02:36 +08:00
SoundSSGood	ef46a87e69	ask assemble artifact dialog fix	2024-11-10 16:50:58 +02:00
Ivan Savenko	e9690c8c54	Merge branch 'develop' into autosave_name	2024-11-06 22:06:12 +02:00
Ivan Savenko	2fed53d933	Merge pull request #4865 from Laserlicht/touch_scroll_popup ... allow scrolling in touch popups	2024-11-06 22:03:18 +02:00
Ivan Savenko	da8fe13632	Merge pull request #4870 from SoundSSGood/secSkillPlace-fix ... CHeroOverview secondary skill icons fixed	2024-11-06 22:02:28 +02:00
Ivan Savenko	92fc66d1c2	Merge pull request #4875 from Laserlicht/patch-3 ... 8th creature fix	2024-11-06 22:02:06 +02:00
Ivan Savenko	e7bea6c3b8	Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization ... Remove remaining pointers to VLC entities from serializer	2024-11-06 22:01:11 +02:00
Ivan Savenko	11d9ee310e	Merge pull request #4785 from Laserlicht/subtitles ... Subtitles for videos / sync	2024-11-06 21:56:43 +02:00
SoundSSGood	fa9201831b	QuickBackpack window position on shift+click slot fixed	2024-11-04 14:16:06 +02:00
Laserlicht	7a52d1d533	8th creature fix	2024-11-03 22:51:48 +01:00
SoundSSGood	f60813d86f	CHeroOverview secondary skill icons fixed	2024-11-03 17:29:27 +02:00
Laserlicht	ca037aae33	notFocusedClick refactoring	2024-11-03 01:13:14 +01:00
Laserlicht	1367348da9	allow scrolling in touch popups	2024-11-02 19:15:49 +01:00
Laserlicht	988d36bd13	sorted	2024-11-02 15:46:20 +01:00
Laserlicht	74b4fbfceb	small fix	2024-11-02 15:19:39 +01:00
Laserlicht	0ab4b66026	better approach for scrollbar	2024-11-02 15:16:38 +01:00
Laserlicht	9009dffebd	add "other" for bonus display	2024-11-02 14:51:33 +01:00
Laserlicht	17ee363d8d	changed bonus source text pos	2024-11-02 14:37:21 +01:00
Laserlicht	5a72a65b31	add labels	2024-11-02 13:59:09 +01:00
Laserlicht	440e9a6575	assign colors for bonuses	2024-11-02 13:05:10 +01:00
Laserlicht	3038e5140a	add color frames; remove scrollbar	2024-11-01 19:02:51 +01:00
Ivan Savenko	0969871835	Merge branch 'develop' into mechanical_bonus	2024-10-31 15:14:51 +02:00
Ivan Savenko	e714a02063	Merge pull request #4849 from IvanSavenko/map_encoding ... Better handling of encoding detection for maps and campaigns	2024-10-31 15:07:36 +02:00
Laserlicht	452762cd78	change datetime format	2024-10-30 23:23:56 +01:00
Laserlicht	cb91397688	fix pos	2024-10-30 21:50:03 +01:00
Laserlicht	1423951b9e	disable selection by empty slot	2024-10-30 21:36:37 +01:00
Laserlicht	a54f4e1bd1	change autosave folder name; align autosave folder	2024-10-30 21:18:55 +01:00
kodobi	2678665f67	Resolve merge conflict	2024-10-30 18:48:09 +01:00
kodobi	44f479be89	Merge branch 'vcmi:develop' into bugfix/fix-ballista-damage-range-display	2024-10-30 18:41:29 +01:00
kodobi	0a0692061d	Merge branch 'bugfix/fix-ballista-damage-range-display' of https://github.com/kodobi/vcmi into bugfix/fix-ballista-damage-range-display	2024-10-30 18:39:11 +01:00
kodobi	b82444ba43	Fix ballista damage range display ... - Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3. - Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.	2024-10-30 18:35:35 +01:00
Ivan Savenko	d3af9f1c67	Removed pointer to VLC entity from CStackBasicDescriptor	2024-10-30 16:47:02 +00:00
Ivan Savenko	c98ac01e7a	Replaced public artType member of ArtifactInstance with getter	2024-10-30 16:47:01 +00:00
Ivan Savenko	04ca8aca9f	Update tests	2024-10-30 16:22:12 +00:00
Ivan Savenko	08fbcd5239	TerrainTile now uses identifiers instead of pointers to VLC	2024-10-30 16:22:11 +00:00