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

18430 Commits

Author SHA1 Message Date
Laserlicht
e7b6962211 translate strings 2024-12-09 21:51:35 +01:00
Ivan Savenko
04987eef5c
Merge pull request #5051 from IvanSavenko/hero_removal_fix
Remove object from owned objects before resetting owner
2024-12-08 14:07:23 +02:00
Ivan Savenko
970d7d795f Remove object from owned objects before resetting owner 2024-12-08 11:26:21 +00:00
Ivan Savenko
543ce94132
Merge pull request #5012 from IvanSavenko/changelog_november
Updated changelog to account for recent changes
2024-12-07 18:36:47 +02:00
Ivan Savenko
57f491deda
Merge pull request #5042 from XCOM-HUB/patch-7
Update swedish.json
2024-12-07 18:36:19 +02:00
Ivan Savenko
da07384d6b
Merge pull request #5046 from IvanSavenko/mem_corruption_fix
Fix possible memory corruption in video player
2024-12-07 18:26:29 +02: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
Maurycy
c7da5c8782
Update swedish.json 2024-12-07 00:35:02 +01:00
Ivan Savenko
8d9e144c61 Updated changelog to account for recent changes 2024-12-06 14:34:48 +00:00
Ivan Savenko
3115894307
Merge pull request #5030 from vcmi/timed_events_objects_removal
Timed events objects removal
2024-12-06 16:07:21 +02:00
Ivan Savenko
ade46d5ffb
Merge branch 'develop' into timed_events_objects_removal 2024-12-06 15:33:33 +02:00
Ivan Savenko
7429589a0a
Merge pull request #5034 from godric3/map-editor-hero-artifacts
Map editor:  customize hero artifacts
2024-12-06 15:00:51 +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
Ivan Savenko
f35abaaeee
Merge pull request #5022 from Laserlicht/innoextract_hash
generate file hashes if innoextract fails
2024-12-06 14:42:48 +02:00
Ivan Savenko
a60e98f0bb
Merge pull request #5041 from IvanSavenko/syntaxhighlight_check
[Docs] Enable rule to enforce specifying language for code blocks
2024-12-06 14:39:26 +02:00
Ivan Savenko
f546b434ff
Merge pull request #5003 from IvanSavenko/ai_difficulty_config
Change NKAI configuration for different difficulty levels
2024-12-06 14:39:16 +02:00
Laserlicht
4b103fd63b code review 2024-12-05 23:31:03 +01:00
Ivan Savenko
53d4afdae5 Enable rule to enforce specifying language for code blocks 2024-12-05 21:32:55 +00:00
Dydzio
16d25e903c Remove flaggable bonus on object deletion 2024-12-05 21:55:32 +01:00
Ivan Savenko
4e58df6635 Bump heroes limit a bit 2024-12-05 20:31:14 +00:00
Dydzio
7be31c94f2 Fixes from code review 2024-12-05 21:16:06 +01:00
Dydzio
7a701b39fb
Update mapeditor/mapsettings/timedevent.h
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-12-05 21:02:54 +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
8c293ce156 First attempt to make per-difficulty configurations for AI 2024-12-05 15:08:04 +00: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
Ivan Savenko
44ba6c3dd4
Merge pull request #5024 from GeorgeK1ng/develop
Removed vanished elements for Czech launcher translation
2024-12-05 16:32:09 +02:00
Ivan Savenko
24579cedd4
Merge pull request #5026 from Laserlicht/patch-3
revert text fix
2024-12-05 16:31:28 +02:00
Ivan Savenko
55c594e591
Merge pull request #5035 from IvanSavenko/launcher_fix
Fixes for mod management in Launcher
2024-12-05 16:30:53 +02:00
Ivan Savenko
993b13cc09
Merge pull request #5038 from IvanSavenko/docs_json
Use json instead of json5 for syntax highlight in docs
2024-12-05 16:30:18 +02:00
Ivan Savenko
102dfd0966
Merge pull request #5020 from IvanSavenko/ai_object_fix
Fix AI not recruiting heroes when map reveal is off
2024-12-05 16:29:43 +02:00
Ivan Savenko
879aaba980 Use json instead of json5 for syntax highlight in docs
Looks like website only recognizes javascript & json, and is not aware
of jsonc or json5.

Will result in small regression on Github web view - comments will show
up as red (since comments are not part of json format), but syntax
highlight would work both on website and on Github.

Alternative is using javascript for syntax highlight, however syntax
highlighter for json looks better on both website and Github (since it
uses separate highlighting for json keys, separate from strings in
values)
2024-12-04 16:50:01 +00:00
Ivan Savenko
9bdf22a3cd Force-refresh of mod list model on start once local mods are loaded 2024-12-04 11:17:07 +00:00
Ivan Savenko
ac01ec3733 Hide update/install/enable buttons on Launcher start 2024-12-04 11:16:31 +00:00
Ivan Savenko
00513c8720 Fix crash on attempt to enable 0 mods, for example after update 2024-12-04 11:16:05 +00:00
Ivan Savenko
cdc1a9ea68 Fix not functioning mod updating 2024-12-04 11:15:39 +00:00
DjWarmonger
9e07b5c5de
Merge pull request #4954 from vcmi/curved_roads
Curved roads
2024-12-04 07:54:41 +01:00
godric3
01bb73b0cc fix imports 2024-12-03 21:28:21 +01:00
godric3
025ad58561 map editor: check hero artifacts during mod assessment 2024-12-03 21:17:04 +01:00
godric3
896a148a7a map editor: Add possibility to customize hero artifacts 2024-12-03 21:07:33 +01: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
f7b0c7405b Fix "padding variables" for object deletion 2024-12-03 17:40:35 +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
Laserlicht
a8709731c4 unify time (without seconds) 2024-12-02 20:37:51 +01:00
Laserlicht
4fb1e9b056 code review 2024-12-02 20:29:17 +01:00
George King
8900c08b88
Removed vanished elements 2024-12-02 16:12:32 +01:00
DjWarmonger
82501dc553
Update lib/rmg/RmgPath.h
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-12-02 13:15:27 +01:00