1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-30 23:18:08 +02:00
Commit Graph

10523 Commits

Author SHA1 Message Date
Ivan Savenko
c5ca17a324
Merge pull request #1853 from Nordsoft91/fix-scope-guard
Fix ScopeGuard move behavior
2023-04-02 20:10:26 +03:00
Ivan Savenko
1cb0c6b270
Merge pull request #1848 from Nordsoft91/editor-fix
Fix map editor crash with cutting random town
2023-04-02 20:09:24 +03:00
Ivan Savenko
141443b319
Merge pull request #1852 from Nordsoft91/load-crash
Fix divide by zero crash
2023-04-02 20:07:09 +03:00
Ivan Savenko
6944683b2e
Merge pull request #1854 from Nordsoft91/cmake-fix
Add missing includes into cmake
2023-04-02 20:06:27 +03:00
nordsoft
b70b4b5c4f Add missing includes 2023-04-02 16:43:32 +04:00
nordsoft
91ef7cbb4f Fix ScopeGuard move behavior 2023-04-02 15:46:56 +04:00
nordsoft
d63e32841d Fix divide by zero crash 2023-04-02 15:28:41 +04:00
nordsoft
1e5362cb07 Fix crash with cutting random town 2023-04-02 14:06:16 +04:00
Ivan Savenko
4d6b88f10d
Merge pull request #1821 from rilian-la-te/remove-cove-hardcode
CTownHandler: remove hardcoded Cove grail
2023-04-02 00:20:49 +03:00
Konstantin
3df5964847 CTownHandler: remove hardcoded Cove grail
We have now exactly same definition in Json
2023-04-01 03:14:35 +03:00
Ivan Savenko
06b35ce533
Merge pull request #1595 from vcmi/vkai-hack-to-workaround-freezes
VCAI: hard limit on iterations per turn
2023-03-31 18:15:58 +03:00
Ivan Savenko
bfd8d3e1f7
Merge pull request #1790 from IvanSavenko/creature_specialty_loading_refactoring
Refactoring of hero specialty loading code
2023-03-30 00:11:08 +03:00
Ivan Savenko
8d0d5341db Refactoring of hero specialty loading code:
- removed no longer used code
- follow creature upgrade chains (e.g. third upgrades)
2023-03-28 17:09:54 +03:00
Ivan Savenko
bdc7b38b0f
Merge pull request #1784 from IvanSavenko/bump_version
Bump develop version to 1.3
2023-03-28 00:29:12 +03:00
Ivan Savenko
6f8513e303 Bump version to 1.3 2023-03-27 23:31:46 +03:00
Ivan Savenko
b2f5042942
Merge pull request #1783 from vcmi/beta
Merge beta -> develop
2023-03-27 21:21:25 +03:00
Ivan Savenko
a4fe11d413
Merge pull request #1766 from vcmi/fix_editor_shortcut
Fix editor shortcut
2023-03-27 21:20:14 +03:00
Ivan Savenko
d1f6497bc8
Merge pull request #1768 from vcmi/default_ai
Make NKAI default AI
2023-03-27 21:20:01 +03:00
Ivan Savenko
11088100a0
Merge pull request #1782 from korli/haiku
Haiku patch
2023-03-27 18:42:22 +03:00
Ivan Savenko
b875da108b
Merge pull request #1717 from SoundSSGood/backpack-limit-size
Introducing backpack size limit functionality
2023-03-27 17:17:49 +03:00
Ivan Savenko
e3b5db0ade
Merge pull request #1778 from rilian-la-te/fix-obstacle-removal-mechanincs
Fix landmines staying on battlefield after trigger
2023-03-27 17:17:14 +03:00
Ivan Savenko
6bce23e5e8
Merge pull request #1777 from rilian-la-te/beta-from-moats
Fixes for various issues extracted from moats branch
2023-03-27 17:16:59 +03:00
Konstantin
9a229d6e48 vcmi: really correct obstacle trigger
Now obstacle trigger really matches H3
2023-03-27 16:11:17 +03:00
Konstantin
8c1d6c8e13 CBattleInfoCallback: use obstacle only once
We should not affect creature by obstacle twice.
2023-03-27 15:45:41 +03:00
Konstantin
88a7b3141d vcmi: really correct BFS
AFAIK, all is working as H3.
2023-03-27 15:45:41 +03:00
Jerome Duval
518f8d69e5 Haiku patch 2023-03-27 10:10:09 +02:00
Konstantin
5b50191af7 NetPacksLib: remove obstacle ACTIVATE* actions
Actually these actions was not working anyway.
2023-03-26 22:59:34 +03:00
Konstantin
26db14b7b4 vcmi: expert dispel now works mechanically correct 2023-03-26 21:25:26 +03:00
Konstantin
1b893fa525 client: do not show obstacles placed by another player 2023-03-26 21:23:54 +03:00
Konstantin
edc9812559 obstacle: correct logic as in OH3
Obstacle spells should not be cast if they are affected by native
terrain and enemy have at least one stack with native terrain
2023-03-26 21:22:38 +03:00
Konstantin
705afbb898 UnitEffect: it should not always assume smart
It is normal than non-smart spell will be cast on our units.
2023-03-26 21:19:49 +03:00
Konstantin
a75ff91a50 vcmi: remove old string from config 2023-03-26 21:17:58 +03:00
Konstantin
44a625aa6b vcmi: check spell obstacles by type 2023-03-26 21:17:39 +03:00
Andrii Danylchenko
a0de223901
Merge pull request #1772 from vcmi/fix_invalid_native_terrain
Fix the case of invalid native town type
2023-03-26 13:19:01 +03:00
Ivan Savenko
9287d1b837
Merge pull request #1776 from vcmi/beta
Merge beta -> develop
2023-03-26 01:48:23 +02:00
Ivan Savenko
6a3f4fd73d
Merge pull request #1771 from IvanSavenko/beta_fixes
Fixes for issues discovered in beta
2023-03-26 01:36:38 +02:00
Ivan Savenko
da3a05bc8b Fix special colors in battle 2023-03-26 00:46:21 +02:00
Ivan Savenko
662f6a2780
Merge pull request #1773 from dydzio0614/polish-translation-update
Polish translation update - damage format
2023-03-26 00:40:03 +02:00
Ivan Savenko
4c311da21b Clamp potential kills tooltip to target unit size 2023-03-26 00:07:21 +02:00
Ivan Savenko
5857ad0169 Fix corrupted UI redraw in artifact merchant 2023-03-25 23:54:51 +02:00
Ivan Savenko
c246cadaa7 Fix potential crash on exit 2023-03-25 23:54:51 +02:00
Ivan Savenko
46461e5c33 Improve performance of window redraws 2023-03-25 23:54:51 +02:00
Ivan Savenko
7477e4a8cc Handle mods with "keepDisabled" propertly on client 2023-03-25 23:54:51 +02:00
Ivan Savenko
7fd0d0beb1 Made English first language so invalid values would reset to it 2023-03-25 23:54:51 +02:00
Ivan Savenko
c8fe079294 Added Chinese in-game translation from forum user 'By003' 2023-03-25 23:54:51 +02:00
Ivan Savenko
4eed0b2c9e Added workaround for Dungeon towers 2023-03-25 23:54:51 +02:00
Ivan Savenko
49fa628e9b Turret creature cutoff position should match H3 2023-03-25 23:54:51 +02:00
Ivan Savenko
dcff463d36 Fixed handling of special palette colors in palette transformations
Fixes black color turning semi-transparent in some creatures from mods
2023-03-25 23:54:51 +02:00
Ivan Savenko
a0bd46c9dd Fix teleport animation speed 2023-03-25 23:54:51 +02:00
Ivan Savenko
8fbeff2a02 Fix movement over lowered drawbridge in Fortress 2023-03-25 23:54:51 +02:00