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
Laserlicht
f0b7d007a0
video: use global timer; implement frameskip
2024-10-18 10:36:52 +02:00
Laserlicht
59dae43a74
fix remembering last map
2024-10-17 02:12:41 +02:00
Laserlicht
8b427c3989
use json format
2024-10-16 22:47:38 +02:00
Ivan Savenko
c25aef8f48
Merge pull request #4766 from SoundSSGood/fused-artifacts
...
Fused artifacts
2024-10-16 15:08:20 +03:00
Laserlicht
54542c54b3
working subtitles
2024-10-16 03:48:14 +02:00
Laserlicht
4d46a2084d
basic subtitle rendering
2024-10-16 02:36:26 +02: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
Ivan Savenko
604e3b5c67
Merge pull request #4763 from IvanSavenko/herohandler_split
...
Split CHeroHandler.cpp/.h into 1 file per class
2024-10-14 19:05:48 +03:00
Ivan Savenko
cee3521f57
Merge pull request #4770 from IvanSavenko/prison_fix
...
Fix for loading hero types / identities
2024-10-14 18:16:53 +03:00
Ivan Savenko
678e6b47f8
Merge pull request #4756 from IvanSavenko/sonar_fixes
...
Fix some of the new warnings from sonarcloud
2024-10-14 18:16:41 +03:00
Laserlicht
d43997f5ba
use sdl mixer to get audio duration
2024-10-13 21:08:43 +02:00
Ivan Savenko
10ad0fc760
Split CHeroHandler.cpp/.h into 1 file per class
...
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
2024-10-13 14:01:09 +00:00
Ivan Savenko
184d8de82e
Fix typo in assertion
2024-10-13 13:06:07 +00:00
Laserlicht
f7e3641c04
fix shortcut bug; add center of selected item
2024-10-12 23:21:26 +02:00
Laserlicht
11eaed9fef
code review
2024-10-12 23:01:14 +02:00
SoundSSGood
d4d3ddf685
fused artifacts
2024-10-12 16:43:04 +03:00
Xilmi
533806df6d
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-11 19:07:56 +02:00
Ivan Savenko
a8e84c55f6
Fix some of the new warnings from sonarcloud
2024-10-11 10:45:29 +00:00
Ivan Savenko
e0e01d678a
Merge pull request #4753 from IvanSavenko/misc_fixes
...
Fixes for regressions from recent PR's
2024-10-11 00:32:45 +03:00
Ivan Savenko
dfff1eae26
Fix crash on losing a hero
2024-10-10 21:16:41 +00:00
Xilmi
856e1f0ef8
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-10 22:51:25 +02:00
Laserlicht
f3a6d4a93f
copy name after init
2024-10-10 22:01:25 +02:00
Xilmi
6adaffa2c2
Update SelectionTab.cpp
...
Fix for save-game-list having no names.
2024-10-10 18:52:25 +02:00
Ivan Savenko
341ef633a5
Fixes missing names of saves and custom campaigns
2024-10-10 16:05:50 +00:00
Ivan Savenko
3dd4fa2528
Reduce usage of pointers to VLC entities
...
Final goal (of multiple PR's) is to remove all remaining pointers from
serializeable game state, and replace them with either identifiers or
with shared/unique pointers.
CGTownInstance::town and CGHeroInstance::type members have been removed.
Now this data is computed dynamically using subID member.
VLC entity of a town can now be accessed via following methods:
- getFactionID() returns ID of a faction
- getFaction() returns pointer to a faction
- getTown() returns pointer to a town
VLC entity of a hero can now be accessed via following methods:
- getHeroTypeID() returns ID of a hero
- getHeroClassID() returns ID of a hero class
- getHeroType() returns pointer to a hero
- getHeroClass() returns pointer to a hero class
2024-10-10 12:28:08 +00:00
Ivan Savenko
81f0222c68
Merge pull request #4741 from IvanSavenko/serialize_local_state
...
Serialize local state of player interface
2024-10-10 15:03:14 +03:00
Ivan Savenko
5aebf287b9
Merge pull request #4735 from IvanSavenko/private_pos
...
Reduce usages of ambiguos CGObjectInstance::pos
2024-10-10 15:00:50 +03:00
Ivan Savenko
3113b7f60a
Merge pull request #4704 from IvanSavenko/video_autodetect
...
Enable autodetection of video scaling parameters
2024-10-10 15:00:40 +03:00
Ivan Savenko
7f6a80ed47
Merge pull request #4738 from IvanSavenko/external_audio
...
Loading separate audio file in place of audio stream embedded in video
2024-10-10 14:58:04 +03:00
Ivan Savenko
28bc38c94f
Merge branch 'develop' into multiple_small_fixes
2024-10-10 14:57:30 +03:00
Laserlicht
598b2fb6c1
show folder cases; translate new game
2024-10-10 00:06:34 +02:00
Ivan Savenko
e442e71ed9
Fix handling of autoselected interface scaling by client
2024-10-09 17:37:54 +00:00
Ivan Savenko
68e5cff276
Implement user-defined cursor scaling
2024-10-09 17:37:54 +00:00
Ivan Savenko
58d13fdce5
Implemented scaling of hardware cursor
2024-10-09 17:37:54 +00:00
Ivan Savenko
42adc9d394
Enable auto-detection of UI scaling
2024-10-09 17:37:54 +00:00
Ivan Savenko
0c03e0b7c7
Enable autodetection of upscaling filter
2024-10-09 17:37:54 +00:00
Ivan Savenko
a8f8c3f4b1
Replaced most of accesses to CGObjectInstance::pos with anchorPoint()
2024-10-09 15:43:46 +00:00
Ivan Savenko
679181c103
Implemented serialization of local player state in json form
2024-10-08 20:04:32 +00:00
Ivan Savenko
9492eab7c5
Finish encapsulation of PlayerLocalState class
2024-10-08 14:17:04 +00:00
Laserlicht
f7039435da
fix vmap name
2024-10-07 22:55:48 +02:00
Ivan Savenko
9977092cf4
Loading separate audio file in place of audio stream embedded in video
2024-10-07 20:05:45 +00:00
Ivan Savenko
7694e2da4b
Merge pull request #4736 from Laserlicht/fix_8th_portal_summoning
...
Fix multiple small issues
2024-10-07 22:19:17 +03:00
Laserlicht
9e67e9616b
Center "Human or CPU"
2024-10-07 19:05:07 +02:00
Laserlicht
a168b3aeaa
remove unused var
2024-10-07 18:49:55 +02:00
Laserlicht
1c6eaf6336
fix player translation
2024-10-07 18:37:07 +02:00
Laserlicht
2d4c0778b0
fix resource bar pos in kingdom overview
2024-10-07 18:29:54 +02:00
Laserlicht
cc480e6e46
textsize and textposition in OptionsTab
2024-10-07 18:20:18 +02:00
Laserlicht
72da365d24
center QuickRecruitmentWindow
2024-10-07 18:01:36 +02:00
Laserlicht
106dfdeb28
fix { and } in multiline
2024-10-07 18:01:20 +02:00
Laserlicht
758666d99d
fix crash with 8th creature and portal of s.
2024-10-07 18:00:34 +02:00
Laserlicht
714de18615
fix 8th + portal of summoning in kingdom overview
2024-10-07 17:41:36 +02:00
Ivan Savenko
c0f5c7c0ea
Replace pointer with reference in pack apply functions
2024-10-07 14:59:46 +00:00
Ivan Savenko
786f80871e
Replace more usages of pointers to packs with references
2024-10-07 14:59:14 +00:00
Ivan Savenko
ee831c06e7
Reduced usage of CPack, replaced with CPackForServer where applicable
2024-10-07 14:59:14 +00:00
Ivan Savenko
c1c552d394
Replaced some of pointers to CPack's with references
2024-10-07 14:59:14 +00:00
Ivan Savenko
2a628994ea
Merge pull request #4734 from Laserlicht/fix_8th_and_portal_of_summoning
...
fix 8th creature and portal of summoning
2024-10-07 17:57:27 +03:00
Ivan Savenko
f6f6f98580
Merge pull request #4699 from SoundSSGood/backpack-arts-sorting
...
Backpack artifacts sorting
2024-10-07 17:55:42 +03:00
Laserlicht
613da80f55
fix 8th creature and portal of summoning
2024-10-07 16:25:18 +02:00
Laserlicht
b885fd9d3b
added custom icons for buttons made by Ivan
2024-10-07 13:26:43 +02:00
Laserlicht
344e845684
Merge branch 'develop' into adv_search
2024-10-07 12:56:54 +02:00
Laserlicht
a826b88641
Merge branch 'develop' into spell
2024-10-07 12:55:23 +02:00
Ivan Savenko
a7027e10f4
Merge pull request #4696 from Laserlicht/color_param
...
color shift parameter to config
2024-10-06 16:03:45 +03:00
Ivan Savenko
ac5efaaf75
Merge pull request #4703 from IvanSavenko/swresample
...
Use swresample (part of FFmpeg) to de-planarize audio into format that can be consumed by SDL
2024-10-06 16:03:15 +03:00
Laserlicht
4bf02865e4
tavern invite show random hero icon as default
2024-10-04 23:14:02 +02:00
SoundSSGood
e6f4a63951
add sort buttons
2024-10-02 13:35:08 +03:00
SoundSSGood
e22d15b1d8
manageBackpackArtifacts
2024-10-02 12:45:50 +03:00
Laserlicht
a4b60aca10
cleanup
2024-10-01 23:37:27 +02:00
Laserlicht
8e079cf016
add search box
2024-10-01 22:53:05 +02:00
Laserlicht
e86b694b22
fast search
2024-10-01 21:36:45 +02:00
Laserlicht
07aa7bac3c
search for texts
2024-10-01 21:19:42 +02:00
Laserlicht
e85e938865
use subid
2024-10-01 20:44:08 +02:00
Laserlicht
bd58caac13
search feature working
2024-10-01 20:20:19 +02:00
Laserlicht
5ea9063a3b
search with CObjectListWindow
2024-10-01 19:47:10 +02:00
Laserlicht
d04f369d85
search basic implementation
2024-10-01 18:15:32 +02:00
Ivan Savenko
e497a51373
Use swresample (part of FFmpeg) to de-planarize audio into format that
...
can be consumed by SDL
2024-10-01 15:38:15 +00:00
Laserlicht
9c6bd20159
code review
2024-10-01 16:32:28 +02:00
Laserlicht
be31041a48
"general" -> "interface"
2024-10-01 16:09:22 +02:00
Ivan Savenko
cef7466c71
Merge pull request #4643 from SoundSSGood/CArtHandler-refactoring
...
CArtifactSet tidy up
2024-10-01 16:26:32 +03:00
Ivan Savenko
654f5a9100
Merge pull request #4691 from PolishUser/hero-recruitment-sound
...
Add 'newBuilding' sound upon hero recruitment in towns
2024-10-01 15:28:33 +03:00
Laserlicht
844b078482
color shift parameter to config
2024-09-30 19:46:53 +02:00
Laserlicht
31f87cb6ed
improve ui
2024-09-30 18:15:13 +02:00
Laserlicht
e2b49bbf79
fix condition
2024-09-30 02:46:45 +02:00
Laserlicht
713fcd6543
research per day & seperate config
2024-09-30 02:40:28 +02:00
PolishUser
c2ddf8e06a
Add 'newBuilding' sound upon hero recruitment in towns
2024-09-28 23:54:51 +02:00
Ivan Savenko
4ed478b6e5
Improve font mode auto-selection for languages like Chinese
2024-09-28 19:31:16 +00:00
Ivan Savenko
fecfdd7056
Fix centering of multi-line labels
2024-09-28 19:30:50 +00:00
Ivan Savenko
51848ced3b
Add font loading tracking to log
2024-09-28 19:30:26 +00:00
Laserlicht
3813db83ab
make ci happy
2024-09-28 16:16:34 +02:00
Laserlicht
8461189e95
code review + text
2024-09-28 16:10:03 +02:00
Laserlicht
f94f0a3274
new dialog
2024-09-28 15:51:53 +02:00
Laserlicht
d929bfb9d1
rename; introduce factor
2024-09-28 15:05:13 +02:00
Laserlicht
2052a26031
code review
2024-09-28 14:25:11 +02:00
Laserlicht
5bb29732d0
spell description, not spell roll
2024-09-28 12:53:57 +02:00
Laserlicht
afb90c076d
better UI
2024-09-28 02:34:18 +02:00
Laserlicht
3559f9f923
HMI for spell research
2024-09-28 01:47:32 +02:00
Laserlicht
5b2aa4dc71
swapping spells
2024-09-28 00:34:25 +02:00
Laserlicht
857b2e9a35
spell replacement works
2024-09-27 23:52:33 +02:00
Laserlicht
a9327b3fa3
netpacks
2024-09-27 22:47:22 +02:00
Ivan Savenko
7f8f09c8fa
Merge pull request #4668 from Laserlicht/scenario_name
...
Chronicles improvements
2024-09-27 20:01:47 +03:00
