1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Commit Graph

18822 Commits

Author SHA1 Message Date
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
72b0062ae3 Better integration of wog commanders translation 2024-10-26 14:21:05 +00:00
d1164ab9a9 Integrated exchange window translation into vcmi 2024-10-26 13:09:09 +00:00
87d841db83 Moved translatable strings to VCMI mod, spaces -> tabs 2024-10-26 12:55:10 +00:00
565c02d61c Added 'translate missing' command for convenience 2024-10-26 12:54:35 +00:00
7e66bd4a90 Don't use separate versioning for map editor 2024-10-26 13:48:12 +02:00
e5739e49da Fix translation of bank names 2024-10-26 11:39:06 +00:00
3b72594743 add support for soft dependencies 2024-10-26 19:15:12 +08:00
152962354d Don't paste objects that cannot be placed, show warning only if error occurred 2024-10-26 12:20:13 +02:00
1246333350 Initialize town's possibleSpells only if hasn't been initialized already(for example when copying existing town) 2024-10-26 12:15:40 +02:00
638bc174c3 Fix crash on exporting maps for translation 2024-10-25 21:41:24 +00:00
c43844706e Implemented translation support for random map descriptions 2024-10-25 20:41:19 +00:00
c927324b19 Fixed spacing between sentences 2024-10-25 22:13:28 +02:00
26fecbf2ca Simplify income calculation in kingdom overview, account for flaggables 2024-10-25 19:08:13 +00:00
7ae5e2b406 Added support for daily income to flaggable objects 2024-10-25 19:01:00 +00:00
93096dc63c Updated documentation 2024-10-25 18:47:19 +00:00
ee59bc4e71 Add bonus description generation for map objects 2024-10-25 18:36:02 +00:00
2480c4eae7 Minor update 2024-10-25 09:58:57 -07:00
8a5ac73438 Basic support for configurable flaggable objects
Converted CGLighthouse class into FlaggableMapObject

Bonus provided by Lighthouse/Flaggable is now defined in config and is
accessible to mods.
2024-10-25 16:48:10 +00:00
9bc84b606e Cleanup 2024-10-24 19:28:21 -07:00
3690e05e40 Draft to hide scaling dropdown as needed 2024-10-24 18:54:39 -07:00