17776 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ivan Savenko	e676e78e28	Merge pull request #4778 from Laserlicht/assert_fix ... fix: workaround for assert	2024-10-15 18:01:31 +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
Ivan Savenko	60fe8a05b9	Merge pull request #4775 from dydzio0614/map-editor-event-day-fix ... Count days from 1 instead of 0 in map editor timed event UI	2024-10-15 18:00:23 +03:00
SoundSSGood	86d5c05ffa	Fused identical artifacts	2024-10-15 16:51:29 +03:00
Olegmods	5f34d3b067	Update obstacles.json	2024-10-15 14:15:43 +03:00
Olegmods	6c4e7f8058	Update obstacles.json	2024-10-15 11:09:14 +03:00
Laserlicht	d65938fa17	fix campaign video scrolling for short texts	2024-10-14 23:26:24 +02:00
altiereslima	b379491b96	Update Portuguese Translation (map object search)	2024-10-14 18:24:45 -03:00
Laserlicht	cb6fa74cc4	lower background music while campaign audio plays	2024-10-14 21:02:49 +02:00
Laserlicht	6e65eaafbc	workaround for assert	2024-10-14 21:01:01 +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
Ivan Savenko	abf9d1017e	Merge pull request #4705 from Laserlicht/adv_search ... map object search	2024-10-14 21:51:41 +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	129f8e6f34	code review ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-10-14 19:30:03 +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	2c14b8fa98	Merge pull request #4706 from altiereslima/develop ... Update Portuguese Translation	2024-10-14 18:33:39 +03:00
Dydzio	69b6e9c167	Count days from 1 instead of 0 in map editor timed event UI	2024-10-14 17:19:34 +02: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
Ivan Savenko	856da004d1	Merge pull request #4768 from ToRRent1812/patch-2 ... Update polish.json	2024-10-14 18:16:27 +03:00
Ivan Savenko	b058104ccc	Merge pull request #4757 from XCOM-HUB/patch-5 ... Update swedish.json	2024-10-14 18:16:16 +03:00
Ivan Savenko	5894d51f89	Merge pull request #4545 from vcmi/update_prebuilts ... Update conan prebuilt package	2024-10-14 18:04:13 +03:00
Ivan Savenko	ccd0edf13d	Changes according to review	2024-10-14 13:23:48 +00:00
Ivan Savenko	55e79b1b96	Remove Android CI workaround	2024-10-14 13:23:19 +00:00
Ivan Savenko	34447fd844	Fix missing standard libraries from package on mingw	2024-10-14 13:05:10 +00:00
Ivan Savenko	55916fad0a	Fix libpng linkage - shared on all platforms other than iOS	2024-10-14 13:05:10 +00:00
Ivan Savenko	ab2c5ba64f	Add workaround for Android NDK installed via conan - required for ... correct stripping of resulting binaries	2024-10-14 13:05:10 +00:00
Ivan Savenko	6b1fd428bd	Use shared setup file for 32 and 64 bit bingw	2024-10-14 13:05:10 +00:00
Ivan Savenko	eb06eb15cd	Clean up workflow	2024-10-14 13:05:10 +00:00
Ivan Savenko	a63d3a11c4	Simplify cpack logic	2024-10-14 13:05:10 +00:00
Ivan Savenko	2506490db4	Use python provided in CI runner image instead of installing via action	2024-10-14 13:05:10 +00:00
Ivan Savenko	9a1f26883d	Update documentation	2024-10-14 13:05:10 +00:00
Ivan Savenko	06cd74dde6	Use new path to the script	2024-10-14 13:05:10 +00:00
Ivan Savenko	501622229d	Use new prebuilts package	2024-10-14 13:05:10 +00:00
Ivan Savenko	2d2bc8293f	Delete old coverity files	2024-10-14 13:05:10 +00:00
Ivan Savenko	ecf063cd1c	Reorganized layout of CI directory, move all before_install files into ... common directory, remove copy-pasted files	2024-10-14 13:05:10 +00:00
Ivan Savenko	289ed742d0	Disable unused boost_url	2024-10-14 13:05:10 +00:00
Ivan Savenko	a64f1f1232	Use newer SDL libraries	2024-10-14 13:05:10 +00:00
Ivan Savenko	0e1d5274ba	Generate aab's only for builds on master branch	2024-10-14 13:05:09 +00:00
Ivan Savenko	4dc521743c	Install dependencies as separate CI step	2024-10-14 13:05:09 +00:00
Ivan Savenko	1623afd35d	Use Ubuntu 24.04 for mingw builds	2024-10-14 13:05:09 +00:00
Ivan Savenko	b3c5e0680d	Install ninja for ios CI builds	2024-10-14 13:05:09 +00:00
Maurycy	7183314413	Update swedish.json	2024-10-14 01:30:27 +02:00
Maurycy	bbe216c51a	Update swedish.json	2024-10-14 01:20:56 +02:00