Laserlicht
e73cb7f45b
Update client/windows/CCreatureWindow.cpp
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-11-13 20:03:20 +01:00
Laserlicht
988d36bd13
sorted
2024-11-02 15:46:20 +01:00
Laserlicht
74b4fbfceb
small fix
2024-11-02 15:19:39 +01:00
Laserlicht
0ab4b66026
better approach for scrollbar
2024-11-02 15:16:38 +01:00
Laserlicht
9009dffebd
add "other" for bonus display
2024-11-02 14:51:33 +01:00
Laserlicht
17ee363d8d
changed bonus source text pos
2024-11-02 14:37:21 +01:00
Laserlicht
5a72a65b31
add labels
2024-11-02 13:59:09 +01:00
Laserlicht
440e9a6575
assign colors for bonuses
2024-11-02 13:05:10 +01:00
Laserlicht
3038e5140a
add color frames; remove scrollbar
2024-11-01 19:02:51 +01:00
Ivan Savenko
0969871835
Merge branch 'develop' into mechanical_bonus
2024-10-31 15:14:51 +02:00
Ivan Savenko
e714a02063
Merge pull request #4849 from IvanSavenko/map_encoding
...
Better handling of encoding detection for maps and campaigns
2024-10-31 15:07:36 +02:00
kodobi
2678665f67
Resolve merge conflict
2024-10-30 18:48:09 +01:00
kodobi
44f479be89
Merge branch 'vcmi:develop' into bugfix/fix-ballista-damage-range-display
2024-10-30 18:41:29 +01:00
kodobi
0a0692061d
Merge branch 'bugfix/fix-ballista-damage-range-display' of https://github.com/kodobi/vcmi into bugfix/fix-ballista-damage-range-display
2024-10-30 18:39:11 +01:00
kodobi
b82444ba43
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.
2024-10-30 18:35:35 +01: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
22f517686d
Better handling of encoding detection for maps and campaigns
...
Now VCMI will use either preferred language or install language to load
maps and campaigns that are part of "core" mod, or, in other words -
placed in Maps directory of H3 data (like most of manually downloaded
maps and campaigns are)
If game data is in English, then game can safely use encoding of player-
selected language (such as Chinese) to load maps. After all, both GBK
and all Win-125X encoding are superset of ASCII, so English map will
always load up correctly.
Maps that are part of a mod still use mod language as before - it is up
to mod maker to correctly set up mod language.
2024-10-30 11:54:35 +00:00
Ivan Savenko
f12119f86c
Merge pull request #4812 from SoundSSGood/secSkillPlace
...
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
kodobi
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
SoundSSGood
1fcd750774
suggested changes
2024-10-28 21:58:35 +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
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
Ivan Savenko
565c02d61c
Added 'translate missing' command for convenience
2024-10-26 12:54:35 +00:00
Ivan Savenko
638bc174c3
Fix crash on exporting maps for translation
2024-10-25 21:41:24 +00:00
Ivan Savenko
26fecbf2ca
Simplify income calculation in kingdom overview, account for flaggables
2024-10-25 19:08:13 +00:00
Ivan Savenko
ee59bc4e71
Add bonus description generation for map objects
2024-10-25 18:36:02 +00:00
Laserlicht
53b7c5da6f
added MECHANICAL bonus
2024-10-24 21:30:51 +02:00
Ivan Savenko
1826b5bbdf
Merge pull request #4802 from Laserlicht/crash_fix
...
fix crash & shortcut & layout
2024-10-23 22:23:33 +03:00
SoundSSGood
83279211e6
CSecSkillPlace done
2024-10-23 15:01:56 +03:00
SoundSSGood
03b4733c64
CSecSkillPlace
2024-10-22 01:54:04 +03:00
SoundSSGood
7955960901
CTradeableItem refactoring
2024-10-22 01:54:00 +03:00
SoundSSGood
573bb6abc6
CArtPlace now works with artifact ID
2024-10-20 12:56:54 +03:00
Laserlicht
185d036d78
no scrollbar for hotseat title (with ttf fonts)
2024-10-20 03:16:57 +02:00
Laserlicht
98b912dab8
optimize layout
2024-10-20 02:26:40 +02:00
Laserlicht
94606ba5a3
campaign map description size
2024-10-20 02:13:50 +02:00
Laserlicht
2ea2a3150e
fix shortcuts with Modifier Key
2024-10-19 15:59:02 +02:00
Laserlicht
1df1177506
fix for defect mp3
2024-10-19 13:45:20 +02:00
Laserlicht
59dae43a74
fix remembering last map
2024-10-17 02:12:41 +02:00
Ivan Savenko
c25aef8f48
Merge pull request #4766 from SoundSSGood/fused-artifacts
...
Fused artifacts
2024-10-16 15:08:20 +03:00
Ivan Savenko
52e0899d6f
Merge pull request #4780 from Laserlicht/text_pos_fix
...
fix: campaign video scrolling for short texts
2024-10-15 18:01:52 +03:00
Ivan Savenko
c4e708831c
Merge pull request #4777 from Laserlicht/backround_voice
...
fix: lower background music while campaign audio plays
2024-10-15 18:01:17 +03:00
Ivan Savenko
da0ec2c607
Merge pull request #4776 from Laserlicht/audio_playback
...
fix: audio playback after using Back button
2024-10-15 18:00:44 +03:00
SoundSSGood
86d5c05ffa
Fused identical artifacts
2024-10-15 16:51:29 +03:00
Laserlicht
d65938fa17
fix campaign video scrolling for short texts
2024-10-14 23:26:24 +02:00
Laserlicht
cb6fa74cc4
lower background music while campaign audio plays
2024-10-14 21:02:49 +02:00
Ivan Savenko
94a0de716a
Merge pull request #4772 from Laserlicht/mixer_audio_duration
...
fix: use sdl mixer to get audio duration
2024-10-14 21:51:49 +03:00
Laserlicht
b2da317906
fixes audio playback after using Back button
2024-10-14 20:26:31 +02:00
Laserlicht
9ed4dbaeb4
Merge remote-tracking branch 'upstream/develop' into adv_search
2024-10-14 19:52:55 +02:00
Laserlicht
3f59942b04
code review
2024-10-14 19:28:38 +02:00
