1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-08 22:26:51 +02:00
Commit Graph

17955 Commits

Author SHA1 Message Date
c98ac01e7a Replaced public artType member of ArtifactInstance with getter 2024-10-30 16:47:01 +00:00
04ca8aca9f Update tests 2024-10-30 16:22:12 +00:00
08fbcd5239 TerrainTile now uses identifiers instead of pointers to VLC 2024-10-30 16:22:11 +00:00
7a9875f77b Use msvc build for daily Windows builds 2024-10-30 14:39:56 +00:00
a518b76c79 Merge pull request #4836 from IvanSavenko/changelog_october
Added all 1.6 changes so far to ChangeLog.md
2024-10-30 15:29:09 +02:00
dc2f8d52ee Added all 1.6 changes so far to ChangeLog.md 2024-10-30 13:28:34 +00:00
dd7d190a58 Implemented optional descriptions for market map objects
It is now possible to define description of an object with 'market'
handler that will be shown on right-clicking the object.

Similarly, added description to right-click popup to Hill Fort.
2024-10-30 13:20:21 +00:00
12d618fe17 Merge pull request #4840 from GeorgeK1ng/develop
Various translation fixes
2024-10-30 14:03:07 +02:00
f8b1f40abb Merge pull request #4348 from MichalZr6/hill_fort_changes
Hill Fort unavailable upgrade and status bar new messages
2024-10-30 14:00:35 +02:00
22f517686d Better handling of encoding detection for maps and campaigns
Now VCMI will use either preferred language or install language to load
maps and campaigns that are part of "core" mod, or, in other words -
placed in Maps directory of H3 data (like most of manually downloaded
maps and campaigns are)

If game data is in English, then game can safely use encoding of player-
selected language (such as Chinese) to load maps. After all, both GBK
and all Win-125X encoding are superset of ASCII, so English map will
always load up correctly.

Maps that are part of a mod still use mod language as before - it is up
to mod maker to correctly set up mod language.
2024-10-30 11:54:35 +00:00
f12119f86c Merge pull request #4812 from SoundSSGood/secSkillPlace
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
88a9890b56 Merge pull request #4837 from godric3/map-editor-set-hero-patrol-radius
Possibility to set hero patrol radius in map editor
2024-10-30 13:32:25 +02:00
c1c9e2e4f0 Merge pull request #4820 from kdmcser/softDenpendency
add support for soft dependencies
2024-10-30 13:31:46 +02:00
e1daf43fb4 Merge pull request #4843 from kdmcser/chinese
update Chinese translation
2024-10-30 13:30:56 +02:00
ea9a59e1f6 Merge pull request #4779 from altiereslima/develop
Update Portuguese Translation
2024-10-30 13:27:15 +02:00
bb73a35412 code review + pause handling 2024-10-30 00:35:50 +01:00
9e9f118b09 another attempt of using CGHeroInstance::NO_PATROLLING in map editor 2024-10-29 21:41:42 +01:00
37f7ce0ad6 improve translation for patrol radius 2024-10-29 21:22:10 +01:00
389f8b678b Fix ballista damage range display
- Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3.
- Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.
- Correctly retrieve the ballista status from the hero's war machine slot.
2024-10-29 20:44:31 +01:00
ed087b7a5b Use max ui32 value instead of -1 for NO_PATROLLING 2024-10-29 18:34:02 +01:00
0983a1a32f update Chinese translation 2024-10-29 22:25:56 +08:00
12e78cc0e0 Elixir of Life fix 2024-10-29 16:41:43 +03:00
b40a1a57e5 Update dungeon.json 2024-10-29 16:35:26 +03:00
b4367dd432 Mutare fix 2024-10-29 16:34:53 +03:00
05f2aa6af9 Update config/objects/creatureBanks.json
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-29 14:26:32 +01:00
e7204447a9 Update fortress.json 2024-10-29 15:46:46 +03:00
3ab5c12ac3 Fixed missing comma 2024-10-29 13:27:33 +01:00
10f9ebb1e7 Fixed missing comma 2024-10-29 13:26:31 +01:00
3c2096a188 Fixed Imp Chache typo
Fixed InpCache -> ImpCache
2024-10-29 09:52:51 +01:00
d04eee1779 Fix for russian Imp Cahe miss-configuration 2024-10-29 09:51:51 +01:00
490361fd06 Added translation for new strings 2024-10-29 09:06:37 +01:00
42738e20a4 Update lib/mapObjects/CGHeroInstance.h
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-10-29 08:26:31 +01:00
719991b33a Fixed spacing between sentences 2024-10-29 07:47:56 +01:00
da5bae301a try to fix build, use plain -1 in place of CGHeroInstance::NO_PATROLLING 2024-10-28 22:46:48 +01:00
56efb82b2e try to fix build, separate definition of NO_PATROLLING in CGHeroInstance 2024-10-28 21:49:25 +01:00
394812c02a try to fix build, use inline constexpr 2024-10-28 20:58:36 +01:00
1fcd750774 suggested changes 2024-10-28 21:58:35 +02:00
911961da46 try to fix build 2024-10-28 19:59:03 +01:00
a9e04428c8 Possibility to set hero patrol radius in map editor 2024-10-28 18:30:30 +01:00
5c5bac12eb Update lib/modding/CModHandler.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-29 00:35:32 +08:00
123f3923d3 Update lib/modding/ContentTypeHandler.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-29 00:35:03 +08:00
3a45e6dae1 Merge pull request #4829 from IvanSavenko/msvc_package
Add support for Win7 and 32-bit msvc+vcpkg builds
2024-10-28 13:04:45 +02:00
a97deea563 Merge pull request #4824 from IvanSavenko/translate_fix
Fixes for issues with translations
2024-10-28 12:56:50 +02:00
db913d95e0 Merge pull request #4808 from Laserlicht/prism_breath
Bonus: prism breath
2024-10-28 12:29:41 +02:00
59a15c5ff0 Merge pull request #4790 from kodobi/bugfix/fix-incorrect-battlefield-while-attacking-town-without-fort
Fix battle setup for sieges without forts
2024-10-28 08:38:14 +01:00
d557a94951 Update portuguese.json 2024-10-27 16:51:58 -03:00
038067f7e2 Update portuguese.json 2024-10-27 16:45:13 -03:00
dace4075e4 Changes according to review 2024-10-27 19:37:04 +00:00
c2e49bd10a Merge pull request #4821 from IvanSavenko/flaggable
Basic support for configurable flaggable objects
2024-10-27 21:19:22 +02:00
7132ee560d Merge pull request #4822 from mikeiit/fix_launcher_automatic_scaling
Hide launcher interface scaling spin box
2024-10-27 21:18:44 +02:00