1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

10955 Commits

Author SHA1 Message Date
nordsoft
80220fda5b Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
# Conflicts:
#	lib/mapping/CMap.h
2023-04-17 04:54:57 +04:00
nordsoft
91b4782a2f Refactor more fields from campaign header 2023-04-17 04:47:54 +04:00
nordsoft
70f4cc5e0f Refactor campaign regions 2023-04-17 04:26:35 +04:00
nordsoft
e4c147db16 Add mod management into map editor 2023-04-17 03:01:29 +04:00
Ivan Savenko
e3ed728193
Merge pull request #1932 from rilian-la-te/proper-teleport
VCMI: teleport redesign
2023-04-16 22:52:01 +03:00
nordsoft
0c87d0a26c Add a comment 2023-04-16 21:49:43 +04:00
Ivan Savenko
0ea299859d
Merge pull request #1871 from IvanSavenko/h3m_reader_refactoring
Hota H3M parsing support (1.3)
2023-04-16 20:33:17 +03:00
nordsoft
954a2abb71 Verifying mods before starting map 2023-04-16 15:38:13 +04:00
nordsoft
67e1b48d47 Remove unused interface 2023-04-16 14:00:01 +04:00
Ivan Savenko
65e4ce9ffe Update to c++17 2023-04-15 17:20:38 +03:00
Ivan Savenko
5589e973a8 Fixed parsing of hota 'arena' map format hacks 2023-04-15 17:20:38 +03:00
Ivan Savenko
1704fab3a2 Fix assertion failure on fighting against AI with tactics 2023-04-15 17:20:38 +03:00
Ivan Savenko
22558551bf Fix parsing of invalid data from h3m 2023-04-15 17:20:38 +03:00
Ivan Savenko
2c2c2c8fe0 Slight tweaking of logging of h3m edge cases 2023-04-15 17:20:38 +03:00
Ivan Savenko
f84665b5ec Fixed loading of maps with objects owned by non-existing players 2023-04-15 17:20:38 +03:00
Ivan Savenko
f997241da1 Throw exception on loading not supported hota duel/arena maps 2023-04-15 17:20:38 +03:00
Ivan Savenko
87647cd02a Do not propose banned skills in witch huts 2023-04-15 17:20:38 +03:00
Ivan Savenko
d6a3c0e666 Cleaned up handling of hota map format versioning 2023-04-15 17:20:38 +03:00
Ivan Savenko
5b658462a1 Renamed army formation enum value 2023-04-15 17:20:38 +03:00
Ivan Savenko
b1e7774bbd Fixed parsing of hota format '0' 2023-04-15 17:20:38 +03:00
Ivan Savenko
cc8c1c769a Fix duplicated maps in scenario selection screen 2023-04-15 17:20:38 +03:00
Ivan Savenko
1b6ece1367 Formatting and renames of H3M readers, no functionality changes 2023-04-15 17:20:38 +03:00
Ivan Savenko
de855085f0 Added information on banks, seer hut and monster properties 2023-04-15 17:20:38 +03:00
Ivan Savenko
ea8aeef8c0 Implemeted parsing of HotA Seer Huts 2023-04-15 17:20:38 +03:00
Ivan Savenko
ac8952d6cf Added list of H3 objects for reference 2023-04-15 17:20:38 +03:00
Ivan Savenko
88096de7e4 Fixed parsing of HotA H3M format, including Seer Huts 2023-04-15 17:20:38 +03:00
Ivan Savenko
46239215af Implemented parsing of HotA map objects (except for Seer Hut) 2023-04-15 17:20:38 +03:00
Ivan Savenko
3790661fa6 Refactored loadObject() monstrocity into set of smaller methods. 2023-04-15 17:20:38 +03:00
Ivan Savenko
c0e9eb6eb1 HotA maps up to objects block can be parsed 2023-04-15 17:20:38 +03:00
Ivan Savenko
838d45b32c Implemented parsing of HotA h3m header 2023-04-15 17:20:38 +03:00
Ivan Savenko
f93335d678 Cleanup and formatting of H3M loader code 2023-04-15 17:20:38 +03:00
Ivan Savenko
3738171b21 Refactoring of H3M loader to make HotA format support easier
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
Ivan Savenko
df291463d0
Merge pull request #1990 from Laserlicht/patch-1
metainfo.xml update
2023-04-15 13:26:31 +03:00
Nordsoft91
6b12ee044f
Merge pull request #1969 from Nordsoft91/spectator
Single player spectator
2023-04-15 03:33:18 +04:00
Michael
1a1dbdf462
Update eu.vcmi.VCMI.metainfo.xml 2023-04-15 00:24:32 +02:00
DjWarmonger
59a7105385
Merge pull request #1982 from vcmi/DjWarmonger-patch-3
Update download counter for 1.2
2023-04-14 19:54:19 +02:00
DjWarmonger
62c0223d0c
Update download counter for 1.2 2023-04-14 19:02:54 +02:00
Ivan Savenko
b354f99cc3
Merge pull request #1936 from IvanSavenko/cpp_17_upgrade
Upgrade c++ standard to c++17
2023-04-14 19:21:17 +03:00
Ivan Savenko
128764b1c9
Merge pull request #1968 from rilian-la-te/fix-caster-tactics
Fix caster tactics
2023-04-14 18:59:03 +03:00
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