Xilmi
856e1f0ef8
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-10 22:51:25 +02:00
Ivan Savenko
51838f020b
Merge pull request #4750 from IvanSavenko/savename_fix
...
Fixes missing names of saves and custom campaigns
2024-10-10 22:41:16 +03:00
Xilmi
eb94c9f0be
Update PriorityEvaluator.cpp
...
AI will be more aggressive when defending their territory. And more aggressive means more willing to take losses while fighting.
2024-10-10 18:53:28 +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
Xilmi
da32b8b58f
Restore compatibility with removal of getFaction()
2024-10-10 17:33:54 +02:00
Xilmi
61fba1fedd
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-10 17:23:39 +02:00
Ivan Savenko
1fc0267ad1
Merge pull request #4748 from IvanSavenko/ci_fix
...
Quick workaround for failing Android CI
2024-10-10 16:52:55 +03:00
Ivan Savenko
15ad0440f7
Fix iOS build
2024-10-10 12:38:32 +00:00
Ivan Savenko
77cd08d66a
Quick workaround for failing Android CI
2024-10-10 12:31:06 +00:00
Ivan Savenko
22ac88ecc4
Merge pull request #4731 from IvanSavenko/reduce_pointers
...
Reduce usage of pointers to VLC entities
2024-10-10 15:29:40 +03: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
92db0259c3
Merge pull request #4747 from IvanSavenko/mod_compat_fix
...
Fixes for loading 1.5 mods in vcmi 1.6
2024-10-10 14:57:47 +03:00
Ivan Savenko
0fcd300008
Merge pull request #4746 from Laserlicht/multiple_small_fixes
...
small fixes
2024-10-10 14:57:37 +03:00
Ivan Savenko
28bc38c94f
Merge branch 'develop' into multiple_small_fixes
2024-10-10 14:57:30 +03:00
Ivan Savenko
51481210c4
Merge pull request #4744 from wb180/vcmiqt_lib
...
Fix static linking
2024-10-10 14:56:40 +03:00
Ivan Savenko
7458faab58
Merge pull request #4742 from Warzyw647/commander-resistance-type
...
Changed Commander Resistance type from Dwarf to Golem
2024-10-10 14:56:31 +03:00
Ivan Savenko
75ebd9695d
Merge pull request #4739 from Laserlicht/fix_vmap_name
...
fix vmap name
2024-10-10 14:56:21 +03:00
Ivan Savenko
f238515a69
Merge pull request #4740 from XCOM-HUB/patch-2
...
Update swedish.json
2024-10-10 14:56:09 +03:00
Ivan Savenko
a22de74323
Fixes for loading 1.5 mods in vcmi 1.6
2024-10-10 09:50:56 +00: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
c8a0664b3c
Adjust Launcher UI to account for changes in this branch
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
7d58f89992
Change default resolution from 800x600 to 1280x720
2024-10-09 17:37:54 +00:00
Ivan Savenko
daa706b847
Enable fullscreen as default
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
Evgeniy Meshcheryakov
7847fc4bba
Fix static linking
2024-10-09 11:27:43 +03:00
Warzyw647
c4859d51d0
Changed Commander Resistance type from Dwarf to Golem
...
Only changed the bonus on level-ups
The starting bonus on level 1 needs to be changed in mods
2024-10-09 00:42:04 +02:00
Ivan Savenko
679181c103
Implemented serialization of local player state in json form
2024-10-08 20:04:32 +00:00
Maurycy
e09525a9a0
Update swedish.json
...
Shortened a few extra lines of text that were out of bounds.
2024-10-08 21:30:50 +02:00
Ivan Savenko
9492eab7c5
Finish encapsulation of PlayerLocalState class
2024-10-08 14:17:04 +00:00
Xilmi
9a40577994
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-08 16:15:22 +02:00
Maurycy
a4b18f60d7
Update swedish.json
...
Shortened some texts so that they will hopefully fit within the borders of the text boxes in the game.
2024-10-08 03:36:03 +02: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
Ivan Savenko
25311b3464
Merge pull request #4724 from IvanSavenko/remove_pack_pointers
...
Reduce usage of pointers to CPack and derived classes
2024-10-07 19:46:43 +03: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
