1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Commit Graph

7110 Commits

Author SHA1 Message Date
aff079b4e6 Fix boat regression 2023-06-07 20:10:04 +02:00
3e9e6aab2b Fix prison distribution 2023-06-07 15:08:50 +02:00
7922d8be16 Prison from HoTA will be placed on water. 2023-06-07 13:00:24 +02:00
f6c2d5cba7 hotfix 2023-06-07 13:08:04 +03:00
e98a50b45a Merge pull request #2123 from Warzyw647/rmg-split-enum-monster-strength
Refactor enums and add zone monster strength "none" in rmg
2023-06-06 20:40:35 +02:00
428fb832c6 Implemented foreground/background obstacles:
- obstacles now have "foreground" field
- if "foreground" field set, obstacle will appear on top of other
objects, such as units
- if "foreground" is not set, obstacle will appear below units
- updated schema and cleared up obstacles config
2023-06-06 15:53:14 +03:00
238a02eb5e It is now possible to cancel attack-via-swiping by moving finger away 2023-06-05 19:20:20 +03:00
1e9eea30e1 Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop 2023-06-05 18:53:17 +03:00
cbe1c4a07d Remove random seed from map description. 2023-06-03 08:53:00 +02:00
97b3b2e147 Fix build 2023-06-03 00:48:32 +03:00
d6a357fd17 Split some map object files into smaller files. Reduced includes usage. 2023-06-02 21:47:37 +03:00
b04b11b9d1 Merge pull request #2175 from IvanSavenko/map_format_mappings
HotA map format support  - object mapping
2023-06-01 22:06:18 +03:00
2f9073e13a Fix assertion 2023-06-01 16:03:37 +03:00
fce5f9f907 Fix buildings loading 2023-05-31 23:18:39 +03:00
312b703a78 Fixed mapping of hota objects 2023-05-31 23:18:39 +03:00
952708e865 Basic version of object templates mapping 2023-05-31 23:18:39 +03:00
b3ca6c8cee Fixed detection of campaign format 2023-05-31 23:18:39 +03:00
e1c01ca636 Fix CI build 2023-05-31 23:18:39 +03:00
acac42291e Remove excessive CMap.h includes 2023-05-31 23:18:38 +03:00
62595cb039 Split massive CMap.h a bit 2023-05-31 23:01:57 +03:00
bf720200f9 Implemented identifiers remapping for game entities 2023-05-31 23:01:57 +03:00
c51e0ef052 Added information on Heroes Chronicles map ID's 2023-05-31 23:01:57 +03:00
8d0dcd6ad7 All h3m bitsets are now loaded inside mapReader 2023-05-31 23:01:57 +03:00
5fe5d0c045 Fix loading of buildings of random town 2023-05-31 23:01:57 +03:00
ffd7144df8 Implemented identifiers mapping for town buildings 2023-05-31 23:01:57 +03:00
de769a04d6 Remove unnecessary includes from headers 2023-05-31 23:01:57 +03:00
daaaf84392 Icon index for map format is now defined in config 2023-05-31 23:01:57 +03:00
fb55719671 Map format support status can now be loaded from gameSettings 2023-05-31 23:01:57 +03:00
402823e3d5 Fix loading of some user-made maps 2023-05-31 23:01:57 +03:00
bc4755a89a Merge branch 'develop' into rmg-split-enum-monster-strength 2023-05-31 19:53:19 +02:00
e82acf4840 CGHeroInstance: always add obligatory skills
Fixes #2198
2023-05-31 20:03:59 +03:00
4c513e8bb0 Water zones get monster strength ZONE_NONE during their creation instead of a hardcoded check for zone type WATER at guard creation time.
Also preliminary preparations for water zone customization in the template json.
2023-05-31 00:24:52 +02:00
cd9bd491e0 Add option for single-thread generation. Still doesn't guarantee excactly identical maps :? 2023-05-24 18:02:11 +02:00
1366825f08 final fixup 2023-05-24 16:10:06 +03:00
edf47f5769 Fix StdInc.h 2023-05-21 07:26:36 +02:00
af3c6abb5e Added zone guard strength "none" 2023-05-21 00:13:45 +02:00
7afcc3b350 Merge branch 'rmg-split-enum-monster-strength' into rmg-no-monster-zone 2023-05-20 17:29:07 +02:00
149ae9986c Merge branch 'rmg-refactor-enums' into rmg-no-monster-zone 2023-05-20 17:28:25 +02:00
f3c795462f Remove comment which break the build 2023-05-20 17:08:44 +02:00
031671056d Merge branch 'develop' into rmg-no-monster-zone 2023-05-20 16:58:49 +02:00
4e927f644d Missing precompiled header 2023-05-20 15:41:03 +02:00
b2b2798214 Use boost::thread instead of std::thread 2023-05-20 14:43:05 +02:00
aa16f57b8a Remove unused variables 2023-05-20 14:28:18 +02:00
a8b882e5bb Remove another pragma 2023-05-20 14:16:18 +02:00
5ffbdb10ef Another build fix 2023-05-20 14:07:16 +02:00
e25448e7cd Fix build on macos 2023-05-20 14:00:03 +02:00
c7f4fe8243 Another compile fix. 2023-05-20 13:47:36 +02:00
a1531b58db More fixes 2023-05-20 13:38:14 +02:00
5363fd5db3 Changing other enums to enum classes and adding comments with reasons for why some enums stay as enum-in-namespace. 2023-05-20 13:29:55 +02:00
ae97912b1e Fix warning 2023-05-20 13:23:27 +02:00