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

17922 Commits

Author SHA1 Message Date
Ivan Savenko
64a6730394
Merge pull request #4934 from krs0/Fix_for_Changes_in_creature_abilities
Fix for missing creature abilities
2024-11-18 12:58:53 +02:00
Ivan Savenko
53349cc19e
Merge pull request #4924 from Laserlicht/ger_update
update german
2024-11-18 12:57:18 +02:00
Ivan Savenko
43117396bd
Merge pull request #4923 from Kuxe/mingw_compilation_fix
MinGW debug compilation error fix 'too many sections'
2024-11-18 12:57:02 +02:00
Ivan Savenko
877d11d4c0
Merge pull request #4920 from kdmcser/fix_attack_crash
fix crash:  spell before attack kill defender will lead to crash
2024-11-18 12:56:37 +02:00
Ivan Savenko
b64dbf19d4
Merge pull request #4913 from ToRRent1812/patch-3
Update polish.json
2024-11-18 12:55:34 +02:00
Ivan Savenko
1699e131db
Merge pull request #4885 from vcmi/macos-install-docs
[docs][macOS] add Homebrew install option
2024-11-18 12:54:53 +02:00
OriginMD
d93ca47afd
[docs][iOS] improve installation manual (#4888)
* Update Installation_iOS.md

* Update_Installation_iOS_2.md

Alternative version of the update

* Update Installation_iOS_2.md

* Update Installation_iOS_2.md

* Update Installation_iOS_3.md

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

---------

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-11-18 12:54:41 +02: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
krs
bda71ef8e6 Change Fortress creatures configs to be in level order
Like in the rest of configs
2024-11-17 18:14:26 +02:00
Laserlicht
8cd77fc5fc allow overlay and shadow also for unscaled images 2024-11-17 17:09:13 +01:00
krs
695298c16c Change placement of King and Dragon_Nature abilities
King is not that important that is first all the time. Is a minor spell vulnerability in the end.
Undead always comes first. Second would be dragon nature, even though right now is used only for necromancy.
2024-11-17 18:08:46 +02:00
krs
b0178e472f Add missing abilities
Siege weapons had incomplete abilities.
Fairy Dragon was missing canFly
2024-11-17 17:51:50 +02:00
Joakim Thorén
1fc04f5ea8 Updated out-of-date comment 2024-11-17 00:14:54 +01:00
Łukasz Zając
51490f8f85
fit text into the box 2024-11-16 23:57:32 +01:00
Ivan Savenko
ed3b150396
Merge pull request #4921 from IvanSavenko/misc_fixes
Fixes for recently reported issues
2024-11-16 23:58:43 +02:00
Ivan Savenko
0a9e0688a8
Merge pull request #4922 from abd-msyukyu-odoo/patch-1
[FIX] angels are not doubleWide
2024-11-16 23:58:22 +02:00
Laserlicht
f28502c981 update german 2024-11-16 22:53:12 +01:00
Joakim Thorén
dc1908ad2a Use -Wa,-mbig-obj instead of -Og to retain debuggability in SerializerReflection.cpp and IGameCallback.cpp files 2024-11-16 22:46:27 +01:00
Joakim Thorén
89d7776775 fix compilation error due to 'too many sections' for MinGW debug builds on Windows 2024-11-16 22:41:05 +01:00
Damien Abeloos
812a1217de
[FIX] angels are not doubleWide 2024-11-16 22:16:48 +01:00
Łukasz Zając
d862351ad6
Pryzmatyczny 2024-11-16 21:08:51 +01:00
kdmcser
7cb8ca174e fix crash: defender is killed by spell before attack, but attacker still do attack action 2024-11-17 01:00:23 +08:00
Ivan Savenko
3f8f6dc721
Merge pull request #4919 from Kuxe/dont_use_Og_for_mingw_debug_builds
Remove '-Og' from MINGW debug builds
2024-11-16 18:51:23 +02:00
Ivan Savenko
888825592c Fix json formatting 2024-11-16 16:44:42 +00:00
Ivan Savenko
4ae81cbac0 Add missing field to serialization 2024-11-16 16:23:02 +00:00
Ivan Savenko
227e403e88 Fix crash on advancing to 3rd scenario of Birth of Barbarian campaign -
spellbook removal was not working correctly when hero does not keeps his
spells
2024-11-16 16:22:43 +00:00
Joakim Thorén
c3f675c3ea Remove '-Og' from MINGW debug builds. It interferes with debugging. See https://stackoverflow.com/a/63386263/2323908. Instead, the default O0 is used.
This change makes it possible to use whatever optimization levels you want debug builds, which was previously impossible due to the passing of -Og in CMakeLists.txt.
2024-11-16 17:15:55 +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
a4ef45c4f8 Move list of war machines in war machine factory to config 2024-11-16 15:32:52 +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
Ivan Savenko
e7c92c738a
Merge pull request #4909 from Kuxe/fix_linker_error_if_ffmpeg_is_missing
Fix linker error in EntryPoint if ffmpeg is missing due to missing DISABLE_VIDEO in vcmiclient target
2024-11-16 17:27:44 +02:00
Łukasz Zając
fccf3132a8
Update polish.json
added new strings.
2024-11-15 23:27:10 +01: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
e93af77f44
Merge pull request #4908 from Kuxe/ensure_gcc_usage_with_windows-mingw-release
Set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to gcc and g++ for windows-mingw-release
2024-11-15 19:17:37 +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
f6016abf93
Merge pull request #4907 from Kuxe/update_mingw_dependencies
[docs] Update windows-mingw-release dependencies
2024-11-15 19:14:50 +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
Joakim Thorén
9611a324cd Fix linker error in EntryPoint if ffmpeg is missing due to missing DISABLE_VIDEO in vcmiclient target 2024-11-15 00:49:22 +01:00
Joakim Thorén
9a1e48c349 Set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to gcc and g++ for windows-mingw-release preset.
Prevents various situations where clang is chosen over gcc, which is unintended when using windows-mingw-release preset
2024-11-14 23:26:24 +01:00
Joakim Thorén
e7682cfd5c Add qt5-tools and tbb as required dependencies when using the windows-mingw-release preset 2024-11-14 23:09:29 +01:00
Laserlicht
0f94f35dcf
code review 2024-11-14 00:34:39 +01:00
Laserlicht
1e77d08d1a docs for modder 2024-11-13 23:49:57 +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