Ivan Savenko
eafa9cbae1
Merge pull request #2684 from dydzio0614/creature-spellcasting-fixes
...
Better default stack action handling + "F shortcut" mode fixes
2023-08-28 20:01:04 +03:00
Ivan Savenko
5be87b30c1
Merge pull request #2625 from dydzio0614/artifacts-backpack-gui
...
Artifacts backpack GUI
2023-08-28 19:59:11 +03:00
Ivan Savenko
a30939ad8e
Merge pull request #2685 from dydzio0614/mana-drain-ui-refresh
...
Fix mana drain not refreshing battle hero window mana
2023-08-28 19:56:29 +03:00
Dydzio
cba9ddd66a
Update client/battle/BattleActionsController.cpp
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-08-27 23:01:04 +02:00
Ivan Savenko
790a5680e5
Merge pull request #2669 from SoundSSGood/backpack-window-fix
...
Backpack window fix
2023-08-27 22:07:22 +03:00
Dydzio
321c9c2ca6
Remove now unused enum
2023-08-27 20:18:19 +02:00
Dydzio
207a73b9de
Fix mana drain not refreshing battle hero window mana
2023-08-27 18:58:07 +02:00
Dydzio
e1eb245565
Better default stack action handling + "F shortcut" mode fixes
2023-08-27 17:33:10 +02:00
SoundSSGood
730ab449b6
backpack window fix
2023-08-25 10:08:08 +03:00
Ivan Savenko
43096f0ed1
Merge pull request #2617 from dydzio0614/configurable-autobattle-spells
...
Configurable autobattle spells usage
2023-08-25 01:29:16 +03:00
Ivan Savenko
988843c4ee
Update cmake_modules/VCMI_lib.cmake
2023-08-25 01:14:22 +03:00
Dydzio
764608f100
Merge remote-tracking branch 'dydzio/configurable-autobattle-spells' into configurable-autobattle-spells
2023-08-21 20:10:04 +02:00
Dydzio
e81cd4e0e6
Delete empty file
2023-08-21 20:09:50 +02:00
Dydzio
28fe28adf5
Fix player coloring
2023-08-21 17:08:15 +02:00
Dydzio
b73f9325ad
Fixes from code review
2023-08-21 16:56:50 +02:00
Dydzio
78f56df44f
Comment out unused OH3 options so they do not clutter code suggestions
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-08-20 19:11:36 +02:00
Dydzio
b53894ac2d
Add artifact slots backgrounds
2023-08-20 18:57:53 +02:00
Dydzio
3b99f09495
Update backpack icons
2023-08-20 18:25:57 +02:00
Dydzio
cab6fb76aa
Draft version of backpack button + new setting for original H3 UI mode
2023-08-20 17:45:43 +02:00
Dydzio
d8eef4905a
Implement new callback in stupidAI
2023-08-20 13:53:25 +02:00
Ivan Savenko
b92e45d7b4
Merge pull request #2616 from dydzio0614/battle-hero-window-mana-fix
...
Fix updating opponent hero spellpoints in battle window
2023-08-20 10:54:30 +03:00
Ivan Savenko
58ee6acb63
Merge pull request #2621 from dydzio0614/kingdom-overview-woodmines-fix
...
Fix counting wood mines starting from 8 in kingdom overview
2023-08-20 10:54:13 +03:00
Dydzio
f24910e5d2
Artifacts backpack window GUI improvements
2023-08-20 00:52:03 +02:00
Dydzio
f409b6ced9
Fix counting wood mines starting from 8 in kingdom overview
2023-08-19 21:09:02 +02:00
Dydzio
6bfbe80cc9
Allow toggling quick combat spells usage
2023-08-19 17:23:55 +02:00
Dydzio
6cb6a6d785
Fix updating opponent hero spellpoints in battle window
2023-08-18 20:24:31 +02:00
Ivan Savenko
5da1a6c412
Merge branch 'android_api_version_bump' into beta
2023-08-18 15:24:59 +03:00
Ivan Savenko
70ddc1f3e5
Merge pull request #2577 from wb180/secondarySkillSerialization
...
Preserve order of secondary skills during hero json serialization/deserialization
2023-08-18 15:24:02 +03:00
Ivan Savenko
83b00bb7c3
Merge pull request #2610 from vcmi/master
...
Merge master -> beta
2023-08-18 12:56:05 +03:00
DjWarmonger
f9564dc8e4
Merge pull request #2563 from vcmi/fix_resources_near_mines
...
Fix resources placed behind mines
2023-08-18 09:12:56 +02:00
Ivan Savenko
daa8a494fc
Merge branch 'release_131' into master
2023-08-17 16:19:20 +03:00
Ivan Savenko
ec0a51bd5c
Fixed border scrolling when game window is maximized
2023-08-17 12:25:02 +03:00
Ivan Savenko
8b8d2b8810
Updated changelog
2023-08-17 10:26:01 +03:00
Ivan Savenko
6e7b7932a0
Fixed recruitment of hero from towns located on map border
2023-08-17 10:26:01 +03:00
Ivan Savenko
bfa12080ac
Added downloads counter for 1.3.1
2023-08-17 10:26:01 +03:00
Ivan Savenko
074fd42d84
Added missing includes
2023-08-17 10:26:01 +03:00
Ivan Savenko
9509974a5d
Updated changelog
2023-08-17 10:26:01 +03:00
Ivan Savenko
db81d75f75
Compile against SDK version 33
2023-08-15 18:47:42 +03:00
Ivan Savenko
198556409c
Merge pull request #2593 from IvanSavenko/hotfix
...
Final crashfixes for 1.3.1
2023-08-15 16:17:50 +03:00
Ivan Savenko
3aead5f32f
Android build ID bump
2023-08-15 15:06:33 +03:00
Ivan Savenko
8b628221ec
Fix possible thread race on accessing GuiHandler from server handler
...
thread without acquiring lock
2023-08-15 00:38:03 +03:00
Ivan Savenko
00ac8eb306
Attempt to fix crash on quitApplication on Android
2023-08-15 00:17:59 +03:00
Ivan Savenko
ef0cd0ba6e
Fixed mod dependencies check on save loading to prevent crashes:
...
- mods that don't affect game objects can be ignored when loading save
- gameplay-affecting mods that were present in save must be active
- gameplay-affecting mods that were not in save must not be active
2023-08-14 23:55:04 +03:00
Andrii Danylchenko
6c025fd768
Merge pull request #2572 from vcmi/nkai-fix-heroes-not-recruiting
...
Nkai fix heroes not recruiting
2023-08-14 21:40:53 +03:00
Evgeniy Meshcheryakov
2a83f06905
Preserve order of secondary skills during hero serialization/deserialization
2023-08-14 00:06:22 +03:00
Andrii Danylchenko
a7859dae39
Battle AI: archangels cast again
2023-08-13 09:08:30 +03:00
Andrii Danylchenko
1eabb738dc
NKAI: fix heroes not recruited
2023-08-13 09:08:30 +03:00
Ivan Savenko
abf7c48593
Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race
...
Fix crash on video playback (and who knows how many more)
2023-08-13 00:45:24 +03:00
Ivan Savenko
92ce97bbc7
Merge remote-tracking branch 'vcmi/master' into beta
2023-08-12 16:20:06 +03:00
Ivan Savenko
626664b8f6
Fix possible thread race on accessing GuiHandler from server handler
...
thread without acquiring lock
2023-08-12 14:16:47 +03:00
