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

17828 Commits

Author SHA1 Message Date
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
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
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
d0606d2dc9 Fix scripting build 2024-10-07 15:14:03 +00:00
Ivan Savenko
c0f5c7c0ea Replace pointer with reference in pack apply functions 2024-10-07 14:59:46 +00:00
Ivan Savenko
48fb58e7a0 Replace few more pointers with references, remove manual delete call 2024-10-07 14:59:14 +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
cc6d6b0d63 Replaced unique_ptr with simple references to packs 2024-10-07 14:59:14 +00:00
Ivan Savenko
2399a5a765
Merge pull request #4712 from IvanSavenko/detect_conflict
Detection of potential conflicts between mods
2024-10-07 17:57:52 +03: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
Ivan Savenko
13712a5da9
Merge pull request #4717 from wb180/mapeditor_fix
Map editor: Transparency fix
2024-10-07 17:38:30 +03:00
Ivan Savenko
1687606a4b
Merge pull request #4726 from wb180/vcmiqt_lib
Separate vcmiqt static lib
2024-10-07 17:37:51 +03:00
Laserlicht
613da80f55 fix 8th creature and portal of summoning 2024-10-07 16:25:18 +02:00
Ivan Savenko
cf685e4bfb
Merge pull request #4680 from Laserlicht/spell
Basic spell research
2024-10-07 15:22:04 +03: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
07e53b2fdf
Merge pull request #4701 from IvanSavenko/localize_edited_strings
Localization improvements
2024-10-07 12:25:51 +03:00