6820 Commits

Author	SHA1	Message	Date
Xilmi	cf8888987d	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-27 10:03:26 +01:00
Ivan Savenko	72b0062ae3	Better integration of wog commanders translation	2024-10-26 14:21:05 +00:00
Ivan Savenko	d1164ab9a9	Integrated exchange window translation into vcmi	2024-10-26 13:09:09 +00:00
Ivan Savenko	565c02d61c	Added 'translate missing' command for convenience	2024-10-26 12:54:35 +00:00
Ivan Savenko	638bc174c3	Fix crash on exporting maps for translation	2024-10-25 21:41:24 +00:00
Ivan Savenko	26fecbf2ca	Simplify income calculation in kingdom overview, account for flaggables	2024-10-25 19:08:13 +00:00
Ivan Savenko	ee59bc4e71	Add bonus description generation for map objects	2024-10-25 18:36:02 +00:00
Laserlicht	53b7c5da6f	added MECHANICAL bonus	2024-10-24 21:30:51 +02:00
Ivan Savenko	1826b5bbdf	Merge pull request #4802 from Laserlicht/crash_fix ... fix crash & shortcut & layout	2024-10-23 22:23:33 +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
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
Xilmi	5d6877e06d	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-20 00:49:17 +02:00
Laserlicht	2ea2a3150e	fix shortcuts with Modifier Key	2024-10-19 15:59:02 +02:00
Laserlicht	1df1177506	fix for defect mp3	2024-10-19 13:45:20 +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
Laserlicht	f0b7d007a0	video: use global timer; implement frameskip	2024-10-18 10:36:52 +02:00
Laserlicht	59dae43a74	fix remembering last map	2024-10-17 02:12:41 +02:00
Laserlicht	8b427c3989	use json format	2024-10-16 22:47:38 +02:00
Ivan Savenko	c25aef8f48	Merge pull request #4766 from SoundSSGood/fused-artifacts ... Fused artifacts	2024-10-16 15:08:20 +03: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
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
Ivan Savenko	c4e708831c	Merge pull request #4777 from Laserlicht/backround_voice ... fix: lower background music while campaign audio plays	2024-10-15 18:01:17 +03:00
Ivan Savenko	da0ec2c607	Merge pull request #4776 from Laserlicht/audio_playback ... fix: audio playback after using Back button	2024-10-15 18:00:44 +03:00
SoundSSGood	86d5c05ffa	Fused identical artifacts	2024-10-15 16:51:29 +03:00
Laserlicht	d65938fa17	fix campaign video scrolling for short texts	2024-10-14 23:26:24 +02:00
Laserlicht	cb6fa74cc4	lower background music while campaign audio plays	2024-10-14 21:02:49 +02:00
Ivan Savenko	94a0de716a	Merge pull request #4772 from Laserlicht/mixer_audio_duration ... fix: use sdl mixer to get audio duration	2024-10-14 21:51:49 +03:00
Laserlicht	b2da317906	fixes audio playback after using Back button	2024-10-14 20:26:31 +02:00
Laserlicht	9ed4dbaeb4	Merge remote-tracking branch 'upstream/develop' into adv_search	2024-10-14 19:52:55 +02:00
Laserlicht	3f59942b04	code review	2024-10-14 19:28:38 +02:00
Ivan Savenko	604e3b5c67	Merge pull request #4763 from IvanSavenko/herohandler_split ... Split CHeroHandler.cpp/.h into 1 file per class	2024-10-14 19:05:48 +03:00
Ivan Savenko	cee3521f57	Merge pull request #4770 from IvanSavenko/prison_fix ... Fix for loading hero types / identities	2024-10-14 18:16:53 +03:00
Ivan Savenko	678e6b47f8	Merge pull request #4756 from IvanSavenko/sonar_fixes ... Fix some of the new warnings from sonarcloud	2024-10-14 18:16:41 +03:00
Laserlicht	d43997f5ba	use sdl mixer to get audio duration	2024-10-13 21:08:43 +02:00
Ivan Savenko	10ad0fc760	Split CHeroHandler.cpp/.h into 1 file per class ... All parts of CHeroHandler.cpp are now in lib/entities/hero Adjusted includes to use new paths No functionality changes	2024-10-13 14:01:09 +00:00
Ivan Savenko	184d8de82e	Fix typo in assertion	2024-10-13 13:06:07 +00:00
Laserlicht	f7e3641c04	fix shortcut bug; add center of selected item	2024-10-12 23:21:26 +02:00
Laserlicht	11eaed9fef	code review	2024-10-12 23:01:14 +02:00
SoundSSGood	d4d3ddf685	fused artifacts	2024-10-12 16:43:04 +03:00
Xilmi	533806df6d	Merge remote-tracking branch 'upstream/develop' into develop	2024-10-11 19:07:56 +02:00
Ivan Savenko	a8e84c55f6	Fix some of the new warnings from sonarcloud	2024-10-11 10:45:29 +00:00
Ivan Savenko	e0e01d678a	Merge pull request #4753 from IvanSavenko/misc_fixes ... Fixes for regressions from recent PR's	2024-10-11 00:32:45 +03:00
Ivan Savenko	dfff1eae26	Fix crash on losing a hero	2024-10-10 21:16:41 +00:00