1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

17735 Commits

Author SHA1 Message Date
Ivan Savenko
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
Ivan Savenko
12d618fe17
Merge pull request #4840 from GeorgeK1ng/develop
Various translation fixes
2024-10-30 14:03:07 +02:00
Ivan Savenko
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
Ivan Savenko
f12119f86c
Merge pull request #4812 from SoundSSGood/secSkillPlace
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
Ivan Savenko
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
Ivan Savenko
c1c9e2e4f0
Merge pull request #4820 from kdmcser/softDenpendency
add support for soft dependencies
2024-10-30 13:31:46 +02:00
Ivan Savenko
e1daf43fb4
Merge pull request #4843 from kdmcser/chinese
update Chinese translation
2024-10-30 13:30:56 +02:00
Ivan Savenko
ea9a59e1f6
Merge pull request #4779 from altiereslima/develop
Update Portuguese Translation
2024-10-30 13:27:15 +02:00
godric3
9e9f118b09 another attempt of using CGHeroInstance::NO_PATROLLING in map editor 2024-10-29 21:41:42 +01:00
godric3
37f7ce0ad6 improve translation for patrol radius 2024-10-29 21:22:10 +01:00
godric3
ed087b7a5b Use max ui32 value instead of -1 for NO_PATROLLING 2024-10-29 18:34:02 +01:00
kdmcser
0983a1a32f update Chinese translation 2024-10-29 22:25:56 +08:00
George King
05f2aa6af9
Update config/objects/creatureBanks.json
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-29 14:26:32 +01:00
George King
3ab5c12ac3
Fixed missing comma 2024-10-29 13:27:33 +01:00
George King
10f9ebb1e7
Fixed missing comma 2024-10-29 13:26:31 +01:00
George King
3c2096a188
Fixed Imp Chache typo
Fixed InpCache -> ImpCache
2024-10-29 09:52:51 +01:00
George King
d04eee1779
Fix for russian Imp Cahe miss-configuration 2024-10-29 09:51:51 +01:00
George King
490361fd06
Added translation for new strings 2024-10-29 09:06:37 +01:00
Andrzej Żak
42738e20a4
Update lib/mapObjects/CGHeroInstance.h
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-10-29 08:26:31 +01:00
George King
719991b33a
Fixed spacing between sentences 2024-10-29 07:47:56 +01:00
godric3
da5bae301a try to fix build, use plain -1 in place of CGHeroInstance::NO_PATROLLING 2024-10-28 22:46:48 +01:00
godric3
56efb82b2e try to fix build, separate definition of NO_PATROLLING in CGHeroInstance 2024-10-28 21:49:25 +01:00
godric3
394812c02a try to fix build, use inline constexpr 2024-10-28 20:58:36 +01:00
SoundSSGood
1fcd750774 suggested changes 2024-10-28 21:58:35 +02:00
godric3
911961da46 try to fix build 2024-10-28 19:59:03 +01:00
godric3
a9e04428c8 Possibility to set hero patrol radius in map editor 2024-10-28 18:30:30 +01:00
kdmcser
5c5bac12eb
Update lib/modding/CModHandler.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-29 00:35:32 +08:00
kdmcser
123f3923d3
Update lib/modding/ContentTypeHandler.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-10-29 00:35:03 +08:00
Ivan Savenko
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
Ivan Savenko
a97deea563
Merge pull request #4824 from IvanSavenko/translate_fix
Fixes for issues with translations
2024-10-28 12:56:50 +02:00
Ivan Savenko
db913d95e0
Merge pull request #4808 from Laserlicht/prism_breath
Bonus: prism breath
2024-10-28 12:29:41 +02:00
DjWarmonger
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
altiereslima
d557a94951 Update portuguese.json 2024-10-27 16:51:58 -03:00
altiereslima
038067f7e2 Update portuguese.json 2024-10-27 16:45:13 -03:00
Ivan Savenko
dace4075e4 Changes according to review 2024-10-27 19:37:04 +00:00
Ivan Savenko
c2e49bd10a
Merge pull request #4821 from IvanSavenko/flaggable
Basic support for configurable flaggable objects
2024-10-27 21:19:22 +02:00
Ivan Savenko
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
Ivan Savenko
10b411aa68
Update launcher/settingsView/csettingsview_moc.cpp 2024-10-27 21:17:46 +02:00
Ivan Savenko
2af4c48ab6
Merge pull request #4823 from GeorgeK1ng/develop
Fixed spacing between sentences
2024-10-27 21:16:33 +02:00
Ivan Savenko
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
Ivan Savenko
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
altiereslima
8a62d33032 Update portuguese.json 2024-10-27 11:03:00 -03:00
altiereslima
50e0893f4e Update portuguese.ts 2024-10-27 10:00:03 -03:00
altiereslima
90fd70a3ec Update portuguese.json 2024-10-27 09:59:59 -03:00
Ivan Savenko
2ca6f09621 Try to speed up msvc CI 2024-10-27 11:08:03 +00:00
Ivan Savenko
b7d4ffab79 Add support for Win7 and 32-bit msvc+vcpkg builds 2024-10-27 09:32:30 +00:00
Ivan Savenko
939e8b4105 Fix json formatting 2024-10-26 14:21:41 +00:00
Ivan Savenko
ec3acec8cc Implemented JSON5 line ending escapings 2024-10-26 14:21:23 +00:00
Ivan Savenko
72b0062ae3 Better integration of wog commanders translation 2024-10-26 14:21:05 +00:00
Ivan Savenko
d1164ab9a9 Integrated exchange window translation into vcmi 2024-10-26 13:09:09 +00:00