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

18592 Commits

Author SHA1 Message Date
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
ffd8758017 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-28 17:49:08 +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
10b411aa68 Update launcher/settingsView/csettingsview_moc.cpp 2024-10-27 21:17:46 +02:00
2af4c48ab6 Merge pull request #4823 from GeorgeK1ng/develop
Fixed spacing between sentences
2024-10-27 21:16:33 +02:00
2fa0021c28 Merge pull request #4825 from godric3/map-editor-fix-copying-town
Map editor: fix duplicated spells in copy-pasted town
2024-10-27 21:16:23 +02:00
3a4ed1e351 Merge pull request #4826 from godric3/map-editor-use-vcmi-versioning
Don't use separate versioning for map editor
2024-10-27 21:16:08 +02:00
8a62d33032 Update portuguese.json 2024-10-27 11:03:00 -03:00
50e0893f4e Update portuguese.ts 2024-10-27 10:00:03 -03:00
90fd70a3ec Update portuguese.json 2024-10-27 09:59:59 -03:00
2ca6f09621 Try to speed up msvc CI 2024-10-27 11:08:03 +00:00
b7d4ffab79 Add support for Win7 and 32-bit msvc+vcpkg builds 2024-10-27 09:32:30 +00:00
cf8888987d Merge remote-tracking branch 'upstream/develop' into develop 2024-10-27 10:03:26 +01:00
939e8b4105 Fix json formatting 2024-10-26 14:21:41 +00:00
ec3acec8cc Implemented JSON5 line ending escapings 2024-10-26 14:21:23 +00:00