874 Commits

Author	SHA1	Message	Date
Ivan Savenko	6aedb99117	Cleaned up IShipyard interface	2023-06-16 17:59:10 +03:00
Ivan Savenko	a94b68e6aa	Hill fort upgrade costs are now loaded from json	2023-06-16 17:59:10 +03:00
Ivan Savenko	2e7c382612	Moved creature upgrade logic to CGObjectInstance inheritors	2023-06-16 17:59:10 +03:00
Ivan Savenko	fc190b14bb	Spell shrines can now be configured in json	2023-06-16 17:59:10 +03:00
Ivan Savenko	5cfbdd2967	Partially split CommonConstructors.cpp into few separate files	2023-06-16 17:59:10 +03:00
DjWarmonger	c52b5d3bd0	Merge pull request #2216 from vcmi/water_prison_tavern ... Water Prison & Tavern	2023-06-16 16:30:05 +02:00
Tomasz Zieliński	190244369c	Fix empty Pandora message	2023-06-15 22:06:31 +02:00
Tomasz Zieliński	adec58f5bf	- Set fixed boat type for Tavern / Prison ... - Move magical boat offset to static function	2023-06-15 17:53:18 +02:00
Tomasz Zieliński	f1356dd5bf	Merge remote-tracking branch 'origin/develop' into water_prison_tavern	2023-06-14 20:58:02 +02:00
Tomasz Zieliński	651b1a8bea	Remove unused variable.	2023-06-08 09:27:55 +02:00
Tomasz Zieliński	351d596bdc	Handle water Prisons and Taverns.	2023-06-08 09:17:08 +02:00
SoundSSGood	f6c2d5cba7	hotfix	2023-06-07 13:08:04 +03:00
Ivan Savenko	1e9eea30e1	Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop	2023-06-05 18:53:17 +03:00
Ivan Savenko	97b3b2e147	Fix build	2023-06-03 00:48:32 +03:00
Ivan Savenko	d6a357fd17	Split some map object files into smaller files. Reduced includes usage.	2023-06-02 21:47:37 +03:00
Ivan Savenko	b04b11b9d1	Merge pull request #2175 from IvanSavenko/map_format_mappings ... HotA map format support - object mapping	2023-06-01 22:06:18 +03:00
Ivan Savenko	312b703a78	Fixed mapping of hota objects	2023-05-31 23:18:39 +03:00
Ivan Savenko	acac42291e	Remove excessive CMap.h includes	2023-05-31 23:18:38 +03:00
Ivan Savenko	8d0dcd6ad7	All h3m bitsets are now loaded inside mapReader	2023-05-31 23:01:57 +03:00
Konstantin	e82acf4840	CGHeroInstance: always add obligatory skills ... Fixes #2198	2023-05-31 20:03:59 +03:00
SoundSSGood	1366825f08	final fixup	2023-05-24 16:10:06 +03:00
SoundSSGood	021f94a579	artifact utils	2023-05-17 17:00:31 +03:00
Ivan Savenko	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
Konstantin P	057a33c508	SpellSchool: use identifier instead of int ... Needs redifinition of MAGIC_SCHOOL_SKILL in all mods	2023-05-07 20:37:32 +03:00
nordsoft	059ccdc9bc	Fix for serialization bug	2023-05-07 04:02:52 +04:00
nordsoft	7c029bccba	Show info nin modal window always	2023-05-07 03:19:18 +04:00
Konstantin P	9e1cdc410f	vcmi: replace school bonuses to unified ones ... Except immunity now	2023-05-05 21:30:45 +03:00
Konstantin P	8764765dcf	Bonus: complex duration as bitset ... Fixes #2125	2023-05-05 21:30:45 +03: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
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
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
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
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	34c1d4f3e9	vcmi: move CBonusProxy and friends to new file ... To decouple HeroBonus.h more	2023-05-02 00:53:51 +03:00
Konstantin	6fa1b2b19f	vcmi: move bonuses to its own folder	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	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
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	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	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	30967b2813	Remove excess pointer from market interface	2023-05-01 00:14:53 +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	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
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
Konstantin P	54e4db3819	vcmi: fix abandoned mine resource loading ... It was overshadowed by local variable	2023-04-27 20:59:55 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
Nordsoft91	f39f208e05	Merge pull request #1915 from Nordsoft91/vcmi-campaign ... VCMI campaigns format	2023-04-23 19:09:59 +04:00
Nordsoft91	a553a4aa66	Merge pull request #2030 from Nordsoft91/boats	2023-04-22 03:27:00 +04:00
nordsoft	de159df481	Rename boats	2023-04-20 21:20:51 +04:00
nordsoft	9ecf16ca23	Fix minor bugs	2023-04-20 03:20:00 +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	d94ce22e70	vcmi: fix terrain penalties ... Fixes #2028	2023-04-19 12:41:54 +03: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
nordsoft	d1dacd45e2	Animations from config	2023-04-19 00:14:15 +04:00
nordsoft	ddcdfb643a	Try to enable air/land movement	2023-04-18 17:36:42 +04:00
nordsoft	d83566bc74	Add constructor for boat	2023-04-18 17:27:39 +04:00
nordsoft	ed798b06da	Prepare transport enum	2023-04-18 13:04:49 +04:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
Ivan Savenko	87647cd02a	Do not propose banned skills in witch huts	2023-04-15 17:20:38 +03:00
Ivan Savenko	ea8aeef8c0	Implemeted parsing of HotA Seer Huts	2023-04-15 17:20:38 +03:00
Ivan Savenko	f93335d678	Cleanup and formatting of H3M loader code	2023-04-15 17:20:38 +03:00
Ivan Savenko	3738171b21	Refactoring of H3M loader to make HotA format support easier ... - extracted low-level reader from MapFormatH3M class - added separate structure to define version-specific values - cleared up some H3M format edge cases - replaced witch hut skill vector with set - converted several fields to enum type	2023-04-15 17:20:38 +03:00
SoundSSGood	9a838598a6	arts refactoring part1	2023-04-15 00:10:39 +03:00
Ivan Savenko	b354f99cc3	Merge pull request #1936 from IvanSavenko/cpp_17_upgrade ... Upgrade c++ standard to c++17	2023-04-14 19:21:17 +03:00
Ivan Savenko	44b83b2e11	Merge master -> develop	2023-04-14 16:51:35 +03:00
Ivan Savenko	35ac4d88ac	Fix Seer Hut right-click text	2023-04-13 19:06:44 +03:00