Konstantin P
|
b472c89276
|
vcmi: make some CStack properties private
There is a getters for this properties already available
|
2023-04-27 20:58:49 +03:00 |
|
nordsoft
|
c899956e71
|
Fix boat visibility
|
2023-04-26 02:58:11 +04:00 |
|
Ivan Savenko
|
48abf46824
|
Merge pull request #2005 from IvanSavenko/advmap_refactor
Refactoring of adventure map interface
|
2023-04-24 17:19:22 +03:00 |
|
Ivan Savenko
|
7db67a3101
|
int3 now has proper hasher function
|
2023-04-20 22:04:24 +03:00 |
|
Ivan Savenko
|
f1902ab247
|
Initial refactoring to encapsulate adventure map
|
2023-04-20 22:03:28 +03:00 |
|
nordsoft
|
de159df481
|
Rename boats
|
2023-04-20 21:20:51 +04:00 |
|
nordsoft
|
0a28262c15
|
Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
# AI/VCAI/Pathfinding/AINodeStorage.cpp
|
2023-04-19 02:22:19 +04:00 |
|
nordsoft
|
22da7a931d
|
Boat as bonus system node
|
2023-04-19 01:11:51 +04:00 |
|
nordsoft
|
ed798b06da
|
Prepare transport enum
|
2023-04-18 13:04:49 +04:00 |
|
Konstantin
|
54eb550eb9
|
vcmi: remove unused functions now
|
2023-04-17 00:43:13 +03:00 |
|
Konstantin
|
7a5775a9f9
|
vcmi: use std::optional
|
2023-04-17 00:43:13 +03:00 |
|
Konstantin
|
0d35606a44
|
vcmi: use std::variant
|
2023-04-17 00:43:13 +03:00 |
|
Ivan Savenko
|
506c3d29bc
|
Replaced vstd clamp with std version
|
2023-04-12 01:03:14 +03:00 |
|
Ivan Savenko
|
63b197b78a
|
Converted attributes to use c++17 functionality
|
2023-04-12 01:03:14 +03:00 |
|
nordsoft
|
bfc75ccd39
|
Merge remote-tracking branch 'upstream/develop' into battle-dialog
|
2023-04-11 02:22:42 +04:00 |
|
Ivan Savenko
|
42b2be4bbb
|
Merge pull request #1908 from SoundSSGood/art-client-server-fixes
Artifact related fixes
|
2023-04-10 18:26:49 +03:00 |
|
SoundSSGood
|
ea7dd14d8b
|
client is able to erase artifact
|
2023-04-08 00:41:55 +03:00 |
|
nordsoft
|
e85593dbb3
|
Save & restore mana
|
2023-04-06 21:19:46 +04:00 |
|
nordsoft
|
ce3028bd73
|
Intermediate commit
|
2023-04-06 19:34:07 +04:00 |
|
Konstantin
|
11b237a23c
|
vcmi: massive refactoring v1
|
2023-04-05 22:33:12 +03:00 |
|
Ivan Savenko
|
307065a633
|
Merge beta into develop
|
2023-04-04 16:06:20 +03:00 |
|
Ivan Savenko
|
ea1d177c9b
|
Fixed false error messages on game startup
|
2023-03-31 01:28:56 +03:00 |
|
Konstantin
|
89fd742c1a
|
NetPacks: add BATTLE type to GiveBonus
Will work as battlefield effect of current battle.
|
2023-03-30 12:41:17 +03:00 |
|
Konstantin
|
5716925b47
|
NetPacks: change GiveBonus enum to enum class.
|
2023-03-30 12:41:17 +03:00 |
|
Ivan Savenko
|
b2f5042942
|
Merge pull request #1783 from vcmi/beta
Merge beta -> develop
|
2023-03-27 21:21:25 +03:00 |
|
Konstantin
|
5b50191af7
|
NetPacksLib: remove obstacle ACTIVATE* actions
Actually these actions was not working anyway.
|
2023-03-26 22:59:34 +03:00 |
|
SoundSSGood
|
f0f9eecf97
|
Backpack limit part5. End of battle. Other stuff
|
2023-03-21 12:14:33 +02:00 |
|
Ivan Savenko
|
383387ef29
|
Integrated defaultMods into mod system
|
2023-03-16 17:55:09 +02:00 |
|
Konstantin
|
bc228a938a
|
vcmi: use enum class for EComponentType
There is really no reason not to use it
|
2023-03-11 21:41:57 +03:00 |
|
Konstantin
|
4617ce10e5
|
vcmi: allow showing more than one components in infobar
Up to 8, AFAIK. So, we can show multi-reward in infobox now.
One issue remain - cannot dynamically choose components size
based on text size.
|
2023-03-11 21:41:57 +03:00 |
|
Ivan Savenko
|
4260726e4b
|
Provide encoding information to maps & campaigns loaders
|
2023-03-05 17:39:27 +02:00 |
|
Ivan Savenko
|
72fe1fcfa9
|
Fix minimap updating on hero loss
|
2023-02-14 11:32:19 +02:00 |
|
Andrii Danylchenko
|
9f55666931
|
rework netpacks to avoid double typeinfo
|
2023-02-13 20:26:39 +02:00 |
|
Konstantin
|
286c1e522e
|
vcmi: modernize netpacks
|
2023-02-09 20:22:48 +03:00 |
|
Ivan Savenko
|
388ed88b5d
|
All artifact strings now pass through translator
|
2023-01-20 15:18:36 +02:00 |
|
Ivan Savenko
|
17fc9d8d8f
|
Merge with vcmi/develop
|
2023-01-18 01:04:34 +02:00 |
|
Ivan Savenko
|
1d7f004658
|
Implemented reinforced walls in towns with Castle
|
2023-01-13 01:09:24 +02:00 |
|
Ivan Savenko
|
500cf7f15d
|
EWallPart & EWallState are now enum class
|
2023-01-13 00:35:58 +02:00 |
|
Ivan Savenko
|
1e37e66e6c
|
Replaced Terrain::BORDER and WRONG with NONE
|
2023-01-10 20:09:09 +02:00 |
|
Ivan Savenko
|
4f3ea0d1d9
|
Renamed Terrain.h/cpp -> TerrainHandler.h/cpp
|
2023-01-10 00:01:35 +02:00 |
|
Ivan Savenko
|
7c7ae26e67
|
Map/Road/River identifiers are now private members
|
2023-01-10 00:01:35 +02:00 |
|
Ivan Savenko
|
e1799379dd
|
Terrain/Road/River handler are now in compileable state
|
2023-01-10 00:01:35 +02:00 |
|
Ivan Savenko
|
1468f6aded
|
Converted terrainTypeHandler into proper handler class
|
2023-01-10 00:01:35 +02:00 |
|
Ivan Savenko
|
5d80457eda
|
Merge with vcmi/develop branch
|
2022-12-30 00:52:23 +02:00 |
|
Ivan Savenko
|
325c29da0d
|
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
|
2022-12-23 14:51:34 +02:00 |
|
Ivan Savenko
|
eb20a4b208
|
Merge remote-tracking branch 'vcmi/develop' into warnings_fix
|
2022-12-23 14:40:45 +02:00 |
|
Ivan Savenko
|
f073c676f9
|
Merge 1.1 release into develop
|
2022-12-23 14:17:18 +02:00 |
|
Andrii Danylchenko
|
cf97bf2cfd
|
Remove unused code
|
2022-12-18 13:11:02 +02:00 |
|
Andrii Danylchenko
|
1555c51313
|
fix assertion
|
2022-12-18 12:29:03 +02:00 |
|
Ivan Savenko
|
52fc5b3c39
|
Exploded mines now send ACTIVATE flag to client to play effect
|
2022-12-17 19:37:00 +02:00 |
|