1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

14227 Commits

Author SHA1 Message Date
Joakim Thorén
2569e1c661 Update documentation to suggest using option ENABLE_CCACHE instead of directly setting CMAKE_C(XX)_COMPILER_LAUNCHER 2023-12-27 21:13:41 +01:00
Joakim Thorén
fce3b5b83c Remove redundant find_program and if(CCACHE) - if ENABLE_CCACHE is set and the generation hasn't already failed then CCACHE is guaranteed to be set and point to a ccache binary. 2023-12-27 21:12:52 +01:00
Joakim Thorén
7b02750034 ENABLE_CCACHE option is available for all platforms 2023-12-27 21:10:56 +01:00
Ivan Savenko
bb6179d05e
Merge pull request #3391 from vcmi/master
Merge master -> develop
2023-12-25 13:00:17 +02:00
Ivan Savenko
a577a7466b
Merge pull request #3388 from vcmi/beta
Merge beta -> master
2023-12-24 23:53:50 +02:00
Ivan Savenko
03e3e28b65
Merge pull request #3386 from IvanSavenko/release_142
Release 1.4.2
2023-12-24 23:53:05 +02:00
Ivan Savenko
0c177ced42 Disable lobby reconnection logic due to deadlock on shutdown 2023-12-24 22:31:02 +02:00
Ivan Savenko
4835a1f695 Fix possible crash on abandoned mine with no valid resources 2023-12-24 22:05:47 +02:00
Ivan Savenko
28a3deb42b Do not allow stealing input focus from ourselves 2023-12-24 22:01:22 +02:00
Ivan Savenko
8c4de0d093 Update Ukrainian localization 2023-12-24 19:29:33 +02:00
Ivan Savenko
a001f4e407 Fix crash on reveal puzzle cheat 2023-12-24 19:29:33 +02:00
Dydzio
b5f56f29fa Translate new settings to polish 2023-12-24 19:29:33 +02:00
Ivan Savenko
0eb6e8cc2b Updated changelog with latest changes 2023-12-24 19:29:33 +02:00
Ivan Savenko
7efb141c50 Version bump for Android 2023-12-24 19:29:33 +02:00
Ivan Savenko
274bd3ac22 Add downloads counter for 1.4.2 2023-12-24 19:29:33 +02:00
Ivan Savenko
e81f4b04cf Set 1.4.2 release date to 25th December 2023-12-24 19:29:33 +02:00
Ivan Savenko
161fc6eb58
Merge pull request #3344 from cewbdex/czech-work
More Czech translation work
2023-12-24 19:28:29 +02:00
Ivan Savenko
0b22ed7607
Merge pull request #3387 from dydzio0614/instant-animations
New setting to skip adventure map fadein/fadeout
2023-12-24 19:21:56 +02:00
Dydzio
70aed9490d Change wording to less technical 2023-12-24 17:49:58 +01:00
Dydzio
046d3abee4 Add new setting for instant adventure map fade in / fadeout effects 2023-12-24 17:18:48 +01:00
Ivan Savenko
172e385f67
Merge pull request #3375 from Laserlicht/round_counter
turn indicator
2023-12-24 16:25:04 +02:00
Ivan Savenko
85d930bbd0
Merge pull request #3374 from dydzio0614/default-large-spellbook
Default large spellbook
2023-12-24 16:23:29 +02:00
Ivan Savenko
7958faaa2c
Merge pull request #3339 from IvanSavenko/changelog_142
[1.4.2] Changelog
2023-12-24 14:13:30 +02:00
Ivan Savenko
75cd9ca12b Added 1.4.2 changelog 2023-12-24 14:13:09 +02:00
Ivan Savenko
e77651d3f3
Merge pull request #3377 from dydzio0614/commander-skills-fix
Commander skills fix
2023-12-24 13:33:48 +02:00
Ivan Savenko
2b495a9679
Merge pull request #3379 from IvanSavenko/fix_genie_spellcasting
Fix genie spellcasting
2023-12-24 13:29:05 +02:00
Ivan Savenko
04b6167467
Merge pull request #3382 from vcmi/kambala-decapitator-typo
fix typo
2023-12-24 13:20:57 +02:00
Ivan Savenko
4efe09fe34
Merge pull request #3380 from 678098/patch-1
Docs: remove `Manual.md` link from `Readme.md`
2023-12-24 13:20:42 +02:00
Ivan Savenko
c7ea15e2ce
Merge pull request #3378 from IvanSavenko/fix_lists
Fix possible memory corruption in town/hero lists
2023-12-24 13:19:38 +02:00
Ivan Savenko
5fe5d81729
Merge pull request #3376 from IvanSavenko/uninitialized_fixes
Fix uninitialized memory access
2023-12-24 13:19:17 +02:00
Andrey Filipenkov
3074f8cb89
fix typo 2023-12-24 09:58:48 +03:00
Evgeny Malygin
3d1627a44f
Docs: remove Manual.md link from Readme.md 2023-12-24 08:43:45 +02:00
Dydzio
ef80b840e8
Merge pull request #2 from Laserlicht/disable_animation_button
disable animation button if large spellbook used
2023-12-24 00:50:51 +01:00
Laserlicht
39c58a9d94
disable animation button 2023-12-24 00:41:29 +01:00
Ivan Savenko
85de3143ff Fixed Genie spellcasting logic to account for spell immunities 2023-12-24 01:13:19 +02:00
Ivan Savenko
822677af77 More correct frenzy spell creature immunities 2023-12-24 01:09:10 +02:00
Ivan Savenko
bcbd708fa7 Added more checks to detect illegal access in CList's class 2023-12-24 00:16:29 +02:00
Laserlicht
fe8bf92a20
only a bar in small mode 2023-12-23 22:00:28 +01:00
Kryštof Černý
9213ec548b More work 2023-12-23 21:36:46 +01:00
Kryštof Černý
8933ee994b Finish Czech translation of random maps 2023-12-23 21:26:33 +01:00
Ivan Savenko
08a4b67cd7
Merge pull request #3372 from IvanSavenko/bugfixing
[1.4.2] Bugfixing
2023-12-23 22:05:39 +02:00
Ivan Savenko
056639ba67
Merge pull request #3371 from dydzio0614/creatures-transfer-fix
Fix crash due to incorrect logic on transferring last creature
2023-12-23 21:55:52 +02:00
Ivan Savenko
027dd635ef
Merge pull request #3370 from vcmi/ban_armageddons_blade
Ban Armageddon's Blade and Vial of Dragon Blood
2023-12-23 21:54:59 +02:00
Ivan Savenko
4220bb32a7
Merge pull request #3364 from IvanSavenko/scholar_fix
Fix refusable Scholar
2023-12-23 21:54:13 +02:00
Dydzio
2e976dc0f1 Add TODO comment for possible minor logic deviation from WoG 2023-12-23 20:35:40 +01:00
Dydzio
6fd4b2bddd Fix commander bonus from damage ability 2023-12-23 20:33:15 +01:00
Ivan Savenko
3e9133995f Fix uninitialized member 2023-12-23 21:31:29 +02:00
Ivan Savenko
7732f39556 Fix potential uninitialized access - setupSteps depends on not yet
initialized members
2023-12-23 21:31:17 +02:00
Dydzio
9e9849b741 Fix commander ability accumulation, change commander ability bonus 2023-12-23 20:16:29 +01:00
Laserlicht
c540dd1183
round_counter 2023-12-23 19:57:19 +01:00