Konstantin
|
6fa1b2b19f
|
vcmi: move bonuses to its own folder
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin P
|
03b8ce2d4c
|
HeroBonus: remove unused functions
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin P
|
4b2a09dae7
|
FactionMember: move code around
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin
|
1f54a1474c
|
vcmi: remove SHval (replace by simple val)
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin
|
af25ad0866
|
vcmi: split creatures and faction members
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin
|
f4f0fd5945
|
vcmi: magicResistance is IFactionMember property
It is no reason to keep it inside IBonusBearer
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin
|
4f7035d3ff
|
vcmi: add IFactionMember abstract class
|
2023-05-02 00:53:50 +03:00 |
|
nordsoft
|
0250e6fb92
|
Merge branch 'develop-upstream' into town-buildings
# Conflicts:
# client/CPlayerInterface.cpp
# client/windows/CTradeWindow.cpp
# config/objects/generic.json
# lib/mapObjects/CGMarket.cpp
# lib/mapObjects/CGMarket.h
# lib/mapObjects/CGTownInstance.cpp
# lib/mapObjects/CommonConstructors.cpp
# lib/mapObjects/CommonConstructors.h
|
2023-05-02 01:48:13 +04:00 |
|
Nordsoft91
|
c9b59735cf
|
Merge pull request #2101 from Nordsoft91/rewardable-expand
Part 2: refactoring for rewardable object
|
2023-05-02 01:19:57 +04:00 |
|
Ivan Savenko
|
916b41d9a7
|
Merge pull request #2078 from IvanSavenko/shortcuts
Basic shortcuts system
|
2023-05-01 21:45:52 +03:00 |
|
nordsoft
|
97a1758e8e
|
Merge remote-tracking branch 'upstream/develop' into rewardable-expand
|
2023-05-01 21:51:10 +04:00 |
|
nordsoft
|
eb577a03b5
|
Deprecating enum constants
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
87ff31531f
|
Rename parameter and remove extra check
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
07b2052679
|
Bit refactoring
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
68fa7aaf35
|
Remove limitations for amount of skills
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
a4fd6c1c92
|
Move trading window title to config
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
b29fc1a5f4
|
Fix movement bonus subtype
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
3d20538c1e
|
Implement markets
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
35a505288b
|
Fix json value reader
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
59bc9326e9
|
Remove excess pointer from market interface
|
2023-05-01 21:49:37 +04:00 |
|
Ivan Savenko
|
a654cc2391
|
Removed vstd::advance. Added vstd::next to handle similar cases.
|
2023-05-01 17:58:18 +03:00 |
|
Ivan Savenko
|
4aa232a60a
|
Merge pull request #2055 from SoundSSGood/cartifactholder-rework
Artifact related code refactoring part2 (client CArtifactHolder)
|
2023-05-01 02:33:08 +03:00 |
|
nordsoft
|
203d0a4f91
|
Merge remote-tracking branch 'upstream/develop' into rewardable-expand
# Conflicts:
# lib/JsonRandom.cpp
|
2023-05-01 02:07:20 +04:00 |
|
nordsoft
|
d2e0d6a754
|
Fix none-Of operator for skills
|
2023-05-01 01:35:01 +04:00 |
|
nordsoft
|
c7ade44d07
|
Fix skills loading from mods
|
2023-05-01 01:35:01 +04:00 |
|
nordsoft
|
6fc3bb6690
|
Attempt to fix msvs build 1
|
2023-05-01 01:15:48 +04:00 |
|
nordsoft
|
e9279cfbc4
|
Blocking dialogs supported
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
c4242c16ad
|
Compiling code
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
f9767a3179
|
Initial implementation for rewardable town building
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
2adcc89a0d
|
Rewardable town buildings prototype
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
3df0ce229e
|
get rid of building id
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
cc4277748d
|
Fix movement bonus subtype
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
67e6920e23
|
Implement markets
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
dfb078a4d9
|
Fix json value reader
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
30967b2813
|
Remove excess pointer from market interface
|
2023-05-01 00:14:53 +04:00 |
|
nordsoft
|
5bdd6c5cf5
|
Fix compiling
|
2023-04-30 22:36:25 +04:00 |
|
nordsoft
|
1b4d117790
|
deeper decoupling
|
2023-04-30 17:13:07 +04:00 |
|
Konstantin
|
86f5d6de69
|
vcmi: modernize headers
|
2023-04-30 13:35:54 +03:00 |
|
nordsoft
|
ac8f390cf8
|
Dividing rewarbadle objects into separate files
|
2023-04-30 04:39:31 +04:00 |
|
nordsoft
|
67bfacfcf7
|
Create of rewardable interface
|
2023-04-30 03:15:59 +04:00 |
|
nordsoft
|
c39a9cac63
|
Minor changes
|
2023-04-30 01:43:02 +04:00 |
|
nordsoft
|
e47bb3f1f9
|
Separate configuration and object
|
2023-04-30 00:59:02 +04:00 |
|
Ivan Savenko
|
d985ac90d3
|
Merge master -> develop
|
2023-04-28 22:57:25 +03:00 |
|
Ivan Savenko
|
346b8a4619
|
Merge pull request #2079 from rilian-la-te/cstack-some-private
vcmi: make some CStack properties private
|
2023-04-28 22:18:20 +03:00 |
|
Ivan Savenko
|
3dde827a9d
|
Merge pull request #2070 from rilian-la-te/make-tests-compile-pass-h3
vcmi: fix test compiling and passing
|
2023-04-28 22:18:00 +03:00 |
|
Ivan Savenko
|
93362eb692
|
Merge pull request #2083 from IvanSavenko/artifact_fix
Fix list of treasures getting overwritten
|
2023-04-28 15:41:38 +03:00 |
|
nordsoft
|
f6d91cab35
|
Fix portrait serialization
# Conflicts:
# lib/mapObjects/CGHeroInstance.cpp
|
2023-04-28 05:34:59 +04:00 |
|
nordsoft
|
421bbab1cc
|
Split CGTownInstance file
|
2023-04-28 05:30:49 +04:00 |
|
Ivan Savenko
|
881c434833
|
Fix list of treasures getting overwriteen leading to weird bugs
... such as having Grail in crypts or getting relics as starting
artifact
|
2023-04-27 23:40:56 +03:00 |
|
Konstantin P
|
54e4db3819
|
vcmi: fix abandoned mine resource loading
It was overshadowed by local variable
|
2023-04-27 20:59:55 +03:00 |
|
Konstantin P
|
e5f78a8997
|
vcmi: fix tests with latest develop
|
2023-04-27 20:59:55 +03:00 |
|
Konstantin
|
c400e83874
|
vcmi: fixup cast in Heal effect
|
2023-04-27 20:59:55 +03:00 |
|
Konstantin
|
bcf8ca1268
|
vcmi: fix map format for teams number
|
2023-04-27 20:59:55 +03:00 |
|
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 |
|
Ivan Savenko
|
fb739e7186
|
Merge beta -> develop
|
2023-04-26 22:48:08 +03:00 |
|
krs
|
1bb5077231
|
Renamed getMovementRange to ObtainMovementRange as per request
|
2023-04-26 21:56:20 +04:00 |
|
krs
|
e348193f7e
|
Tactics movement is limited to movement range
|
2023-04-26 21:56:20 +04: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 |
|
Nordsoft91
|
f39f208e05
|
Merge pull request #1915 from Nordsoft91/vcmi-campaign
VCMI campaigns format
|
2023-04-23 19:09:59 +04:00 |
|
SoundSSGood
|
1f4897e841
|
CArtifactSet::getSlotByInstance
|
2023-04-23 14:48:04 +03:00 |
|
DjWarmonger
|
1fde8b588b
|
Merge pull request #2025 from vcmi/zone_placement2
No interest or objections - merging.
|
2023-04-22 14:45:53 +02:00 |
|
Nordsoft91
|
a553a4aa66
|
Merge pull request #2030 from Nordsoft91/boats
|
2023-04-22 03:27:00 +04:00 |
|
Ivan Savenko
|
20de44d4a5
|
Reodered methods in file to group similar code
|
2023-04-20 22:04:24 +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
|
de22132cdf
|
Fix loading
|
2023-04-20 19:46:27 +04:00 |
|
nordsoft
|
db33558abc
|
Load custom campaigns from gzip
|
2023-04-20 19:22:27 +04:00 |
|
nordsoft
|
be6667acf5
|
Most questionable workaround
|
2023-04-20 19:21:37 +04:00 |
|
Tomasz Zieliński
|
88c436691d
|
Simplify logs
|
2023-04-20 16:26:06 +02:00 |
|
Tomasz Zieliński
|
09b493681b
|
More iterations, higher gravity constant for better results.
|
2023-04-20 16:13:30 +02:00 |
|
Tomasz Zieliński
|
55d7d7b9b5
|
Fix coefficients to make dead code actually be used sometimes.
|
2023-04-20 12:44:32 +02:00 |
|
Tomasz Zieliński
|
00d7901e59
|
Add another placement technique - swap two misplaced zones. Don't move same zones in consecutive iterations.
|
2023-04-20 12:24:57 +02:00 |
|
Ivan Savenko
|
4dc16b9ff7
|
Adventure map spells are no longer visible on units in battle
|
2023-04-20 13:16:45 +03:00 |
|
nordsoft
|
9ecf16ca23
|
Fix minor bugs
|
2023-04-20 03:20:00 +04:00 |
|
Konstantin P
|
4e18a3d579
|
CSerializer: fix debug assertion
Fix compilation in debug mode
|
2023-04-20 01:27:15 +04:00 |
|
Ivan Savenko
|
5a5aced67e
|
Fixed empty Black Market on game start
|
2023-04-19 23:11:17 +03:00 |
|
Ivan Savenko
|
4bb4d7e7a5
|
Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
Artifact related code refactoring part1 (initial)
|
2023-04-19 15:31:11 +03:00 |
|
Ivan Savenko
|
505a78a638
|
Merge pull request #2035 from rilian-la-te/native-fix-beta
vcmi: fix terrain penalties
|
2023-04-19 13:39:54 +03:00 |
|
Konstantin P
|
7c4badc890
|
CSerializer: fix debug assertion
Fix compilation in debug mode
|
2023-04-19 13:00:51 +03:00 |
|
Konstantin P
|
d94ce22e70
|
vcmi: fix terrain penalties
Fixes #2028
|
2023-04-19 12:41:54 +03:00 |
|
Tomasz Zieliński
|
c34b1cd713
|
Fix warning-as-errors.
|
2023-04-19 08:45:23 +02:00 |
|
nordsoft
|
5cf9fbbe02
|
Fix compiling
|
2023-04-19 03:11:13 +04:00 |
|
nordsoft
|
f464ca3560
|
Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
# Conflicts:
# lib/mapping/CCampaignHandler.cpp
|
2023-04-19 02:45:49 +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
|
008db447e7
|
Minor changes
|
2023-04-19 02:11:24 +04:00 |
|
nordsoft
|
22da7a931d
|
Boat as bonus system node
|
2023-04-19 01:11:51 +04:00 |
|
Tomasz Zieliński
|
d841655c1d
|
Scale fuzzy edges with map size.
|
2023-04-18 22:34:26 +02:00 |
|
Konstantin
|
4a79e2ccd9
|
CSerializer: fix any_cast
|
2023-04-18 23:29:47 +03:00 |
|
nordsoft
|
d1dacd45e2
|
Animations from config
|
2023-04-19 00:14:15 +04:00 |
|
Tomasz Zieliński
|
15592c3aff
|
Change metric to create more interesting zone shapes.
|
2023-04-18 22:01:51 +02:00 |
|
nordsoft
|
59a1a19d4a
|
Summon boat for real boats only
|
2023-04-18 22:21:26 +04:00 |
|
Tomasz Zieliński
|
39154737a5
|
Use std::optional instead of boost::optional.
|
2023-04-18 19:34:54 +02:00 |
|
Tomasz Zieliński
|
6551585f96
|
Start with low stifness to let zones pass through each other - typical temperature fall.
(cherry picked from commit 435b9f7881)
|
2023-04-18 19:21:33 +02:00 |
|
Tomasz Zieliński
|
8d5cd6d072
|
Randomize starting positions a bit so zones don't fall exactly on the grid.
(cherry picked from commit 33eb28b570)
|
2023-04-18 19:21:28 +02:00 |
|
Tomasz Zieliński
|
fc91152da7
|
Fixed zones getting actually randomized after construction. Tweaks to algorithm, now it's considerably better.
(cherry picked from commit c13019059f)
|
2023-04-18 19:21:19 +02:00 |
|
Tomasz Zieliński
|
2d7a819939
|
Parameters which work well for Jebus - accessible desert and Blue placed away from Red
(cherry picked from commit 42c6127c79)
|
2023-04-18 19:21:13 +02:00 |
|
Tomasz Zieliński
|
494f4eaa3f
|
Simple solution that works - by ChatGPT :)
(cherry picked from commit 7c6e4bc2fe)
|
2023-04-18 19:21:06 +02:00 |
|
Tomasz Zieliński
|
a1f094776f
|
Use fixed starting positions for now.
(cherry picked from commit 43c51805f5)
|
2023-04-18 19:20:57 +02:00 |
|