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

12314 Commits

Author SHA1 Message Date
Ivan Savenko
6ac0dabcab First part of documentation import 2023-09-07 11:02:39 +03:00
Ivan Savenko
211bcb6e82
Merge pull request #2720 from SoundSSGood/backpack-variable-cap
Support for different backpack window capacities
2023-09-05 13:40:39 +03:00
Nordsoft91
a0fead361b
Merge pull request #2750 from Nordsoft91/editor-improvements 2023-09-05 12:28:41 +04:00
SoundSSGood
a7cedea73c Support for different backpack capacities 2023-09-04 20:59:24 +03:00
nordsoft
32eba61af4 Fix compliling 2023-09-04 13:14:11 +04:00
nordsoft
8b91a1315c Fix compiling 2023-09-04 03:37:55 +04:00
nordsoft
db32c2387e Fix hero initialization form random map 2023-09-04 02:58:16 +04:00
nordsoft
d113168db4 Fix neutral objects serializing 2023-09-04 01:42:51 +04:00
nordsoft
385202a02a Fix abandoned map crash 2023-09-04 01:42:51 +04:00
Ivan Savenko
9d4d2e0bae
Merge pull request #2717 from rilian-la-te/fix-unit-effect-immune
Teleport: check immunities in applicable()
2023-09-01 22:37:28 +03:00
Konstantin
e554a2766d BattleActions: do not pass unnecessary targetStack
It was unused for everything except teleport, so pass it only wher we
attempt to teleport.

Reworking sacrifice is out of scope from beta
2023-08-31 23:44:00 +03:00
Konstantin P
08967efd91 Teleport: check immunities in applicable()
Attempt to fix #2677
2023-08-31 19:58:46 +03:00
Ivan Savenko
7255dda624
Merge pull request #2629 from dydzio0614/neutral-creature-popup
Improve neutral creature adventure map popup
2023-08-31 15:44:19 +03:00
Ivan Savenko
3ce99e8613
Merge pull request #2710 from dydzio0614/artifacts-backpack-graphics
Split artifacts bag button background and icon
2023-08-31 15:42:50 +03:00
Ivan Savenko
4b29edc7c4
Merge pull request #2707 from dydzio0614/commander-abilities-fix
Commander abilities UI fix
2023-08-30 11:50:27 +03:00
Dydzio
e1e41d1107 Implement TOPCENTER text alignment 2023-08-30 00:35:31 +02:00
Dydzio
03ef5b6b0f Split artifacts bag button background and icon 2023-08-29 18:53:50 +02:00
Dydzio
bafe8baa15 Fix "ghost" icons in commander grandmaster abilities list 2023-08-29 00:20:44 +02:00
Dydzio
2769782d0a Fix broken grandmaster ability description updating on select/deselect 2023-08-28 23:49:07 +02:00
Dydzio
dacf6c9d08 Add border around selected commander "grandmaster ability" on levelup 2023-08-28 23:36:45 +02:00
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
ed12f20609 Improve neutral creature adventure map popup 2023-08-21 14:42:41 +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