1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Commit Graph

15988 Commits

Author SHA1 Message Date
MichalZr6
65d22f17ae proper logging of drained life and resurrected count
new struct for keeping track of healed HP (also drained life) and resurrected count
2024-06-09 23:54:20 +02:00
Ivan Savenko
2288acef69 Merge pull request #4083 from IvanSavenko/recruitment_fix
[1.6] Fixes crash on accessing recruitment window via click on creature icon
2024-06-04 17:53:53 +03:00
Ivan Savenko
62dd5681f5 Fixes crash on accessing recruitment window via click on creature icon 2024-06-03 13:37:35 +00:00
DjWarmonger
7d56541495 Merge pull request #4076 from Alexander-Wilms/patch-1
ChangeLog.md: Fix bullet points
2024-06-03 14:43:00 +02:00
Alexander Wilms
734128e069 ChangeLog.md: Fix bullet points 2024-06-02 21:03:06 +02:00
Ivan Savenko
0d99adc15a Merge pull request #4070 from IvanSavenko/sonar_fixes
[1.6] Fixes for new issues reported by Sonar Cloud
2024-06-01 19:12:17 +03:00
Ivan Savenko
615361a4d2 Remove excessive casts to void 2024-06-01 12:18:23 +00:00
Ivan Savenko
565d810806 Remove test for no longer existing logic 2024-06-01 12:18:09 +00:00
Ivan Savenko
d462937572 Clarified & simplified ffmpeg decoding loop 2024-06-01 11:48:54 +00:00
Ivan Savenko
b8beb4fb13 Fixes for various minor issues detected by Sonar Cloud 2024-06-01 11:48:30 +00:00
Ivan Savenko
df83fa33a1 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-31 09:34:21 +00:00
Ivan Savenko
adc3441bda Merge pull request #3998 from IvanSavenko/refactor_sdl_media
[1.6] Reorganize SDL sound/music/video handling
2024-05-31 12:02:55 +03:00
Ivan Savenko
37e196c565 Automatically select preferred audio stream when playing video 2024-05-30 18:02:50 +00:00
Ivan Savenko
3ed7c1d066 Implement playback of two-part campaign videos 2024-05-30 18:02:19 +00:00
Ivan Savenko
5d6470e527 Merge pull request #4025 from IvanSavenko/shared_ptr_lib
[1.6] Use shared_ptr for library entities
2024-05-30 19:14:06 +03:00
Ivan Savenko
5ecb527252 Merge pull request #3997 from IvanSavenko/serialization_refactor
[1.6] Serialization refactor
2024-05-30 19:13:21 +03:00
Ivan Savenko
9e0bae96cc Merge pull request #3895 from SoundSSGood/CWindowWithArtifacts-refactoring2
CWindowWithArtifacts refactoring part2
2024-05-30 19:12:39 +03:00
Ivan Savenko
9121fcdc97 Merge pull request #4057 from vcmi/beta
Merge beta -> master
1.5.2
2024-05-30 14:59:19 +03:00
Ivan Savenko
d84b266ab0 Merge pull request #4054 from IvanSavenko/release_152
Release 1.5.2 preparation
2024-05-30 12:55:02 +03:00
Ivan Savenko
a876309154 Attempt to fix 24.04 runners 2024-05-30 08:54:36 +00:00
Ivan Savenko
ecac13d42e Use nullkiller for allied AI by default 2024-05-30 08:45:08 +00:00
Ivan Savenko
7c25b5a818 Final changes for changelog 2024-05-30 08:45:08 +00:00
Ivan Savenko
ee1cc1fb66 Add download counter for 1.5.2 2024-05-30 08:45:08 +00:00
mggk
167bce979e feat(translations): update french translation for map editor 2024-05-30 08:45:08 +00:00
mggk
3ece214126 feat(translations): update french translation for launcher 2024-05-30 08:45:08 +00:00
Ivan Savenko
b0700cfd72 Merge pull request #4055 from dydzio0614/counterattack-polish-translation
Counterattack info polish translation
2024-05-30 11:44:36 +03:00
Ivan Savenko
0915fe30ae Merge pull request #4053 from IvanSavenko/mp_versioning
[1.5.2] Simple format versioning system for multiplayer
2024-05-30 11:23:03 +03:00
Dydzio
9921e6849e Update polish translation 2024-05-29 23:49:40 +02:00
Ivan Savenko
888149c6f6 Implemented simple versioning system for multiplayer 2024-05-29 20:08:32 +00:00
Ivan Savenko
5c2ca380ab Merge pull request #4052 from vcmi/bank_battle
Config option for regular unit placement in Black Tower
2024-05-29 22:55:22 +03:00
Ivan Savenko
f69d23483a Merge pull request #4023 from IvanSavenko/changelog_152
Changelog for 1.5.2
2024-05-29 22:55:09 +03:00
Tomasz Zieliński
098c88eff4 Update serialization version 2024-05-29 20:52:59 +02:00
Tomasz Zieliński
6e3d9302c0 Update docs 2024-05-29 20:28:47 +02:00
Tomasz Zieliński
3ac603767d Basic config for regular unit placement in Black Tower 2024-05-29 20:20:33 +02:00
Ivan Savenko
01250cd419 Added changelog for 1.5.2 2024-05-29 15:30:23 +00:00
Ivan Savenko
dd2d0e285d Merge pull request #4038 from IvanSavenko/pathfinder_fixes
[1.5.2] Pathfinder fixes
2024-05-29 18:15:51 +03:00
Ivan Savenko
df81c1d61a Merge pull request #4050 from IvanSavenko/bonus_fix
[1.5.2] Bonus updaters fix
2024-05-29 18:14:14 +03:00
Ivan Savenko
2fcbfd978a Merge pull request #4049 from IvanSavenko/campaign_fix
[1.5.2] Campaign fixes
2024-05-29 18:14:04 +03:00
Ivan Savenko
2ff28f6957 Merge pull request #4018 from IvanSavenko/voting
[1.5.2?] Multiplayer voting
2024-05-29 18:13:42 +03:00
Ivan Savenko
49138e3de9 Fixes Adrienne starting without Inferno spell in campaign 2024-05-29 14:28:36 +00:00
Ivan Savenko
3e50f09fee Updated docs 2024-05-29 13:55:13 +00:00
Ivan Savenko
2940cb7f51 Merge pull request #4042 from kdmcser/beta
update Chinese translation
2024-05-29 16:39:48 +03:00
Ivan Savenko
25cb9271af Merge pull request #4041 from mGGk-fr/translations/update-french-qt
Translations/update french qt
2024-05-29 16:39:42 +03:00
Ivan Savenko
d8f48f2c59 Merge pull request #4035 from IvanSavenko/stabilization
[1.5.2] Fixes for crashes in 1.5.1
2024-05-28 22:59:55 +03:00
Ivan Savenko
ecd117c542 Merge pull request #4037 from IvanSavenko/end_turn_shortcut_fix
Fix end turn button not assigned to shortcut
2024-05-28 20:06:20 +03:00
Ivan Savenko
58b1e74342 Workaround - check also for valueType when updating bonuses
We should not assume that spells always have a single bonus with same
type/subtype
2024-05-28 17:01:30 +00:00
Ivan Savenko
28081085a8 Create separate instance of updater for every bonus 2024-05-28 16:43:28 +00:00
Ivan Savenko
a092760237 Fix freeze on attempt to load campaign save list 2024-05-28 16:00:52 +00:00
Ivan Savenko
bffc28d9a6 Allow standard defeat on 'To kill a hero' map, in line with H3 2024-05-28 15:43:31 +00:00
Ivan Savenko
a8b07477b4 Fix hero kill mission not registered if target hero was the attacker 2024-05-28 15:43:06 +00:00