Ivan Savenko
fe2f765322
Merge pull request #4981 from mikeiit/random_map_player_count
...
Random map gen com only player count fix
2024-11-27 16:41:18 +02:00
Ivan Savenko
b47d4ce8e7
Merge pull request #4969 from kdmcser/joystick_fix
...
fix joystick cursor position in xbrz
2024-11-27 16:41:07 +02:00
Ivan Savenko
087de6637c
Revert temporary change
2024-11-26 18:42:50 +00:00
Ivan Savenko
4180ea9523
Merge pull request #4274 from Xilmi/develop
...
Rule based AI
2024-11-26 18:32:58 +02:00
kdmcser
d0e33a2cf8
Update client/eventsSDL/InputSourceGameController.cpp
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-11-27 00:24:33 +08:00
Ivan Savenko
87a665fb7f
Restored all disabled mod functinality that was used by client
2024-11-26 13:55:46 +00:00
Ivan Savenko
ba9e3dca9d
Mod management rework, part 1
...
- Replaced CModInfo class with constant ModDescription class
- Simplified mod loading logic
- Extracted some functionality from ModHandler into separate classes for
future reuse by Launcher
2024-11-26 13:55:46 +00:00
Xilmi
b750937588
Merge remote-tracking branch 'upstream/develop' into develop
2024-11-25 18:49:45 +01:00
kdmcser
993a4dc73d
crash fix: dismiss hero when pick artifact
2024-11-26 01:11:09 +08:00
Ivan Savenko
7fdddee503
Merge pull request #4978 from IvanSavenko/swap_h3_icons
...
Fix h3 bug: icons of View Earth and View Air are swapped
2024-11-25 15:29:39 +02:00
Ivan Savenko
ebf0437f09
Merge pull request #4968 from Laserlicht/fix_window
...
fix hero window outside of screen
2024-11-25 13:45:45 +02:00
Ivan Savenko
2d18ba6408
Merge pull request #4963 from Laserlicht/randommap_button
...
fix misaligned button in randommap
2024-11-25 13:42:20 +02:00
Ivan Savenko
98430a67f4
Merge pull request #4957 from IvanSavenko/hd_assets
...
Added existing HD assets for vcmi mod
2024-11-25 13:40:55 +02:00
Ivan Savenko
d94da01535
Merge pull request #4955 from Laserlicht/popup_fix
...
fix tavern popup
2024-11-25 13:40:37 +02:00
Ivan Savenko
7d8b753971
Merge pull request #4951 from IvanSavenko/sonar_fix
...
Fix several new issues detected by SonarCloud
2024-11-25 13:39:56 +02:00
mikeiit
a4db80671a
call getPlayerLimit
2024-11-24 19:50:47 -08:00
Ivan Savenko
2b692c2606
Fix h3 bug: icons of View Earth and View Air are swapped
2024-11-24 19:26:06 +00:00
kdmcser
005b97194f
fix joystick cursor position in xbrz
2024-11-24 14:06:39 +08:00
Laserlicht
6366175a3c
fix window
2024-11-23 19:19:07 +01:00
Laserlicht
5e5a854180
fix misaligned button in randommap
2024-11-23 02:33:25 +01:00
Ivan Savenko
e72817c866
Added existing HD assets for vcmi mod
...
Some of our custom assets were actually made in high resolution, and
then - greatly downscaled for use in vcmi.
This PR adds (some of) these assets using recently introduced HD assets
loading support. None of these were upscaled, but rather downscaled from
existing high-resolution version.
Following assets were added:
- vcmi icon for map format - based on our main logo, with no text
- 'defend' icon for stack queue - now also based on our logo, with no
text and sepia effect
- 'wait' icon for stack queue - added only x2 version. Was actually
already present in vcmi mod, but unused.
- icons for creature window (attack/defense/hit points/etc) - it was
based on existing CC0 asset
- 'gear' icon for settings - made from scratch by me.
Will also upload all of these assets in their original resolution to
vcmi-assets repository.
2024-11-22 16:46:48 +00:00
Xilmi
65f2d0c44e
Merge remote-tracking branch 'upstream/develop' into develop
2024-11-21 23:14:03 +01:00
Laserlicht
b89db3f044
fix popup
2024-11-21 23:12:27 +01:00
Ivan Savenko
aef6b0cc00
Fix several new issues detected by SonarCloud
2024-11-20 16:06:38 +00:00
Ivan Savenko
f59834afe1
Fixes for configurable markets support
...
- string "speech" can now be translated
- removed "title" string, VCMI will now use object name instead
- moved configuration of all "markets" into a separate json file
- added schema for validation of market objects
- removed serialization of translated strings from University
2024-11-20 15:45:13 +00:00
Ivan Savenko
931017f58b
Fix bugs caused by image optimization procedure
2024-11-18 10:19:48 +00:00
Ivan Savenko
29c040fa69
Try to crop borders for images that are not from pre-optimized def
2024-11-17 20:41:12 +00:00
Ivan Savenko
91940dbfc6
Do not show selection highlight on creature preview images
2024-11-17 20:40:38 +00:00
Ivan Savenko
dfe6e04464
Implemented semi-transparent spell effects
2024-11-17 19:48:16 +00:00
Ivan Savenko
251155d913
More robust management of body/shadow/overlay split
2024-11-17 17:54:55 +00:00
Ivan Savenko
c82db9d574
Fix crash on rearranging troops on non-owned hero
2024-11-17 17:38:54 +00:00
Ivan Savenko
d81d682939
Merge pull request #4933 from Laserlicht/fix_overlay
...
allow seperate overlay and shadow images also for unscaled images
2024-11-17 19:38:26 +02:00
Laserlicht
8cd77fc5fc
allow overlay and shadow also for unscaled images
2024-11-17 17:09:13 +01:00
Ivan Savenko
7f0cb6ce6a
ISharedImage is now always const, remove creation of image copy when
...
upscaling to same factor
2024-11-16 15:40:05 +00:00
Ivan Savenko
e2fe20e26d
Use upper_bound instead of sort since predicate does not fulfills strict weak ordering requirement for std::sort
2024-11-16 15:32:52 +00:00
Ivan Savenko
98a54b61b7
Merge pull request #4874 from Laserlicht/load_prescaled
...
prescaled image support
2024-11-16 17:28:37 +02:00
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
