Ivan Savenko
c3b63a1bef
Merge pull request #4857 from Laserlicht/delete
...
Delete saves / random maps
2024-11-16 17:28:23 +02:00
Laserlicht
b23c69b9d6
code review
2024-11-15 20:26:56 +01:00
Laserlicht
149c6cd778
code review
2024-11-15 19:09:34 +01:00
Ivan Savenko
1a038b26ed
Merge pull request #4910 from Laserlicht/picture_regression
...
fix picture (regression)
2024-11-15 19:17:52 +02:00
Ivan Savenko
90304e5c8a
Merge pull request #4900 from Laserlicht/chronicles_menu
...
Chronicles menu
2024-11-15 19:15:28 +02:00
Ivan Savenko
df0c53af41
Merge pull request #4864 from Laserlicht/creature_window_rework
...
Creature window rework
2024-11-15 19:13:58 +02:00
Laserlicht
ac12574f61
fix picture (regression)
2024-11-15 03:25:16 +01:00
Laserlicht
0f94f35dcf
code review
2024-11-14 00:34:39 +01:00
Laserlicht
a6c985c4f5
code review
2024-11-13 23:10:41 +01:00
Laserlicht
6199a13603
code review
2024-11-13 20:20:16 +01:00
Laserlicht
e73cb7f45b
Update client/windows/CCreatureWindow.cpp
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-11-13 20:03:20 +01:00
Ivan Savenko
7be44278d7
Merge pull request #4892 from SoundSSGood/artifact-related-fixes
...
Artifact related fixes
2024-11-13 20:58:37 +02:00
Ivan Savenko
46e492be01
Merge pull request #4891 from kdmcser/fix_research_spell_crash
...
fix spell research crash when no more spells can be researched
2024-11-13 20:50:24 +02:00
Ivan Savenko
1d0fdb1c0e
Merge pull request #4867 from Laserlicht/notFocusedClick
...
notFocusedClick refactoring
2024-11-13 20:49:31 +02:00
SoundSSGood
27b59dd7ee
crash fixed
2024-11-13 06:39:37 +02:00
Laserlicht
719859cc62
optimize
2024-11-12 00:12:56 +01:00
Laserlicht
33220b2eb3
check if used in mainmenu
2024-11-11 23:52:35 +01:00
Laserlicht
6b33f4d969
skip campaigns from set
2024-11-11 22:44:48 +01:00
Laserlicht
9c55ebf2dd
chronicles campaign screen
2024-11-11 22:25:54 +01:00
kdmcser
51e742f475
Merge branch 'develop' into fix_research_spell_crash
2024-11-10 23:32:33 +08:00
kdmcser
2621d4f5bf
fix spell research crash when no more spells can be researched due to map limit
2024-11-10 23:02:36 +08:00
SoundSSGood
ef46a87e69
ask assemble artifact dialog fix
2024-11-10 16:50:58 +02:00
Laserlicht
23709ab217
support loading layer images
2024-11-09 21:04:20 +01:00
Laserlicht
3872a3ea89
fix fallback scaling
2024-11-09 17:58:23 +01:00
Laserlicht
35e198078b
cleanup logic
2024-11-09 14:02:09 +01:00
Laserlicht
ac31a946e6
use path instead of different filename
2024-11-09 13:07:15 +01:00
Laserlicht
1f7cec3ae3
missing prescalefactor
2024-11-08 00:09:17 +01:00
Xilmi
a70f5de8c6
Merge remote-tracking branch 'upstream/develop' into develop
2024-11-07 14:35:13 +01:00
Laserlicht
bcdef11093
rename variable
2024-11-07 02:32:06 +01:00
Laserlicht
0e5711f8bf
Merge branch 'develop' into delete
2024-11-06 23:28:57 +01:00
Ivan Savenko
e9690c8c54
Merge branch 'develop' into autosave_name
2024-11-06 22:06:12 +02:00
Ivan Savenko
2fed53d933
Merge pull request #4865 from Laserlicht/touch_scroll_popup
...
allow scrolling in touch popups
2024-11-06 22:03:18 +02:00
Ivan Savenko
da8fe13632
Merge pull request #4870 from SoundSSGood/secSkillPlace-fix
...
CHeroOverview secondary skill icons fixed
2024-11-06 22:02:28 +02:00
Ivan Savenko
92fc66d1c2
Merge pull request #4875 from Laserlicht/patch-3
...
8th creature fix
2024-11-06 22:02:06 +02:00
Ivan Savenko
e7bea6c3b8
Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization
...
Remove remaining pointers to VLC entities from serializer
2024-11-06 22:01:11 +02:00
Ivan Savenko
11d9ee310e
Merge pull request #4785 from Laserlicht/subtitles
...
Subtitles for videos / sync
2024-11-06 21:56:43 +02:00
Laserlicht
7c3afde7ee
fix
2024-11-05 23:12:02 +01:00
SoundSSGood
fa9201831b
QuickBackpack window position on shift+click slot fixed
2024-11-04 14:16:06 +02:00
Laserlicht
7a52d1d533
8th creature fix
2024-11-03 22:51:48 +01:00
Laserlicht
52aa4aeb82
fix for not loaded images
2024-11-03 22:17:29 +01:00
Laserlicht
11b437db62
prescaled image support
2024-11-03 20:27:11 +01:00
SoundSSGood
f60813d86f
CHeroOverview secondary skill icons fixed
2024-11-03 17:29:27 +02:00
Laserlicht
ca037aae33
notFocusedClick refactoring
2024-11-03 01:13:14 +01:00
Laserlicht
1367348da9
allow scrolling in touch popups
2024-11-02 19:15:49 +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
Laserlicht
b06efa2d13
delete folder
2024-11-01 01:16:01 +01:00
Laserlicht
164aac4db2
refresh list
2024-11-01 00:52:19 +01:00
Laserlicht
38c25cd13e
Delete UI
2024-11-01 00:11:55 +01:00
Laserlicht
1f0847660b
possibility to delete unsupported saves
2024-10-31 21:57:20 +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
Xilmi
63097968d3
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-31 12:29:37 +01:00
Laserlicht
452762cd78
change datetime format
2024-10-30 23:23:56 +01:00
Laserlicht
cb91397688
fix pos
2024-10-30 21:50:03 +01:00
Laserlicht
1423951b9e
disable selection by empty slot
2024-10-30 21:36:37 +01:00
Laserlicht
a54f4e1bd1
change autosave folder name; align autosave folder
2024-10-30 21:18:55 +01: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
d3af9f1c67
Removed pointer to VLC entity from CStackBasicDescriptor
2024-10-30 16:47:02 +00:00
Ivan Savenko
c98ac01e7a
Replaced public artType member of ArtifactInstance with getter
2024-10-30 16:47:01 +00:00
Ivan Savenko
04ca8aca9f
Update tests
2024-10-30 16:22:12 +00:00
Ivan Savenko
08fbcd5239
TerrainTile now uses identifiers instead of pointers to VLC
2024-10-30 16:22:11 +00: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
Laserlicht
bb73a35412
code review + pause handling
2024-10-30 00:35:50 +01: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
Xilmi
ffd8758017
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-28 17:49:08 +01: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
Xilmi
cf8888987d
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-27 10:03:26 +01: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
Xilmi
5d6877e06d
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-20 00:49:17 +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
a68522b370
fix
2024-10-18 14:37:18 +02:00
Laserlicht
0f41361873
fix edge case
2024-10-18 14:33:29 +02:00
