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

11004 Commits

Author SHA1 Message Date
Ivan Savenko
44b83b2e11 Merge master -> develop 2023-04-14 16:51:35 +03:00
Ivan Savenko
c125e040c3
Merge pull request #1977 from vcmi/beta
Merge 1.2 release into master branch
2023-04-14 15:31:09 +03:00
Ivan Savenko
c24a60dce6
Merge pull request #1980 from IvanSavenko/debian_update
Updated Linux release date
2023-04-14 14:58:16 +03:00
Ivan Savenko
4a2c7e9bdf Updated Linux release date 2023-04-14 14:51:26 +03:00
Ivan Savenko
7f04ce7b9d
Merge pull request #1895 from IvanSavenko/changelog_update
Final changelog update for 1.2 release
2023-04-14 14:20:17 +03:00
Ivan Savenko
93af4ef557 Updated to latest beta 2023-04-14 14:18:53 +03:00
Ivan Savenko
c7c2b25b6a
Merge pull request #1979 from IvanSavenko/fix_multiple_mods_install
Fix installation of multiple mods at once, e.g. during setup
2023-04-14 14:12:23 +03:00
Ivan Savenko
a9aa751ba0 Fix installation of multiple mods at once, e.g. during setup 2023-04-14 12:47:13 +03:00
Ivan Savenko
5dd1d5bf3f
Merge pull request #1973 from IvanSavenko/beta_fixes
Fixes for 1.2 release
2023-04-14 11:41:22 +03:00
Ivan Savenko
e97c2bd838
Merge pull request #1970 from IvanSavenko/add_rmg_templates
Moved RMG templates from vcmi-extras to vcmi mod
2023-04-14 11:40:27 +03:00
DjWarmonger
2cac8fb419
Merge pull request #1946 from vcmi/mines_after_monoliths
Monoliths and Subterranean Gates placement tweaks
2023-04-14 08:15:09 +02:00
Ivan Savenko
c2a0cf4cf3 Extended some templates to support larger maps (G+U / H+U) 2023-04-14 00:24:13 +03:00
nordsoft
289259f64a Unblock spectator interface during AI turns 2023-04-14 00:22:47 +04:00
nordsoft
35fa06008b Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c"
This reverts commit 129b15a49c911315789721b7e62b93757819519a.
2023-04-14 00:20:51 +04:00
nordsoft
413870d39a Revert "Single player spectator"
This reverts commit b9e5e42647.
2023-04-14 00:18:29 +04:00
Ivan Savenko
9d31830c74 Fix check for Demon Summon targets 2023-04-13 21:17:35 +03:00
Ivan Savenko
1978e6f8e8 Do not show unit information on dead creatures 2023-04-13 21:16:55 +03:00
Ivan Savenko
1fab2e2e34 Do not allow rising of corpses below alive stack 2023-04-13 19:08:08 +03:00
Ivan Savenko
beb9069f78 Do not allow targeting enemy corpses for Demon summon 2023-04-13 19:07:46 +03:00
Ivan Savenko
ccb08bda6f Fix loading of "true fullscreen" option in launcher 2023-04-13 19:07:21 +03:00
Ivan Savenko
35ac4d88ac Fix Seer Hut right-click text 2023-04-13 19:06:44 +03:00
Ivan Savenko
9d901efb0c Change default difficulty to "Normal" 2023-04-13 19:06:17 +03:00
Ivan Savenko
b1158a16c5 Version bump for vcmi mod 2023-04-13 16:37:52 +03:00
Ivan Savenko
2dc48496ef Fix generation of roads and rivers near map edge 2023-04-13 16:26:03 +03:00
Ivan Savenko
4f8890d866 Moved RMG templates from vcmi-extras into core mod 2023-04-13 16:25:36 +03:00
nordsoft
b9e5e42647 Single player spectator 2023-04-13 13:12:00 +04:00
nordsoft
e28dd128e0 Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c"
This reverts commit 46d35541b453b6c026c457bf0c788f79311968b3.
2023-04-13 12:45:10 +04:00
Konstantin P
f11fa8f0c8 Teleport: can trigger obstacles now 2023-04-13 11:24:19 +03:00
Konstantin P
384ee99834 vcmi: configurable teleport v2
1. Redesign wall and teleport penalty using shortest path
This will avoid OH3 exploits with teleport inside walls

2. Teleport is now configurable
2023-04-13 11:24:19 +03:00
Konstantin
bc1aad3b26 vcmi: remove deprecated CStack::getCreature()
Function battle::Unit::unitType() does the same.
2023-04-13 11:24:19 +03:00
Konstantin
d99d1509f6 Spell: remove unneeded virtual functions
We should not try to override pure virtual with pure virtual
2023-04-13 11:24:19 +03:00
Konstantin
03eb997137 CBattleInfoEssentials: add battleIsGatePassable()
This is a helper to check if gate is passable now or not.
2023-04-13 11:24:19 +03:00
Konstantin
8397bd91fb BattleActionsController: do not pass unused caster
This is unused, so, remove this parameter to prepare for teleport action
2023-04-13 11:24:19 +03:00
Konstantin
198df21ae3 vcmi: remove old landmine property 2023-04-13 11:24:19 +03:00
nordsoft
5419de3468 Fix getCasterUnitId 2023-04-13 02:18:12 +04:00
Konstantin
15031d2e16 vcmi: do not block interface on setup spells 2023-04-13 01:06:36 +03:00
nordsoft
fb4db41891 Single player spectator 2023-04-13 02:01:13 +04:00
nordsoft
f005dbbc14 Spectator mode 2023-04-13 00:59:44 +04:00
Konstantin
cb83a9371d vcmi: 1.2 compatibility to FACTION_LIMITER 2023-04-12 23:14:38 +03:00
Ivan Savenko
05550158ee
Merge pull request #1944 from Laserlicht/patch-1
Nullkiller -> Standard-AI
2023-04-12 12:48:13 +03:00
Tomasz Zieliński
74d028d951 Use product instead of distance sum for Subterranean Gate placement. 2023-04-12 09:31:09 +02:00
Tomasz Zieliński
e6eafca2d0 Place Mines after Monoliths. 2023-04-12 07:48:44 +02:00
Ivan Savenko
79b7659097 Fix gcc build 2023-04-12 01:04:27 +03:00
Ivan Savenko
63d2e6ea42 Removed no longer used code 2023-04-12 01:04:27 +03:00
Ivan Savenko
644f0f4b32 Removed ARRAY_COUNT in favor of std::size 2023-04-12 01:04:26 +03:00
Ivan Savenko
506c3d29bc Replaced vstd clamp with std version 2023-04-12 01:03:14 +03:00
Ivan Savenko
5f74aca341 Fix missing attribute 2023-04-12 01:03:14 +03:00
Ivan Savenko
3e94ae1b2b Attempt to make macOS c++17 build 2023-04-12 01:03:14 +03:00
Ivan Savenko
63b197b78a Converted attributes to use c++17 functionality 2023-04-12 01:03:14 +03:00
Ivan Savenko
2150eabfc5 Bumped C++ standard to C++17 2023-04-12 01:03:14 +03:00