1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

15984 Commits

Author SHA1 Message Date
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
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
Ivan Savenko
3afbd03089 Attempt to track down crash on battle end 2024-05-28 14:41:05 +00:00
Ivan Savenko
520f690d35 Fix transfer of non-first artifacts in backpack if hero does not
transfers as well
2024-05-28 14:21:29 +00:00
Ivan Savenko
4752d4f8af Fix conflicting shortcuts 2024-05-28 13:49:36 +00:00
Ivan Savenko
985adbe07b
Merge pull request #4028 from SoundSSGood/artifacts-parts-calc
Parts calculation for combined artifacts
2024-05-28 16:48:01 +03:00
Ivan Savenko
0c1dd45e9e
Merge pull request #4034 from Laserlicht/innoextract_userpath
extract files into userdata instead of tmp
2024-05-28 16:47:24 +03:00
Ivan Savenko
fa10580a51
Merge pull request #4045 from godric3/map-editor-victory-lose-conditions
fix victory/loss conditions widget
2024-05-28 16:47:01 +03:00
Ivan Savenko
6c1d506157
Merge pull request #4047 from emmanuel-ferdman/beta
docs: update reference to Conan
2024-05-28 16:46:48 +03:00
Ivan Savenko
7f5fe99d96
Merge pull request #4027 from IvanSavenko/show_mp_saves_in_sp
[1.5.2] Show multiplayer saves in singleplayer mode
2024-05-28 16:45:54 +03:00
Ivan Savenko
e82609d1de
Merge pull request #4036 from IvanSavenko/fullscreen_hotkey_fix
Fixed F4 (fullscreen hotkey) not actually changing window mode
2024-05-28 16:45:37 +03:00
Ivan Savenko
3847e3e2b4 Better comments, remove dead code 2024-05-28 13:43:16 +00:00
Emmanuel Ferdman
651e223d7d
Update docs/developers/Building_macOS.md
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-05-28 14:17:58 +03:00
Emmanuel Ferdman
dc3a677f14
Update docs/developers/Building_iOS.md
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-05-28 14:17:53 +03:00
Emmanuel Ferdman
42b77c746a
Update docs/developers/Building_Android.md
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-05-28 14:17:48 +03:00
Emmanuel Ferdman
970a4c5b4c
docs: update reference to Conan
Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>
2024-05-27 14:46:34 +03:00
godric3
c69150f984 fix victory/loss conditions widget 2024-05-26 22:50:26 +02:00
kdmcser
77cde094fb update Chinese translation 2024-05-25 18:37:15 +08:00
Laserlicht
3bde84b163
fine tuning 2024-05-24 23:36:25 +02:00
SoundSSGood
07239dcfb5 artifact parts calc 2024-05-24 21:22:08 +02:00
Ivan Savenko
f7989f6dcb Allow landing on guarded tiles when flying in from guarded tile 2024-05-23 19:01:30 +00:00
Ivan Savenko
3fdbc09986 Use same arrows for U-turns in UI as in H3 2024-05-23 19:01:30 +00:00
Ivan Savenko
ac047d0d6d Fixed handling of original game rules pathfinding 2024-05-23 19:01:30 +00:00
Ivan Savenko
0a3cfea017 Simplify code 2024-05-23 19:01:30 +00:00
Ivan Savenko
d7f5d24b99 If original movement rules are on, it is not possible to attack guards
from visitable object directly
2024-05-23 19:01:30 +00:00
Ivan Savenko
ef29c47408 Added GUARDED state to distinguish from blocked visitable 2024-05-23 19:01:30 +00:00
Ivan Savenko
9e5f9a88c3 Fix renamed end turn shortcut 2024-05-23 18:49:06 +00:00
Ivan Savenko
949c0cff70 Fixed F4 (fullscreen hotkey) not actually changing window mode 2024-05-23 14:54:13 +00:00
Ivan Savenko
120791133f
Merge pull request #4032 from vcmi/nkai-exploration
NKAI: speedup exploration a bit
2024-05-23 16:57:01 +03:00
Ivan Savenko
c27dd04a1e Abort game loading if corrupted mod is found and show explanation 2024-05-23 12:46:28 +00:00
Ivan Savenko
64ad57470c Fix crash on applying necromancy when battle ended in a draw 2024-05-23 12:46:28 +00:00
Ivan Savenko
45bb6ada3d Add compatibility for 64-bit 1.5.1 vs any 1.5.2 MP game 2024-05-23 12:46:28 +00:00
Ivan Savenko
2aec3cde2c Fix possible crash on replaying combat after manual run 2024-05-23 12:46:28 +00:00
Ivan Savenko
f8a206b0c6 Fix serialization of size_t breaking 32<->64 bit compatibility 2024-05-23 12:46:28 +00:00
Ivan Savenko
3ad618e0d8 Fix crash on bonus with invalid spell ID 2024-05-23 12:46:28 +00:00
Laserlicht
faba115224 extract files into userdata instead of tmp 2024-05-23 01:19:31 +02:00
Andrii Danylchenko
02ea497951 NKAI: speedup exploration a bit 2024-05-22 22:49:11 +03:00
Andrii Danylchenko
7a6540ec2f
Merge pull request #4024 from vcmi/nkai-exploration
NKAI: port exploration from VCAI
2024-05-21 19:48:41 +03:00
Ivan Savenko
6d01b6d7c9 Show multiplayer saves in singleplayer mode 2024-05-21 15:15:18 +00:00
Ivan Savenko
d1aa4ecd10
Merge pull request #4013 from IvanSavenko/shortcuts_additions
[1.5.2] Shortcuts additions
2024-05-21 14:18:55 +03:00