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

11083 Commits

Author SHA1 Message Date
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
nordsoft
d244702abc Read and write mods into map 2023-04-12 02:59:55 +04:00
nordsoft
e669d31d33 Hidden maps 2023-04-12 02:44:17 +04:00
nordsoft
617a4385a2 Add mods fields into map header 2023-04-12 02:14:22 +04:00
nordsoft
94c6c0c262 Add hero limit checkbox in map editor 2023-04-12 02:13:53 +04: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
Michael
471aec9894
Nullkiller -> Standard-AI 2023-04-11 20:52:11 +02:00
nordsoft
30281d5991 Merge remote-tracking branch 'upstream/develop' into vcmi-campaign 2023-04-11 21:44:31 +04:00
Ivan Savenko
662db90cc1
Merge pull request #1941 from rilian-la-te/reduce-boost-little
vcmi: reduce boost a little bit
2023-04-11 20:24:16 +03:00
Nordsoft91
3951bbb395
Merge pull request #1108 from Nordsoft91/battle-dialog
[HDMod features] Quick combat
2023-04-11 21:18:04 +04:00
Konstantin
9db2e2068e vcmi: fixup crash 2023-04-11 21:17:31 +04:00
Ivan Savenko
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
Konstantin
ea3bdda047 vcmi: reduce boost a little bit 2023-04-11 17:11:14 +03:00
nordsoft
39f4bc0072 Reset battle bonuses on client side 2023-04-11 17:25:19 +04:00
nordsoft
8e77b833d9 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 15:54:08 +04:00
Ivan Savenko
6d0f8e3f24 Update ChangeLog.md
Co-authored-by: krs <krs0@users.noreply.github.com>
2023-04-11 12:02:47 +03:00
Ivan Savenko
b424ebb628 Changelog update 2023-04-11 12:02:47 +03:00
DjWarmonger
d9a2621231
Merge pull request #1939 from vcmi/fix_top_of_map_objects
Merging after positive review.
2023-04-11 10:40:18 +02:00
Ivan Savenko
c9e9d93b60
Merge pull request #1937 from Nordsoft91/launcher-layout
[1.2] Adjustable layout for launcher
2023-04-11 11:12:15 +03:00
Ivan Savenko
7d92ef5f86
Merge pull request #1909 from vcmi/avoid-freeze-on-siege-selfblocking
BattleAI: avoid selfblocking on siege
2023-04-11 11:11:05 +03:00
Ivan Savenko
ef103290fa
Merge pull request #1938 from rilian-la-te/fix-orb-of-vulnerability
config: Orb of Vulnerability should block all resistances from work (Resistance skill, dwarves, unicorns and so on.
2023-04-11 11:10:33 +03:00
Ivan Savenko
7fcd750d0f
Merge pull request #1904 from vcmi/fix_pandora_amounts
Fix pandora amounts
2023-04-11 11:10:05 +03:00
Ivan Savenko
e25cd7f90f
Merge pull request #1934 from IvanSavenko/beta_fixes
Fixed bugs for 1.2 release
2023-04-11 11:08:40 +03:00
Ivan Savenko
ff66592fad
Merge pull request #1882 from rilian-la-te/native-terrain-refactor
Native terrain refactor
2023-04-11 02:14:37 +03:00
nordsoft
bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04:00
Konstantin
b82374c4a9 config: Orb of Vulnerability should block all resistances
Just set MAGIC_RESISTANCE and SPELL_RESISTANCE_AURA to 0
by INDEPENDENT_MIN, will work.
2023-04-10 22:07:22 +03:00
Nordsoft91
ebd17c9e4a
Merge pull request #1928 from Nordsoft91/cast-reward
Spell cast reward
2023-04-10 22:49:36 +04:00
DjWarmonger
4bd3cc1679
Update lib/mapObjects/ObjectTemplate.h
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-04-10 20:45:41 +02:00
Tomasz Zieliński
3c87b3934d Do not place object visible tiles over the top of the map. 2023-04-10 19:26:53 +02:00
nordsoft
9371f013e9 Rename outer caster 2023-04-10 20:56:50 +04:00
nordsoft
49255e5a3f Adjustable layout for launcher 2023-04-10 20:33:02 +04:00
Konstantin
4da97682be vcmi: remove code duplication for native terrain 2023-04-10 19:28:17 +03:00
Konstantin
7b9e281f7d vcmi: bump serialization version 2023-04-10 19:28:16 +03:00
Konstantin
fedf7d377c vcmi: remove TFaction
This is a huge change and will break save compatibility
2023-04-10 19:28:16 +03:00
Konstantin
452cebfdfd CPropagatorNodeType: replace default constructor
Parameter constructor did the same
2023-04-10 19:28:16 +03:00