1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00

6858 Commits

Author SHA1 Message Date
Ivan Savenko
877f47e37f
Merge branch 'develop' into video 2024-12-02 13:48:30 +02:00
Ivan Savenko
fb7091e51a
Merge pull request from Laserlicht/fix_warning
fix some warnings
2024-12-02 13:13:53 +02:00
Ivan Savenko
304f6bbc90
Merge pull request from Laserlicht/scroll_fix
fix scrolling in search window
2024-12-02 13:13:23 +02:00
Ivan Savenko
f10899ed9e
Merge pull request from Laserlicht/textfixes
text fixes
2024-12-02 13:13:08 +02:00
Laserlicht
81328e2588 fixme & seconds in time (more usual) 2024-12-01 19:00:24 +01:00
Laserlicht
e6cd3630e0 fix warning 2024-11-30 17:20:39 +01:00
Laserlicht
28fd6c50c4 search box scroll fix 2024-11-30 16:55:45 +01:00
Laserlicht
1fb5301750 remove test 2024-11-30 15:52:39 +01:00
Laserlicht
6795c9afb6 animations working 2024-11-30 15:44:09 +01:00
Laserlicht
3967c70bf2 fix image creation 2024-11-30 15:03:58 +01:00
Laserlicht
9c0aef6ca2 write json 2024-11-30 13:53:50 +01:00
Laserlicht
1c715e39ba fix image generation 2024-11-30 13:01:33 +01:00
Laserlicht
443bcf6d50 fix 2024-11-30 03:46:45 +01:00
Laserlicht
bda4efa8b5 gen sprites 2024-11-30 03:45:31 +01:00
Laserlicht
4c7e3644bb gen sprites 2024-11-30 03:45:15 +01:00
Laserlicht
bb2f016f49 text fixes 2024-11-30 00:41:09 +01:00
Laserlicht
543185a530 prescale support for video 2024-11-29 23:33:28 +01:00
Laserlicht
8808c9538c use video player for spellbook animation 2024-11-29 21:58:20 +01:00
Ivan Savenko
d4b2ec5b0b
Merge pull request from IvanSavenko/local_state_fix
Fix serialization of selected spellbook page
2024-11-29 15:38:22 +02:00
Ivan Savenko
f41873fe72 Fix View Earth also revealing other objects such as heroes and towns 2024-11-27 21:26:54 +00:00
Ivan Savenko
57097f4ae6 Fix serialization of selected spellbook page
On game start, player interface attempts to load local state from empty
json, resetting all values to 0. However we want to show spellbook at
"all spells" page as default, not as top-most page with air spells
2024-11-27 20:50:12 +00:00
Ivan Savenko
99da0a15bb
Merge pull request from IvanSavenko/ai_fix
Fixes for unfinished items from AI pull request review
2024-11-27 16:41:53 +02:00
Ivan Savenko
c3494b4a73
Merge pull request from kdmcser/fix_dismiss_crash
crash fix: dismiss hero when pick artifact
2024-11-27 16:41:44 +02:00
Ivan Savenko
fe2f765322
Merge pull request 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 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 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 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 from Laserlicht/fix_window
fix hero window outside of screen
2024-11-25 13:45:45 +02:00
Ivan Savenko
2d18ba6408
Merge pull request from Laserlicht/randommap_button
fix misaligned button in randommap
2024-11-25 13:42:20 +02:00
Ivan Savenko
98430a67f4
Merge pull request 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 from Laserlicht/popup_fix
fix tavern popup
2024-11-25 13:40:37 +02:00
Ivan Savenko
7d8b753971
Merge pull request 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