Ivan Savenko
|
7f1b982264
|
Implemented support for showing amount of guards in banks
|
2023-07-19 13:17:50 +03:00 |
|
Tomasz Zieliński
|
ad5081f9fe
|
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
|
2023-07-19 12:05:30 +02:00 |
|
Ivan Savenko
|
556763fb7b
|
Fixed handling of tactics
|
2023-07-18 22:02:35 +03:00 |
|
Tomasz Zieliński
|
e2940d2b0c
|
Fix Subterranean Gates incorrectly placed outside the map
(cherry picked from commit acf455a1c3b02c0f8d5085c23fe2230779b7560b)
|
2023-07-18 19:28:36 +02:00 |
|
Tomasz Zieliński
|
545f047cae
|
Fix HoTA guard once again
(cherry picked from commit 138a7c8024573f46962ad0f6e8e03ba53fa56076)
|
2023-07-18 19:28:20 +02:00 |
|
Ivan Savenko
|
1bf6bbd9b6
|
Significantly simplified threading model in battles
|
2023-07-18 19:55:59 +03:00 |
|
Ivan Savenko
|
5e8a778e7d
|
Attempt to fix / trace crashes from Google Play statistics
|
2023-07-18 17:31:21 +03:00 |
|
Tomasz Zieliński
|
9b649b0b79
|
Build fix
|
2023-07-18 10:55:26 +02:00 |
|
Tomasz Zieliński
|
03b3771f19
|
Ban Navigation on maps without water
|
2023-07-18 10:54:36 +02:00 |
|
Tomasz Zieliński
|
025b0814c8
|
+ Handled banning spells and artifacts
+ Rename allowedSpell => allowedSpells
|
2023-07-17 17:21:28 +02:00 |
|
Tomasz Zieliński
|
fbd1d728ec
|
Water heroes will now be correctly banned on random maps.
|
2023-07-17 16:23:34 +02:00 |
|
Ivan Savenko
|
6fd3c0f8bc
|
Fixes loading of hota maps with enabled wog mod (identifiers conflict)
|
2023-07-17 16:38:23 +03:00 |
|
Ivan Savenko
|
22b09f7164
|
Fixed parsing of some hota campaigns
|
2023-07-17 16:22:43 +03:00 |
|
Ivan Savenko
|
81d0ac4d6b
|
Removed excessive warnings from console - this is legal case
|
2023-07-17 16:22:29 +03:00 |
|
Tomasz Zieliński
|
bda126a1fd
|
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
|
2023-07-16 18:54:50 +02:00 |
|
Ivan Savenko
|
a4ba5a9b65
|
Merge pull request #2327 from IvanSavenko/bugfixing_from_stream
Fix accumulated minor bugs
|
2023-07-15 21:55:19 +03:00 |
|
Ivan Savenko
|
baa865d857
|
Extracted message-related functionality of CGameHandler to separate file
|
2023-07-15 21:01:13 +03:00 |
|
Ivan Savenko
|
463efea7bb
|
Fix hero retreating handling & code cleanup
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
cb16636fce
|
Implemented preserving hero on retreat on 7th day after end of turn
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
9a38d8ea97
|
Implemented tavern slot selection using rules similar to H3
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
ec7e046617
|
Fix hero pool persistency between saves
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
539c508870
|
Implemented persistent random seed for hero pool
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
a2d2ecc96f
|
Roll first for hero class, and then - for actual hero for tavern
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
f8187ce1d8
|
Fix regressions
|
2023-07-15 19:55:30 +03:00 |
|
Ivan Savenko
|
19ace6a849
|
Moved hero pool logic to the separate files
|
2023-07-15 19:55:29 +03:00 |
|
Ivan Savenko
|
1c55835b8b
|
Merge pull request #2329 from rilian-la-te/fix-M-stack
CCreatureHandler: fix positive morale
|
2023-07-15 19:46:40 +03:00 |
|
Ivan Savenko
|
199f9eb6f5
|
Fix build
|
2023-07-15 19:29:11 +03:00 |
|
Ivan Savenko
|
8129cbc514
|
Allow dismissing hero from town
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
8ed5f412e2
|
Show per-type object names in editor
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
0a27539fb5
|
Fixed crashes on loading with Tides of War mod
|
2023-07-15 16:09:44 +03:00 |
|
Ivan Savenko
|
8a92941681
|
Allow merging stack on recruitment to give place for recruited unit
|
2023-07-15 16:09:44 +03:00 |
|
Tomasz Zieliński
|
a200e87640
|
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
|
2023-07-15 14:36:32 +02:00 |
|
Tomasz Zieliński
|
a968903c51
|
Fix HoTA guard offset in RMG
|
2023-07-14 16:45:13 +02:00 |
|
Konstantin P
|
6988b288ba
|
Rect: fix serialization
|
2023-07-14 11:39:04 +03:00 |
|
Konstantin P
|
118b68349a
|
CCreatureHandler: fix positive morale
|
2023-07-14 11:33:21 +03:00 |
|
Ivan Savenko
|
37f3560b9c
|
Fix build in debug mode
|
2023-07-11 15:21:31 +03:00 |
|
Ivan Savenko
|
9acab48bc3
|
Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
|
2023-07-11 14:36:08 +03:00 |
|
DjWarmonger
|
f6cc61e0be
|
Merge pull request #2297 from vcmi/rmg_roads
Rmg roads
|
2023-07-11 09:25:24 +02:00 |
|
Ivan Savenko
|
8750aa2c5b
|
Merged server savegame and (broken and unused) client savegame files
|
2023-07-09 15:30:47 +03:00 |
|
Tomasz Zieliński
|
700d8459ac
|
Checking flags and conditions
|
2023-07-09 11:16:36 +02:00 |
|
Tomasz Zieliński
|
b4fcf20b19
|
Fix
|
2023-07-08 10:26:10 +02:00 |
|
Tomasz Zieliński
|
fabad20aa1
|
Compile fixes, cleanup
|
2023-07-08 10:21:36 +02:00 |
|
Tomasz Zieliński
|
3711ce846e
|
Check road settings for connections
|
2023-07-08 09:11:20 +02:00 |
|
Tomasz Zieliński
|
730b36612c
|
Respect GUI settings for roads. By default, all road types are enabled.
|
2023-07-08 08:44:10 +02:00 |
|
Tomasz Zieliński
|
27c4882237
|
Compile fix
|
2023-07-07 21:40:55 +02:00 |
|
Tomasz Zieliński
|
7e07ed65c8
|
- Check road connection for Shipyards
|
2023-07-07 21:27:24 +02:00 |
|
Tomasz Zieliński
|
1cad64c470
|
Move road flag to placeObject() method
|
2023-07-07 20:17:20 +02:00 |
|
Tomasz Zieliński
|
3889193a48
|
Reorganize namespaces
|
2023-07-07 16:32:17 +02:00 |
|
Ivan Savenko
|
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 |
|
Ivan Savenko
|
ae8579558d
|
Merge pull request #2282 from IvanSavenko/adventure_map_fixes
Adventure map fixes for 1.3
|
2023-07-07 14:27:58 +03:00 |
|
Tomasz Zieliński
|
8463fe200c
|
Merge remote-tracking branch 'origin/develop' into rmg_roads
|
2023-07-07 08:19:52 +02:00 |
|
DjWarmonger
|
f9e1a70ab8
|
Merge pull request #2278 from vcmi/rmg_factions
Rmg factions
|
2023-07-06 22:15:36 +02:00 |
|
Tomasz Zieliński
|
0d3ac4a502
|
- Add new option for connection
- Store info about objects and roads in RequiredObjectInfo
|
2023-07-06 22:15:00 +02:00 |
|
Tomasz Zieliński
|
a592f5604b
|
Add "bannedTerrains", "bannedMonsters" options for templates.
|
2023-07-06 17:30:23 +02:00 |
|
Tomasz Zieliński
|
06449ce7b0
|
Another compile fix
|
2023-07-05 21:18:30 +02:00 |
|
Tomasz Zieliński
|
506a0cdda0
|
- Better name as suggested in PR
- Compile fix
|
2023-07-05 21:08:32 +02:00 |
|
Ivan Savenko
|
3bce245780
|
Moved hardcoded terrain palette-cycling animations to config
|
2023-07-05 22:07:20 +03:00 |
|
Tomasz Zieliński
|
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 |
|
SoundSSGood
|
9b5f6ec7cf
|
CArtifact getters setters
|
2023-07-05 15:48:08 +03:00 |
|
Nikolay Kostov
|
fa3568dca1
|
Small fix in characters encodings in Languages.h
|
2023-07-05 13:12:49 +03:00 |
|
Ivan Savenko
|
1cbc6457ce
|
Fix possible assertion failure on removing non-owned town
|
2023-07-04 20:28:02 +03:00 |
|
SoundSSGood
|
fd9c7352a0
|
suggested changes
|
2023-07-03 22:54:03 +03:00 |
|
Ivan Savenko
|
5f8a125a98
|
Updated translations
|
2023-07-03 14:34:53 +03:00 |
|
Ivan Savenko
|
8ac56f06b0
|
Added Hungarian
|
2023-07-03 14:34:53 +03:00 |
|
Ivan Savenko
|
bcc335e0a8
|
Added Finnish, Portuguese, Swedish, Turkish languages
|
2023-07-03 14:34:53 +03:00 |
|
Ivan Savenko
|
4b366e1fe8
|
Added new languages: Czech, Italian, Korean
|
2023-07-03 14:34:53 +03:00 |
|
Ivan Savenko
|
8efa7911b7
|
Implemented "Allied Adventure Map AI" option
|
2023-07-03 14:34:53 +03:00 |
|
Ivan Savenko
|
fc696fa0b3
|
Added detection of OS language on first run
|
2023-07-03 14:34:53 +03:00 |
|
Tomasz Zieliński
|
73b78dd75e
|
Handle "bannedTowns" (alredy used on Jebus).
|
2023-07-02 11:41:47 +02:00 |
|
Tomasz Zieliński
|
cb4d818241
|
Inherit terrain types only after all terrain Ids are resolved.
|
2023-07-02 09:28:51 +02:00 |
|
Tomasz Zieliński
|
04e2cf728e
|
Allow all terrains from mods by default (including Wasteland).
|
2023-07-02 08:13:06 +02:00 |
|
Tomasz Zieliński
|
dc3dda7676
|
Fix new factions not appearing in random maps
|
2023-07-01 15:25:20 +02:00 |
|
SoundSSGood
|
11a109f3af
|
fix build
|
2023-07-01 14:59:23 +03:00 |
|
SoundSSGood
|
aa90433418
|
bump serialization version
|
2023-07-01 14:59:23 +03:00 |
|
SoundSSGood
|
670999d40e
|
BattleResultAccepted fixed
|
2023-07-01 14:59:16 +03:00 |
|
SoundSSGood
|
060aecc61c
|
CArtifact refactoring
|
2023-06-30 19:41:26 +03:00 |
|
SoundSSGood
|
d44821e733
|
CArtifactInstance moved to own file
|
2023-06-30 19:41:19 +03:00 |
|
SoundSSGood
|
58fc2efd41
|
CGrowingArtifactInstance
|
2023-06-30 19:41:12 +03:00 |
|
SoundSSGood
|
f8023ad283
|
CScrollArtifactInstance
|
2023-06-30 19:41:04 +03:00 |
|
SoundSSGood
|
07c811dd67
|
CCombinedArtifactInstance refactoring
|
2023-06-30 19:40:57 +03:00 |
|
Ivan Savenko
|
9cd246ab8b
|
Merge pull request #2259 from IvanSavenko/campaign_refactoring
Fix accumulated issues with campaigns
|
2023-06-30 12:59:48 +03:00 |
|
Ivan Savenko
|
cdc27d1fcf
|
Play correct music file in campaign menu
|
2023-06-27 20:09:11 +03:00 |
|
Ivan Savenko
|
0fdbf54937
|
Use HeroTypeID instead of int
|
2023-06-27 19:32:27 +03:00 |
|
Ivan Savenko
|
4a5c1556a1
|
Always use std::vector<uint8_t> to store binary map
|
2023-06-27 16:27:35 +03:00 |
|
Ivan Savenko
|
96eab03b16
|
Fix UI updates
|
2023-06-27 14:09:04 +03:00 |
|
Ivan Savenko
|
cc91be3518
|
Added workaround for loading spellbook existance status
|
2023-06-27 13:58:45 +03:00 |
|
Ivan Savenko
|
33cbd46406
|
Merge pull request #2252 from SoundSSGood/crash_fix
Crash fix. Cosmetic fixes.
|
2023-06-26 23:06:20 +03:00 |
|
Ivan Savenko
|
7fc66c2797
|
Fix loading of experience for predefined heroes
|
2023-06-26 20:02:43 +03:00 |
|
Ivan Savenko
|
3d66455cd1
|
Fix build
|
2023-06-26 19:44:38 +03:00 |
|
Ivan Savenko
|
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 |
|
Ivan Savenko
|
48ac84110b
|
Replaced hero crossover logic with one that actually matches H3
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
e2bd98e21e
|
CampaignRegions class encapsulation
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
f6b2f58da9
|
Use inheritance instead of composition for campaign header
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
a08fe09517
|
Added encapsulation for CampaignState class
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
8420a90aa4
|
Reorganization of campaigns code
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
d1e5a347ff
|
Refactoring of campaign handler: rename types and use strong typing
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
453d441562
|
Remove heroes placeholders even in single scenarios
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
2882e2d248
|
Added loading of reserved heroes from H3M
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
2b7e554807
|
Formatting & cleanup
|
2023-06-26 17:15:59 +03:00 |
|
Ivan Savenko
|
0fb284f948
|
Extracted campaign-related code from GameState into a separate class
|
2023-06-26 17:15:59 +03:00 |
|