1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

6828 Commits

Author SHA1 Message Date
Ivan Savenko
24669afee3
Merge pull request #5055 from Laserlicht/shortcut_modifier
fix shortcut modifier
2024-12-10 13:10:34 +02:00
Ivan Savenko
06c7aa90e2
Merge pull request #5050 from Laserlicht/graphic_fixes
Graphic fixes
2024-12-10 13:09:02 +02:00
Ivan Savenko
d140917a8f
Merge pull request #5047 from Laserlicht/fix_tut_video
fix tutorial video
2024-12-10 13:08:05 +02:00
Laserlicht
a0c0496784 fix shadow hex 2024-12-09 20:27:39 +01:00
Laserlicht
2d94246174 fix shortcut modifier 2024-12-08 21:14:51 +01:00
Laserlicht
4eb683e0d1 center round indicator 2024-12-08 01:21:33 +01:00
Laserlicht
f36b42829a fix cell shades with xbrz 2024-12-08 01:17:01 +01:00
Laserlicht
2abfaa0853 fix tutorial video 2024-12-07 17:14:45 +01:00
Ivan Savenko
9fbeacb688 Fix possible memory corruption in video player
Fixes two bugs, one was definitely happening, and 2nd one that is causing
undefined behavior and may work only in some std implementations

- VideoPlayer would attempt to access subtitles widget after VideoPlayer
itself was destroyed in onPlaybackFinished call
- std::function was destroyed from a function that is being called by
it. Replaced with 1-method interface to avoid usage of std::function in
this scenario
2024-12-07 15:37:03 +00:00
Ivan Savenko
ade46d5ffb
Merge branch 'develop' into timed_events_objects_removal 2024-12-06 15:33:33 +02:00
Ivan Savenko
fe51194e22
Merge pull request #5008 from Laserlicht/sprites_test
Tile animation for rivers with xbrz
2024-12-06 14:54:18 +02:00
Laserlicht
4b103fd63b code review 2024-12-05 23:31:03 +01:00
Ivan Savenko
7a75aafc88
Merge pull request #5031 from dydzio0614/empty-hexes-shoot-fix
Fix shooting being priority action for dead creature hexes with empty hex target enabled
2024-12-05 17:41:57 +02:00
Ivan Savenko
7543635847
Merge pull request #5032 from dydzio0614/alt-creature-buttons
Exchange full army by holding alt while pressing VCMI extras creature arrow button
2024-12-05 16:38:32 +02:00
Ivan Savenko
865a6c1aa0
Merge pull request #5018 from Laserlicht/translate
Added missing translation strings
2024-12-05 16:32:20 +02:00
Dydzio
e87ed1e80c Add extra clientside sanity check (should be there from thestart) 2024-12-03 21:03:25 +01:00
Dydzio
ceac0bc203 Full exchange when holding alt while pressing exchange screen creature arrow button 2024-12-03 20:40:06 +01:00
Dydzio
1e9d089fd8 Fix shooting being priority action for dead creature hexes with targeting empty hexes enabled 2024-12-03 18:04:41 +01:00
Dydzio
e9be46af98 Merge branch 'develop' into timed_events_objects_removal 2024-12-03 17:27:24 +01:00
Laserlicht
f6b37dbca2
revert text fix 2024-12-02 22:36:49 +01:00
Ivan Savenko
877f47e37f
Merge branch 'develop' into video 2024-12-02 13:48:30 +02:00
Ivan Savenko
fb7091e51a
Merge pull request #5010 from Laserlicht/fix_warning
fix some warnings
2024-12-02 13:13:53 +02:00
Ivan Savenko
304f6bbc90
Merge pull request #5009 from Laserlicht/scroll_fix
fix scrolling in search window
2024-12-02 13:13:23 +02:00
Ivan Savenko
f10899ed9e
Merge pull request #5006 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 #4995 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 #4989 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 #4982 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 #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