Asirome
|
1fa252add7
|
Update spanish.json
|
2023-05-05 13:49:42 +02:00 |
|
Ivan Savenko
|
095064d288
|
Merge pull request #2118 from IvanSavenko/mod_repo_url
Use separate json for vcmi-1.3
|
2023-05-05 12:06:44 +03:00 |
|
Tomasz Zieliński
|
eb50ae3aa7
|
- Pre-distribute max number of Prisons
- Minor refactor for artifact and hero pool management
|
2023-05-05 10:30:36 +02:00 |
|
Tomasz Zieliński
|
d137f7157c
|
Merge remote-tracking branch 'origin/develop' into parellel_rmg
# Conflicts:
# lib/rmg/CZonePlacer.h
# lib/rmg/TreasurePlacer.h
|
2023-05-05 09:00:44 +02:00 |
|
Tomasz Zieliński
|
35ec720555
|
Forget objects that were already replaced iwth an artifact.
|
2023-05-05 07:16:38 +02:00 |
|
nordsoft
|
67331c5520
|
Fix after merge
|
2023-05-05 00:14:44 +04:00 |
|
nordsoft
|
ce80c83ca2
|
Merge remote-tracking branch 'upstream/develop' into town-buildings
# Conflicts:
# lib/CTownHandler.cpp
# lib/rewardable/Interface.cpp
|
2023-05-04 22:23:44 +04:00 |
|
Asirome
|
04e59c7f2e
|
Update spanish.ts
|
2023-05-04 20:05:09 +02:00 |
|
Asirome
|
84127e6104
|
Update spanish.json
|
2023-05-04 20:03:28 +02:00 |
|
Ivan Savenko
|
4c93b8f3f2
|
Use separate json for vcmi-1.3
|
2023-05-04 19:38:36 +03:00 |
|
Ivan Savenko
|
9373239c03
|
Merge pull request #2108 from rilian-la-te/bonuses-refactor-p2
Split HeroBonus.h to pieces, part2
|
2023-05-04 19:14:39 +03:00 |
|
nordsoft
|
9984351302
|
Fix object clearing
|
2023-05-04 15:03:18 +04:00 |
|
Konstantin
|
05eccbc2bb
|
vcmi: split bonus to enumerator and HeroBonus.h
|
2023-05-03 18:01:06 +03:00 |
|
Nordsoft91
|
9f5ee885b4
|
Merge pull request #2105 from rilian-la-te/bonuses-refactor
Split HeroBonus.h to pieces: part1
|
2023-05-02 15:39:49 +04:00 |
|
nordsoft
|
92dcfd1f68
|
Fix garrisons hero
|
2023-05-02 15:09:02 +04:00 |
|
nordsoft
|
7996123dfa
|
Rename constant
|
2023-05-02 14:45:53 +04:00 |
|
nordsoft
|
96420bfc05
|
Fix configurable reward for non-query scenrio
|
2023-05-02 14:45:42 +04:00 |
|
Konstantin
|
fbc05c70ac
|
vcmi: camelCase methods of new classes
Also use EGameSettings for clamping morale and luck
|
2023-05-02 12:09:13 +03:00 |
|
Konstantin
|
a6de9097be
|
vcmi: rename HeroBonus.h to Bonus.h
|
2023-05-02 11:20:58 +03:00 |
|
nordsoft
|
c4cf2a100b
|
Fix behavior for hero bought in town tavern
|
2023-05-02 04:44:09 +04:00 |
|
nordsoft
|
18efde3b02
|
Fix incorrect merge
|
2023-05-02 01:58:19 +04:00 |
|
Konstantin
|
3df5a8e415
|
vcmi: split selectors from HeroBonus.h
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
29c76fb9bf
|
HeroBonus: split BonusList
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
48bcfe74f7
|
HeroBonus: move TBonusSubtype from GameConstants.h
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
ce37380e99
|
HeroBonus: remove unused template
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
4866c2fe5c
|
vcmi: split IBonusBearer
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
b6eb2dc060
|
vcmi: rename IFactionMember and ICreature
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
1d34c73c2d
|
vcmi: split CBonusSystemNode, BonusParams and prop
More splitting of HeroBonus.h
|
2023-05-02 00:54:53 +03:00 |
|
Konstantin
|
713e3004df
|
vcmi: rename updater and limiter files
|
2023-05-02 00:53:51 +03:00 |
|
Konstantin
|
4894280c6b
|
HeroBonus: remove unused function
|
2023-05-02 00:53:51 +03:00 |
|
Konstantin
|
34c1d4f3e9
|
vcmi: move CBonusProxy and friends to new file
To decouple HeroBonus.h more
|
2023-05-02 00:53:51 +03:00 |
|
Konstantin
|
a2d4c72016
|
vcmi: morale and luck now also IFactionMember
Not all bonus bearers have morale and luck, only faction members
|
2023-05-02 00:53:51 +03:00 |
|
Konstantin
|
e37f798a68
|
vcmi: split bonus updaters
|
2023-05-02 00:53:50 +03:00 |
|
Konstantin
|
416faf521e
|
vcmi: move limiters outside of HeroBonus.cpp
This will help for recompilation.
|
2023-05-02 00:53:50 +03:00 |
|
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
|
b0a11ac9d6
|
Merge pull request #2097 from vcmi/fix_3SM3d
Add some non-zero value treasures to fix empty zones
|
2023-05-01 21:54:46 +03: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
|
b6270fae49
|
Remove deprecated from config
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
a507a4c1ec
|
Remove deprecated objects from map editor
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
fdac1d66d8
|
Fix warnings
|
2023-05-01 21:49:37 +04:00 |
|
nordsoft
|
eb577a03b5
|
Deprecating enum constants
|
2023-05-01 21:49:37 +04:00 |
|