17823 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	1826b5bbdf	Merge pull request #4802 from Laserlicht/crash_fix ... fix crash & shortcut & layout	2024-10-23 22:23:33 +03:00
Ivan Savenko	f13b5da687	Merge pull request #4796 from nickhuang99/develop ... Building dependence of Unicorn Glide in Rampart should include Dendro…	2024-10-23 22:22:32 +03:00
Ivan Savenko	9ba7e227ec	Merge pull request #4801 from Laserlicht/fix_mp3 ... fix for defect mp3	2024-10-23 22:21:23 +03:00
Ivan Savenko	0c8a529876	Merge pull request #4797 from GeorgeK1ng/develop ... Updated Czech translation	2024-10-23 22:20:52 +03:00
Ivan Savenko	246ee0f933	Merge pull request #4803 from XCOM-HUB/patch-6 ... Update swedish.json	2024-10-23 22:20:22 +03:00
SoundSSGood	83279211e6	CSecSkillPlace done	2024-10-23 15:01:56 +03:00
SoundSSGood	03b4733c64	CSecSkillPlace	2024-10-22 01:54:04 +03:00
SoundSSGood	7955960901	CTradeableItem refactoring	2024-10-22 01:54:00 +03:00
George King	ff1053b0a0	Quality fixes	2024-10-21 23:45:10 +02:00
Laserlicht	0991f02282	Bonus: prism breath	2024-10-20 22:02:56 +02:00
SoundSSGood	573bb6abc6	CArtPlace now works with artifact ID	2024-10-20 12:56:54 +03:00
Laserlicht	185d036d78	no scrollbar for hotseat title (with ttf fonts)	2024-10-20 03:16:57 +02:00
Laserlicht	98b912dab8	optimize layout	2024-10-20 02:26:40 +02:00
Laserlicht	94606ba5a3	campaign map description size	2024-10-20 02:13:50 +02:00
George King	28a2fa6790	Quality fixes	2024-10-19 22:43:43 +02:00
George King	681542bd2a	Quality fixes	2024-10-19 22:42:18 +02:00
Maurycy	de0463318c	Update swedish.json ... Added new code strings and trimmed down some descriptions so that they will fit in the small description box (hopefully).	2024-10-19 16:16:58 +02:00
Laserlicht	2ea2a3150e	fix shortcuts with Modifier Key	2024-10-19 15:59:02 +02:00
Laserlicht	7a190e4929	fix crash	2024-10-19 15:25:26 +02:00
Laserlicht	1df1177506	fix for defect mp3	2024-10-19 13:45:20 +02:00
George King	7dc74f5585	Small fixes ... Fixes for new v1.6 strings	2024-10-18 22:42:23 +02:00
George King	19ad4ee0da	Small fixes ... Fixed for new v1.6 strings	2024-10-18 20:56:07 +02:00
Laserlicht	a68522b370	fix	2024-10-18 14:37:18 +02:00
Laserlicht	0f41361873	fix edge case	2024-10-18 14:33:29 +02:00
nick huang	7e4b268a78	Building dependence of Unicorn Glide in Rampart should include Dendroid Arches	2024-10-18 20:04:00 +08:00
altiereslima	538c7ce7b1	Update portuguese.json	2024-10-18 07:24:38 -03:00
Laserlicht	f0b7d007a0	video: use global timer; implement frameskip	2024-10-18 10:36:52 +02:00
altiereslima	3ab3132008	Update portuguese.json	2024-10-17 23:51:57 -03:00
altiereslima	cd107c6b4f	Merge branch 'vcmi:develop' into develop	2024-10-17 23:47:00 -03:00
George King	d42e77b5a7	Updated Czech translation ... Small fixes	2024-10-17 18:34:27 +02:00
Ivan Savenko	6dc6cc4cbf	Merge pull request #4786 from GeorgeK1ng/develop ... Updated Czech translation	2024-10-17 17:41:30 +03:00
kodobi	3c56769b2a	Update server/battles/BattleProcessor.cpp ... Co-authored-by: Dydzio <dydzio0614@users.noreply.github.com>	2024-10-17 15:21:06 +02:00
kodobi	c576438a95	Fix battle setup for sieges without forts ... - Update the if statement in BattleProcessor::SetupBattle to allow obstacles in battlefields during sieges without forts. - Ensure towns without forts use the native battlegrounds. - Refactor variable name from curB to currentBattle for clarity.	2024-10-17 14:54:01 +02:00
DjWarmonger	7ddbf492f0	Merge pull request #4789 from Laserlicht/last_map ... fix remembering last map	2024-10-17 12:18:52 +02:00
George King	10332547ac	Updated Czech translation	2024-10-17 09:42:46 +02:00
Laserlicht	59dae43a74	fix remembering last map	2024-10-17 02:12:41 +02:00
George King	9ef6696e78	Updated Czech translation ... Translated 2 overlooked lines	2024-10-16 23:54:41 +02:00
Laserlicht	8b427c3989	use json format	2024-10-16 22:47:38 +02:00
George King	7c0dec1b5e	Small update ... Updated Launcher translation	2024-10-16 19:00:13 +02:00
George King	21c83bd3dc	Updated Czech translation ... Updated Launcher translation	2024-10-16 18:58:26 +02:00
George King	8904701e2e	Updated Czech translation ... Added newly added "vcmi.heroWindow.fusingArtifact.fusing" translation	2024-10-16 18:55:13 +02:00
Ivan Savenko	c25aef8f48	Merge pull request #4766 from SoundSSGood/fused-artifacts ... Fused artifacts	2024-10-16 15:08:20 +03:00
Ivan Savenko	44963f991b	Merge pull request #4782 from Olegmods/develop ... Ship obstacles fix	2024-10-16 15:08:02 +03:00
George King	6b537319be	Updated Czech translation	2024-10-16 12:24:09 +02:00
George King	349f27fa52	Updated Czech translation	2024-10-16 12:17:41 +02:00
Laserlicht	54542c54b3	working subtitles	2024-10-16 03:48:14 +02:00
Laserlicht	4d46a2084d	basic subtitle rendering	2024-10-16 02:36:26 +02:00
Olegmods	5e093d82b7	Update battlefields.json	2024-10-15 23:02:27 +03:00
Olegmods	049c6c539f	Revert changes	2024-10-15 23:01:53 +03:00
Ivan Savenko	52e0899d6f	Merge pull request #4780 from Laserlicht/text_pos_fix ... fix: campaign video scrolling for short texts	2024-10-15 18:01:52 +03:00