Commit Graph
17631 Commits
Author SHA1 Message Date
Laserlicht a54f4e1bd1 change autosave folder name; align autosave folder 2024-10-30 21:18:55 +01:00
Ivan Savenko 6dc6cc4cbf Merge pull request #4786 from GeorgeK1ng/develop
Updated Czech translation
2024-10-17 17:41:30 +03: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
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
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
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
LaserlichtandIvan Savenko 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