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

17615 Commits

Author SHA1 Message Date
Ivan Savenko
dc45d82558
Merge pull request #4665 from SoundSSGood/quickbackpack-shift+click
QuickBackpack window is now accessible by shift-clicking
2024-09-27 18:49:23 +03:00
Ivan Savenko
4b6f8293c2
Merge branch 'develop' into chinese 2024-09-27 18:48:52 +03:00
Ivan Savenko
c6a13207fa
Merge pull request #4673 from XCOM-HUB/patch-2
Update swedish.ts
2024-09-27 18:47:13 +03:00
Ivan Savenko
f2c20b54d0 Unify rewardable map object and town building code 2024-09-27 15:41:24 +00:00
Ivan Savenko
072aa8aadd Remove unused method 2024-09-27 15:41:24 +00:00
Ivan Savenko
bee2e7200c
Merge pull request #4664 from IvanSavenko/ttf_fonts
Integrate true type fonts into VCMI
2024-09-27 18:41:02 +03:00
Ivan Savenko
ff50536568 Fix positioning of stack amount text 2024-09-27 12:05:26 +00:00
Maurycy
73ed29f7ed
Update swedish.ts
Made further improvements.

PS: Only changed the translation this time. Did not change the source.
2024-09-25 19:55:56 +02:00
Xilmi
e4ef95f8dd Revert dynamic maxWillingToLose
Out maxWillingToLose back to a static 25%.
Dynamic could become too suicidal or too passive. 25% is a good sweetspot.
2024-09-25 16:12:53 +02:00
Xilmi
1d831022e8 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-25 14:08:34 +02:00
Laserlicht
2d60252e4c read from mapheader; move chr to subfolder 2024-09-24 21:41:37 +02:00
kdmcser
ceb2426c30 do lupdate and update Chinese tranlation 2024-09-24 22:08:31 +08:00
kdmcser
d16090be0b update Chinese translation 2024-09-24 21:47:12 +08:00
Ivan Savenko
b624069f86 Fix CI 2024-09-24 13:40:15 +00:00
SoundSSGood
f0a5bcfebb Quick backpack window on shift+click 2024-09-24 16:35:28 +03:00
Ivan Savenko
88f3e982e0
Merge pull request #4662 from Laserlicht/string_color
fixes string colorization bug
2024-09-24 16:29:41 +03:00
Ivan Savenko
ca3c6227c4 Add selector for font type in Launcher, add autoselection 2024-09-24 13:25:36 +00:00
Ivan Savenko
5d47a0cd06
Merge pull request #4645 from altiereslima/develop
Update Portuguese Translation
2024-09-24 16:23:52 +03:00
Ivan Savenko
87274128e7 Proper support for usage of multiple fonts in a chain 2024-09-24 10:59:35 +00:00
Laserlicht
138cbc6a81 scenario name for campaigns 2024-09-24 11:23:10 +02:00
SoundSSGood
586a32a616 CArtifactSet cleanup 2024-09-23 23:39:19 +03:00
SoundSSGood
b9ae7f1138 CMap put move and remove artifact method 2024-09-23 23:30:38 +03:00
Laserlicht
bee5cd00cc also for color 2024-09-23 21:11:53 +02:00
Laserlicht
03d03491b5 fixes string colorisation bug 2024-09-23 21:07:00 +02:00
altiereslima
7459e0f37e Update portuguese.json 2024-09-23 15:45:24 -03:00
Tomasz Zieliński
a4392fce36 Allow mod name in camelCase 2024-09-23 20:34:26 +02:00
Ivan Savenko
557b72f2b3 Launcher now controls ttf fonts usage directly instead of toggling mod
from extras
2024-09-23 18:31:44 +00:00
altiereslima
7808522170 Update portuguese.json 2024-09-23 15:28:42 -03:00
altiereslima
21ccf7ce1c
Update Mods/vcmi/config/vcmi/portuguese.json
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-09-23 15:26:57 -03:00
Ivan Savenko
97e24ff126 Integrated Noto fonts into vcmi 2024-09-23 18:15:30 +00:00
Xilmi
433c58f8b1 Workaround for previously masked issue
A recent fix made it so that towns that weren't supposed to be defended are now no longer defended.
This caused scouts with minimal army to also go after them in addition to the main-hero.
Problem is when two heroes go for the same town it's a massive waste of movement-points. So for the time being only main-heroes will go for faraway captures.
Better solution would be to memorize who was sent to attack what on the same turn and filter out tasks going for the same target.
2024-09-23 18:42:31 +02:00
Xilmi
d87f195bc7 Update AINodeStorage.cpp
Nodes along the path are now also considered for how dangerous it is.
2024-09-23 18:39:18 +02:00
Ivan Savenko
5502dcaea4 Remove no longer used support for original version of Chinese fonts 2024-09-23 15:46:12 +00:00
Ivan Savenko
248cff49a4 Moved fonts handling from Graphics to RenderHandler class 2024-09-23 15:43:11 +00:00
Xilmi
71504a3140 Hire despite hero present
Only if both the garrison and the outside of a town are blocked are hires of heros being blocked.
2024-09-23 17:25:17 +02:00
Tomasz Zieliński
54ba4d50d6 Allow to ban spell scrolls 2024-09-23 17:09:46 +02:00
Ivan Savenko
92c5fd4156
Merge pull request #4655 from IvanSavenko/bugfixing
Bugfixing
2024-09-23 18:01:27 +03:00
Dydzio
711b0e70d9 Handle new config entry in gamesettings schema 2024-09-23 17:00:08 +02:00
Dydzio
230893f423 Merge branch 'develop' into any-hex-shooting 2024-09-23 16:57:27 +02:00
Ivan Savenko
bb74ffa382
Merge pull request #4640 from godric3/map-editor-fix-quest-editor-lists
Add all artifacts/spells/skills to quest widget lists and disable banned
2024-09-23 17:37:15 +03:00
Ivan Savenko
f1c39a1aa3
Merge pull request #4652 from Fabrice-TIERCELIN/translated_caption
Fix one caption in the source code
2024-09-23 17:29:39 +03:00
Ivan Savenko
dbfa5b8b2d
Merge pull request #4637 from IvanSavenko/validate_gamesettings
Added validation of game settings
2024-09-23 17:28:37 +03:00
Ivan Savenko
1fb108b79d
Merge pull request #4636 from IvanSavenko/bank_compat
Compatibility hack for mods with old banks format
2024-09-23 17:28:20 +03:00
Ivan Savenko
e93a060500 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-09-23 14:25:53 +00:00
Ivan Savenko
a5de312344 Add workaround for SDL bug - use old code for buggy SDL versions 2024-09-23 14:02:55 +00:00
Ivan Savenko
a7cdeb723e Fix blocking dialog handling in refusable rewardable town building 2024-09-23 13:00:02 +00:00
Xilmi
20f7751e16 Weekend-decisions
When attacking non-neutral towns that are far away, the AI now considers whether their attack would arrive in the same week. If it wouldn't, it means there's a high risk that newly bought troops might flip around who is stronger. So they now refrain from sending a hero towards an enemy town that is too far away.
2024-09-23 01:25:58 +02:00
Xilmi
e7e4d6cc72 Fix invincible Hellbardiers 2024-09-23 01:23:18 +02:00
Xilmi
9ef2c6f8a0 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-22 23:43:29 +02:00
Ivan Savenko
3319be114f Fix line break position computation for text without spaces (Chinese) 2024-09-22 20:33:14 +00:00