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
1cad64c470 Move road flag to placeObject() method 2023-07-07 20:17:20 +02:00
3889193a48 Reorganize namespaces 2023-07-07 16:32:17 +02:00
fa4a0004b2 Merge pull request #2291 from IvanSavenko/terrain_animations_config
Moved hardcoded terrain palette-cycling animations to config
2023-07-07 14:28:39 +03:00
ae8579558d Merge pull request #2282 from IvanSavenko/adventure_map_fixes
Adventure map fixes for 1.3
2023-07-07 14:27:58 +03:00
8463fe200c Merge remote-tracking branch 'origin/develop' into rmg_roads 2023-07-07 08:19:52 +02:00
f9e1a70ab8 Merge pull request #2278 from vcmi/rmg_factions
Rmg factions
2023-07-06 22:15:36 +02:00
0d3ac4a502 - Add new option for connection
- Store info about objects and roads in RequiredObjectInfo
2023-07-06 22:15:00 +02:00
a592f5604b Add "bannedTerrains", "bannedMonsters" options for templates. 2023-07-06 17:30:23 +02:00
06449ce7b0 Another compile fix 2023-07-05 21:18:30 +02:00
506a0cdda0 - Better name as suggested in PR
- Compile fix
2023-07-05 21:08:32 +02:00
3bce245780 Moved hardcoded terrain palette-cycling animations to config 2023-07-05 22:07:20 +03:00
9f2bfbc1d8 Improve serialization of IDs from mods, so they are resolved correctly after all mods are loaded. 2023-07-05 20:53:00 +02:00
9b5f6ec7cf CArtifact getters setters 2023-07-05 15:48:08 +03:00
fa3568dca1 Small fix in characters encodings in Languages.h 2023-07-05 13:12:49 +03:00
1cbc6457ce Fix possible assertion failure on removing non-owned town 2023-07-04 20:28:02 +03:00
fd9c7352a0 suggested changes 2023-07-03 22:54:03 +03:00
5f8a125a98 Updated translations 2023-07-03 14:34:53 +03:00
8ac56f06b0 Added Hungarian 2023-07-03 14:34:53 +03:00
bcc335e0a8 Added Finnish, Portuguese, Swedish, Turkish languages 2023-07-03 14:34:53 +03:00
4b366e1fe8 Added new languages: Czech, Italian, Korean 2023-07-03 14:34:53 +03:00
8efa7911b7 Implemented "Allied Adventure Map AI" option 2023-07-03 14:34:53 +03:00
fc696fa0b3 Added detection of OS language on first run 2023-07-03 14:34:53 +03:00
73b78dd75e Handle "bannedTowns" (alredy used on Jebus). 2023-07-02 11:41:47 +02:00
cb4d818241 Inherit terrain types only after all terrain Ids are resolved. 2023-07-02 09:28:51 +02:00
04e2cf728e Allow all terrains from mods by default (including Wasteland). 2023-07-02 08:13:06 +02:00
dc3dda7676 Fix new factions not appearing in random maps 2023-07-01 15:25:20 +02:00
11a109f3af fix build 2023-07-01 14:59:23 +03:00
aa90433418 bump serialization version 2023-07-01 14:59:23 +03:00
670999d40e BattleResultAccepted fixed 2023-07-01 14:59:16 +03:00
060aecc61c CArtifact refactoring 2023-06-30 19:41:26 +03:00
d44821e733 CArtifactInstance moved to own file 2023-06-30 19:41:19 +03:00
58fc2efd41 CGrowingArtifactInstance 2023-06-30 19:41:12 +03:00
f8023ad283 CScrollArtifactInstance 2023-06-30 19:41:04 +03:00
07c811dd67 CCombinedArtifactInstance refactoring 2023-06-30 19:40:57 +03:00
9cd246ab8b Merge pull request #2259 from IvanSavenko/campaign_refactoring
Fix accumulated issues with campaigns
2023-06-30 12:59:48 +03:00
cdc27d1fcf Play correct music file in campaign menu 2023-06-27 20:09:11 +03:00
0fdbf54937 Use HeroTypeID instead of int 2023-06-27 19:32:27 +03:00
4a5c1556a1 Always use std::vector<uint8_t> to store binary map 2023-06-27 16:27:35 +03:00
96eab03b16 Fix UI updates 2023-06-27 14:09:04 +03:00
cc91be3518 Added workaround for loading spellbook existance status 2023-06-27 13:58:45 +03:00
33cbd46406 Merge pull request #2252 from SoundSSGood/crash_fix
Crash fix. Cosmetic fixes.
2023-06-26 23:06:20 +03:00
7fc66c2797 Fix loading of experience for predefined heroes 2023-06-26 20:02:43 +03:00
3d66455cd1 Fix build 2023-06-26 19:44:38 +03:00
098e68b8dd Fix granting of building upgrade as bonus
Such as granting Mages Guild Level 4 when town does not have Mages Guild
Level 1
2023-06-26 17:15:59 +03:00
48ac84110b Replaced hero crossover logic with one that actually matches H3 2023-06-26 17:15:59 +03:00
e2bd98e21e CampaignRegions class encapsulation 2023-06-26 17:15:59 +03:00
f6b2f58da9 Use inheritance instead of composition for campaign header 2023-06-26 17:15:59 +03:00
a08fe09517 Added encapsulation for CampaignState class 2023-06-26 17:15:59 +03:00
8420a90aa4 Reorganization of campaigns code 2023-06-26 17:15:59 +03:00
d1e5a347ff Refactoring of campaign handler: rename types and use strong typing 2023-06-26 17:15:59 +03:00