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

17981 Commits

Author SHA1 Message Date
Xilmi
63097968d3 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-31 12:29:37 +01:00
Xilmi
5979f53a26 Upgrade priority
New priority to upgrade existing armies to make it less likely to fight the AI with only part of its army.
2024-10-31 00:42:33 +01:00
Xilmi
9d2fc1b1c9 Update DefenceBehavior.cpp
Fixed an issue that caused the AI to try buying the same hero in two different towns.
2024-10-31 00:41:51 +01:00
Ivan Savenko
09e2d1a59a
Merge pull request #4842 from Olegmods/develop
Fixed some configs
2024-10-30 21:24:05 +02:00
Ivan Savenko
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
Ivan Savenko
dc2f8d52ee Added all 1.6 changes so far to ChangeLog.md 2024-10-30 13:28:34 +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
Olegmods
12e78cc0e0
Elixir of Life fix 2024-10-29 16:41:43 +03:00
Olegmods
b40a1a57e5
Update dungeon.json 2024-10-29 16:35:26 +03:00
Olegmods
b4367dd432
Mutare fix 2024-10-29 16:34:53 +03: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
Olegmods
e7204447a9
Update fortress.json 2024-10-29 15:46:46 +03: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
Xilmi
ffd8758017 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-28 17:49:08 +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