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

10696 Commits

Author SHA1 Message Date
Konstantin
e0715a76c8 vcmi: reduce CStack usage a little bit 2023-04-04 23:02:54 +03:00
Konstantin
e946ddcfeb CGameHandler: obstacle trigger does not use CStack 2023-04-04 23:02:54 +03:00
Konstantin
22dd97ad18 vcmi: use entilites when possible part 1 2023-04-04 23:02:54 +03:00
Konstantin
4259d116e1 vcmi: move ServerSpellCastEnvironment in separate file
In theory, it should not know about CGameHandler
2023-04-04 23:02:54 +03:00
Ivan Savenko
307065a633 Merge beta into develop 2023-04-04 16:06:20 +03:00
Ivan Savenko
ea291abb52
Merge pull request #1865 from IvanSavenko/identifiers_resolution_fixes
Identifiers resolution fixes (1.3)
2023-04-04 15:50:42 +03:00
Ivan Savenko
6518e04cd6
Merge pull request #1849 from Nordsoft91/editor-1537
Allow single player on map and fix player params initialization
2023-04-04 11:25:11 +03:00
Ivan Savenko
00e9cef19f
Merge pull request #1857 from rilian-la-te/russian-launcher
launcher: update russian translation
2023-04-04 11:24:38 +03:00
Ivan Savenko
5b480124b8
Merge pull request #1862 from IvanSavenko/fix_garrison_move_shortcut
Space and left-clicking on second hero in town now have share code
2023-04-04 11:23:19 +03:00
Ivan Savenko
6b2b8bb5c0
Merge pull request #1863 from IvanSavenko/fix_mod_identifiers
Fix mod identifiers
2023-04-04 11:22:30 +03:00
Ivan Savenko
6061ee391d
Merge pull request #1864 from IvanSavenko/launcher_layout_fix
Launcher layout fix
2023-04-04 11:22:16 +03:00
Ivan Savenko
d6cb513374
Merge pull request #1858 from IvanSavenko/sliders_fix
Allow defining active areas for sliders.
2023-04-04 11:21:45 +03:00
DjWarmonger
53df84459f
Merge pull request #1781 from vcmi/object_distribution
Improved object distribution
2023-04-04 06:52:10 +02:00
Andrii Danylchenko
10bf9bc7a0
Merge pull request #1678 from vcmi/nkai-fix-build
NKAI: more fixes to defense and pandora
2023-04-03 22:39:11 +03:00
Ivan Savenko
255bb145b9 Added fallback for 1.2 compatibility 2023-04-03 16:26:43 +03:00
Ivan Savenko
766fb066c6 Fix debug build 2023-04-03 15:15:51 +03:00
Ivan Savenko
c5acb8bb7d Fixed empty scope on resolving map overrides 2023-04-03 15:15:29 +03:00
Ivan Savenko
191959ae05 Fixed moat identifiers requests - will now always request spells 2023-04-03 15:15:12 +03:00
Ivan Savenko
2d0344f905 VCMI will now correctly resolve identifiers in unexpected form 2023-04-03 15:14:34 +03:00
Ivan Savenko
fd0274eb95 Fix label visibility 2023-04-03 01:46:26 +03:00
Ivan Savenko
6683c866ee Disabled check for unused lines in translations due to false positives 2023-04-03 01:12:48 +03:00
Ivan Savenko
10e852fcb9 Fix scope of identifiers resolving for commanders abilities 2023-04-03 01:12:04 +03:00
Ivan Savenko
93b77d0c99 Space and left-clicking on second hero in town now have share code 2023-04-03 00:43:18 +03:00
Ivan Savenko
e1c3550ae2
Merge pull request #1859 from rilian-la-te/fix-stack-smash
vcmi: fix stack smash
2023-04-03 00:41:44 +03:00
Ivan Savenko
0eebafff7f
Merge pull request #1860 from rilian-la-te/fix-comma
gameConfig.json: add missing comma
2023-04-03 00:39:43 +03:00
Konstantin
76bddf97bd gameConfig.json: add missing comma 2023-04-02 23:53:47 +03:00
Konstantin
f41b2475fe vcmi: fix stack smash 2023-04-02 23:27:15 +03:00
Ivan Savenko
507d8bf7fd Allow defining active areas for sliders. Fixes settings window. 2023-04-02 22:24:07 +03:00
Konstantin
41fa2367e5 launcher: update russian translation 2023-04-02 22:05:47 +03:00
Ivan Savenko
c661419897
Merge pull request #1700 from rilian-la-te/resource-array
Modernize resourceSet.
2023-04-02 20:12:45 +03:00
Ivan Savenko
6dac15c5b2
Merge pull request #1706 from rilian-la-te/moats-landmines
Proper moats: mechanincs
2023-04-02 20:12:33 +03:00
Ivan Savenko
c5ca17a324
Merge pull request #1853 from Nordsoft91/fix-scope-guard
Fix ScopeGuard move behavior
2023-04-02 20:10:26 +03:00
Ivan Savenko
1cb0c6b270
Merge pull request #1848 from Nordsoft91/editor-fix
Fix map editor crash with cutting random town
2023-04-02 20:09:24 +03:00
Ivan Savenko
2b1def4ef1
Merge pull request #1813 from Laserlicht/patch-1
hide messages from AI
2023-04-02 20:08:45 +03:00
Ivan Savenko
f471d1b23a
Merge pull request #1816 from krs0/feature/all_cheats_should_have_lotr_equivalent
Added LotR alternatives for vcmiarmy and vcmiexp
2023-04-02 20:08:33 +03:00
Ivan Savenko
a3074e2741
Merge pull request #1835 from rilian-la-te/fix-native-type
CCreatureHandler: fix native terrain for any
2023-04-02 20:08:18 +03:00
Ivan Savenko
7be55754ed
Merge pull request #1837 from vcmi/Nordsoft91-patch-1
Update changelog
2023-04-02 20:07:59 +03:00
Ivan Savenko
141443b319
Merge pull request #1852 from Nordsoft91/load-crash
Fix divide by zero crash
2023-04-02 20:07:09 +03:00
Ivan Savenko
6944683b2e
Merge pull request #1854 from Nordsoft91/cmake-fix
Add missing includes into cmake
2023-04-02 20:06:27 +03:00
Ivan Savenko
efbc5cf581
Merge pull request #1815 from IvanSavenko/beta_fixes
Beta fixes
2023-04-02 20:02:41 +03:00
nordsoft
b70b4b5c4f Add missing includes 2023-04-02 16:43:32 +04:00
nordsoft
91ef7cbb4f Fix ScopeGuard move behavior 2023-04-02 15:46:56 +04:00
nordsoft
d63e32841d Fix divide by zero crash 2023-04-02 15:28:41 +04:00
nordsoft
eedd7979aa Allow single player on map and fix player params initialization 2023-04-02 14:31:57 +04:00
nordsoft
1e5362cb07 Fix crash with cutting random town 2023-04-02 14:06:16 +04:00
krs
28486a0b40 In the Silmarillion, Gandalf is referred to as "Olórin" 2023-04-02 10:58:20 +03:00
krs
7bec5bf606 Added LotR alternatives for vcmiarmy and vcmiexp 2023-04-02 10:58:20 +03:00
Andrii Danylchenko
ab84cb9931 NKAI: fix defense tasks priority evaluation 2023-04-02 10:10:17 +03:00
Andrii Danylchenko
34abc9f82d NKAI: disallow using allied shipyard 2023-04-02 10:04:10 +03:00
Andrii Danylchenko
06fcbf891b Fix battle AI using Fire elementals (had score 0) 2023-04-02 10:02:33 +03:00