|
|
77b58bc66d
|
Cleaned up object constructors to reduce duplicated code
|
2023-06-16 17:59:50 +03:00 |
|
|
|
4d947be287
|
Adventure map shipyard nwo has configurable boat type
|
2023-06-16 17:59:50 +03:00 |
|
|
|
487f441f47
|
Implemented boat selection for town shipyards
|
2023-06-16 17:59:49 +03:00 |
|
|
|
6aedb99117
|
Cleaned up IShipyard interface
|
2023-06-16 17:59:10 +03:00 |
|
|
|
a94b68e6aa
|
Hill fort upgrade costs are now loaded from json
|
2023-06-16 17:59:10 +03:00 |
|
|
|
2e7c382612
|
Moved creature upgrade logic to CGObjectInstance inheritors
|
2023-06-16 17:59:10 +03:00 |
|
|
|
fc190b14bb
|
Spell shrines can now be configured in json
|
2023-06-16 17:59:10 +03:00 |
|
|
|
5cfbdd2967
|
Partially split CommonConstructors.cpp into few separate files
|
2023-06-16 17:59:10 +03:00 |
|
|
|
c52b5d3bd0
|
Merge pull request #2216 from vcmi/water_prison_tavern
Water Prison & Tavern
|
2023-06-16 16:30:05 +02:00 |
|
|
|
190244369c
|
Fix empty Pandora message
|
2023-06-15 22:06:31 +02:00 |
|
|
|
adec58f5bf
|
- Set fixed boat type for Tavern / Prison
- Move magical boat offset to static function
|
2023-06-15 17:53:18 +02:00 |
|
|
|
f1356dd5bf
|
Merge remote-tracking branch 'origin/develop' into water_prison_tavern
|
2023-06-14 20:58:02 +02:00 |
|
|
|
651b1a8bea
|
Remove unused variable.
|
2023-06-08 09:27:55 +02:00 |
|
|
|
351d596bdc
|
Handle water Prisons and Taverns.
|
2023-06-08 09:17:08 +02:00 |
|
|
|
f6c2d5cba7
|
hotfix
|
2023-06-07 13:08:04 +03:00 |
|
|
|
1e9eea30e1
|
Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop
|
2023-06-05 18:53:17 +03:00 |
|
|
|
97b3b2e147
|
Fix build
|
2023-06-03 00:48:32 +03:00 |
|
|
|
d6a357fd17
|
Split some map object files into smaller files. Reduced includes usage.
|
2023-06-02 21:47:37 +03:00 |
|
|
|
b04b11b9d1
|
Merge pull request #2175 from IvanSavenko/map_format_mappings
HotA map format support - object mapping
|
2023-06-01 22:06:18 +03:00 |
|
|
|
312b703a78
|
Fixed mapping of hota objects
|
2023-05-31 23:18:39 +03:00 |
|
|
|
acac42291e
|
Remove excessive CMap.h includes
|
2023-05-31 23:18:38 +03:00 |
|
|
|
8d0dcd6ad7
|
All h3m bitsets are now loaded inside mapReader
|
2023-05-31 23:01:57 +03:00 |
|
|
|
e82acf4840
|
CGHeroInstance: always add obligatory skills
Fixes #2198
|
2023-05-31 20:03:59 +03:00 |
|
|
|
1366825f08
|
final fixup
|
2023-05-24 16:10:06 +03:00 |
|
|
|
021f94a579
|
artifact utils
|
2023-05-17 17:00:31 +03:00 |
|
|
|
cb8201876b
|
Merge pull request #1822 from rilian-la-te/spell-mechanics-v3
Bonus refactoring, part3 (save-incompatible)
|
2023-05-09 13:10:04 +03:00 |
|
|
|
057a33c508
|
SpellSchool: use identifier instead of int
Needs redifinition of MAGIC_SCHOOL_SKILL in all mods
|
2023-05-07 20:37:32 +03:00 |
|
|
|
059ccdc9bc
|
Fix for serialization bug
|
2023-05-07 04:02:52 +04:00 |
|
|
|
7c029bccba
|
Show info nin modal window always
|
2023-05-07 03:19:18 +04:00 |
|
|
|
9e1cdc410f
|
vcmi: replace school bonuses to unified ones
Except immunity now
|
2023-05-05 21:30:45 +03:00 |
|
|
|
8764765dcf
|
Bonus: complex duration as bitset
Fixes #2125
|
2023-05-05 21:30:45 +03:00 |
|
|
|
67331c5520
|
Fix after merge
|
2023-05-05 00:14:44 +04:00 |
|
|
|
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 |
|
|
|
9984351302
|
Fix object clearing
|
2023-05-04 15:03:18 +04:00 |
|
|
|
05eccbc2bb
|
vcmi: split bonus to enumerator and HeroBonus.h
|
2023-05-03 18:01:06 +03:00 |
|
|
|
92dcfd1f68
|
Fix garrisons hero
|
2023-05-02 15:09:02 +04:00 |
|
|
|
7996123dfa
|
Rename constant
|
2023-05-02 14:45:53 +04:00 |
|
|
|
a6de9097be
|
vcmi: rename HeroBonus.h to Bonus.h
|
2023-05-02 11:20:58 +03:00 |
|
|
|
c4cf2a100b
|
Fix behavior for hero bought in town tavern
|
2023-05-02 04:44:09 +04:00 |
|
|
|
b6eb2dc060
|
vcmi: rename IFactionMember and ICreature
|
2023-05-02 00:54:53 +03:00 |
|
|
|
1d34c73c2d
|
vcmi: split CBonusSystemNode, BonusParams and prop
More splitting of HeroBonus.h
|
2023-05-02 00:54:53 +03:00 |
|
|
|
34c1d4f3e9
|
vcmi: move CBonusProxy and friends to new file
To decouple HeroBonus.h more
|
2023-05-02 00:53:51 +03:00 |
|
|
|
6fa1b2b19f
|
vcmi: move bonuses to its own folder
|
2023-05-02 00:53:50 +03:00 |
|
|
|
4f7035d3ff
|
vcmi: add IFactionMember abstract class
|
2023-05-02 00:53:50 +03:00 |
|
|
|
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 |
|
|
|
c9b59735cf
|
Merge pull request #2101 from Nordsoft91/rewardable-expand
Part 2: refactoring for rewardable object
|
2023-05-02 01:19:57 +04:00 |
|
|
|
916b41d9a7
|
Merge pull request #2078 from IvanSavenko/shortcuts
Basic shortcuts system
|
2023-05-01 21:45:52 +03:00 |
|
|
|
97a1758e8e
|
Merge remote-tracking branch 'upstream/develop' into rewardable-expand
|
2023-05-01 21:51:10 +04:00 |
|
|
|
87ff31531f
|
Rename parameter and remove extra check
|
2023-05-01 21:49:37 +04:00 |
|
|
|
07b2052679
|
Bit refactoring
|
2023-05-01 21:49:37 +04:00 |
|
