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

558 Commits

Author SHA1 Message Date
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
633b9ef3be Native terrain is now required for faction, opt-out with value "none" 2023-01-17 22:59:14 +02:00
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
e48bd39b9c Moved road & river handlers into a separate file 2023-01-11 15:17:24 +02:00
5e72ef76cf Fix quest texts accessing 2023-01-11 15:10:44 +02:00
1e37e66e6c Replaced Terrain::BORDER and WRONG with NONE 2023-01-10 20:09:09 +02:00
4f3ea0d1d9 Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
f51b3bca57 use JsonKey or NameTranslated instead of ambiguos Name 2023-01-10 00:01:35 +02:00
7c7ae26e67 Map/Road/River identifiers are now private members 2023-01-10 00:01:35 +02:00
64885bdf6b Better names for terrain parameters. Support for new movement sounds. 2023-01-10 00:01:35 +02:00
4e4dae854f Final stabilization changes 2023-01-10 00:01:35 +02:00
2de3178158 Fixed game startup 2023-01-10 00:01:35 +02:00
e1799379dd Terrain/Road/River handler are now in compileable state 2023-01-10 00:01:35 +02:00
1468f6aded Converted terrainTypeHandler into proper handler class 2023-01-10 00:01:35 +02:00
bde988ca43 Merge pull request #1329 from IvanSavenko/translate_game
Translations support - base functionality for main game texts
2023-01-09 20:33:56 +02:00
2f5ee44cbe Fixes patrol position initialization on H3M load 2023-01-09 18:34:13 +02:00
7e8516f927 Changed Sirens behavior to match H3 logic 2023-01-09 13:04:56 +02:00
c479504646 Formatting cleanup 2023-01-01 22:50:38 +02:00
7c0d5666a0 Return string by copy to fix cases when string is constructed on stack 2023-01-01 20:55:43 +02:00
9a620a9091 Refactoring of GeneralTextHandler to reduce boilerplate code in callers 2023-01-01 15:13:02 +02:00
84493e1bff Translate received string identifier before storing 2023-01-01 14:56:45 +02:00
1979b3e97f Fixes typo 2023-01-01 14:56:45 +02:00
85d7b470d4 Access to quests texts is now processed via translator 2023-01-01 14:56:45 +02:00
bdb8e0ee5c Introduced string identifiers for H3 texts, still WIP 2023-01-01 14:56:44 +02:00
2c09bfb22a Fix code formatting 2022-12-30 15:51:13 +01:00
M
23de4a188b Change cartographer tile reveal logic to match H3 2022-12-30 15:09:09 +01:00
7a35bcc812 Merge pull request #1221 from IvanSavenko/warnings_fix
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
b030a88ca5 fix gold check for School of War 2022-12-29 01:45:51 +04:00
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
26985600b2 Fixed several more cases of incorrect scope for identifiers resolving 2022-12-21 23:02:19 +04:00
23cb47b457 Fixed several scenarios with incorrect scope for requesting identifiers 2022-12-21 23:02:19 +04:00
5f8cfadc4d Better formatting for not found terrains ID's 2022-12-20 01:55:59 +04:00
b13723305d Better error reporting for usages of invalid terrain in mods
TODO: switch to proper mechanism via identifier requests
2022-12-20 01:55:59 +04:00
25bceda4ea Added convertToVisitablePos/convertFromVisitablePos to CGHeroInstance
This method replaces old convertPosition, but with more clear names and
without hardcoded magic constants.
2022-12-09 14:42:47 +02:00
d85ee019ec Removed CGHeroInstance::convertPosition method 2022-12-07 22:51:32 +02:00
49cbd5adc9 CGHeroInstance::convertPosition is no longer static method 2022-12-07 22:34:08 +02:00
908e6892f3 Removed CGHeroInstance::getPosition pseudo-override
Now access to hero visible position is always done via visitablePos
2022-12-07 22:10:08 +02:00
2855606a88 Enabled & fixed -Woverloaded-virtual warning from gcc/cland
- fixed almost all instances of overloaded-virtual warning
- cleared up inheritance & method overrides in code affected by warning
2022-12-07 21:50:45 +02:00
65802d958b Integrated valid fixes from PR #1143 2022-12-07 18:13:54 +02:00
89f0cc66e8 Merge pull request #1213 from IvanSavenko/clone_fix
Fix crash on casting clone on modded creature
2022-12-07 17:34:52 +02:00
2cbe6bcb47 Added common method to get names of hardcoded mod scopes 2022-12-07 15:18:19 +02:00
17f9c3af23 Library of Enlightenment fix
Do not offer choice between multiple identical option if hero is qualified
to receive multiple of them due to diplomacy skill
2022-12-06 18:08:10 +02:00
40e55e2788 Merge pull request #1196 from IvanSavenko/hero_positioning_fix
Fixes incorrect positioning of heroes on spawn/release from prison
2022-12-05 10:35:24 +02:00
b6b6063505 Fix positioning of heroes after release from prisons 2022-12-04 22:00:33 +02:00
bbe51bfaf4 Fix hero experience deserialization 2022-12-04 16:58:46 +04:00
8d1024fcfc Clear error message 2022-12-03 20:56:05 +04:00
d9c4b28ccc Merge pull request #1177 from IvanSavenko/fix_mod_identifiers
Fix mod identifiers registration & incorrect mod validation
2022-12-02 09:20:49 +02:00
45a3064e5d suggested changes 2022-11-30 18:28:33 +02:00
5cd405bce8 Fixed meta field handling in JsonUtils::inherit function, removed
workarounds
2022-11-30 17:38:53 +02:00
79c96e94fa Cleared up comments 2022-11-30 17:37:36 +02:00