1119 Commits

Author	SHA1	Message	Date
Nordsoft91	d03b75696a	Merge pull request #3067 from Nordsoft91/editor-improvements-1.4 ... Add hero placeholder properties	2023-10-19 22:23:58 +02:00
Ivan Savenko	4c0eabf20c	Show guards preview for visited banks on right click	2023-10-19 15:41:59 +03:00
Ivan Savenko	01920bb74e	Fix treasure chests	2023-10-19 15:41:41 +03:00
Ivan Savenko	8f4791914e	Show content preview only for Witch Huts / Shrines / Tree	2023-10-19 15:17:58 +03:00
Ivan Savenko	e0f6b582f5	Display object description only on right-click	2023-10-19 14:36:11 +03:00
Ivan Savenko	8f33fdcd83	Allow learning banned spell from Scholars (H3 logic)	2023-10-18 17:38:40 +03:00
Ivan Savenko	ce480c8c84	Fixed Scholar handling	2023-10-18 17:14:22 +03:00
Ivan Savenko	f7718628dc	Merge pull request #3074 from Nordsoft91/quests ... Fix warnings about empty kill target	2023-10-18 12:34:44 +03:00
nordsoft	966ffe4377	Fix warnings about empty kill target	2023-10-18 00:13:32 +02:00
Alexandre Detiste	15e45f966c	typos found by lintian	2023-10-17 22:06:08 +02:00
Ivan Savenko	eedaa63f5f	Hnadling of Shrine messages now matches H3	2023-10-17 16:35:34 +03:00
Ivan Savenko	927ce4e60e	Improvements to rewardable objects popups	2023-10-16 23:55:37 +03:00
nordsoft	f6d7755c6a	Add hero placeholder properties	2023-10-16 22:24:12 +02:00
Ivan Savenko	850d0ff8eb	Show (mostly) correct messages in Shrines	2023-10-16 18:16:15 +03:00
Nordsoft91	02c1425939	Merge pull request #3046 from Nordsoft91/editor-improvements-1.4 ... Add map editor zoom and objects lock functionality	2023-10-16 01:22:18 +02:00
Ivan Savenko	e10de0594e	Scholar is now configurable object (partial)	2023-10-16 00:12:39 +03:00
Ivan Savenko	bb05c2dea5	Implemented configurable shrine	2023-10-16 00:12:39 +03:00
Ivan Savenko	dd841bdaa7	Use enum instead of mix of bool's and int's for tile reveal	2023-10-16 00:12:38 +03:00
Ivan Savenko	98fd939ed6	Cartographer/Observatory is now configurable object	2023-10-16 00:12:38 +03:00
Ivan Savenko	a3b2354481	Implemented visit mode "limiter". Fixed h3m variable loading	2023-10-16 00:12:38 +03:00
Ivan Savenko	fd01a25352	Implemented basic version of configurable Witch Hut	2023-10-16 00:12:38 +03:00
nordsoft	4651893b48	Fix hota quests	2023-10-14 00:15:15 +02:00
nordsoft	55900ceb66	Add portraits delegate	2023-10-13 20:15:29 +02:00
nordsoft	2bf8cdc9f5	Hota-related bugs were fixed	2023-10-13 12:52:45 +02:00
nordsoft	74a90cde5d	Fix hero level limiter	2023-10-12 12:52:01 +02:00
nordsoft	14b030d2eb	Support hota quest gates	2023-10-11 23:15:24 +02:00
nordsoft	7ccd4cdcb2	Refactor quests progress	2023-10-11 21:10:42 +02:00
nordsoft	5b10b457cf	Fix code review suggestions	2023-10-11 00:47:19 +02:00
nordsoft	31d71ddd25	Minor fixes in text	2023-10-10 23:44:29 +02:00
nordsoft	5eeda3cd25	Quests mostly work	2023-10-10 23:44:29 +02:00
nordsoft	d2d64dbddd	Bugfixes	2023-10-10 23:44:29 +02:00
nordsoft	bb238f9b72	New quests work	2023-10-10 23:44:29 +02:00
nordsoft	63bdfb8ff6	New quests implemented	2023-10-10 23:44:29 +02:00
nordsoft	1460541ee5	New limiter based quests	2023-10-10 23:44:29 +02:00
nordsoft	0cf3205e15	Fix quest regressions	2023-10-10 23:44:28 +02:00
Ivan Savenko	b75a67ef7c	Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor ... Improvements to type safety of Identifier class	2023-10-05 00:33:07 +03:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
Ivan Savenko	39a92cdde3	Add query for dwellings dialog	2023-10-04 17:47:12 +03:00
Ivan Savenko	898733eed7	Added Query to track visit duration for Taverns and Markets	2023-10-04 17:47:12 +03:00
Nordsoft91	c57d5545c2	Merge pull request #2971 from Nordsoft91/translations ... Multi-language support for network game and for VMAPs	2023-10-02 20:41:42 +02:00
nordsoft	1502ea2250	Fix pandora mana problem	2023-09-30 01:33:12 +02:00
nordsoft	40af83a55c	Fix quest	2023-09-28 02:51:58 +02:00
nordsoft	3c2549d905	Fix town name	2023-09-28 02:51:44 +02:00
nordsoft	486091a915	Heroes switched to text id	2023-09-28 00:00:32 +02:00
nordsoft	0c94a4d891	Town name switched to id	2023-09-27 23:57:05 +02:00
nordsoft	41da252e67	Seerhut meta strings	2023-09-27 23:49:27 +02:00
nordsoft	f9f79255c5	Creature message meta string	2023-09-27 23:25:19 +02:00
nordsoft	ab373f08ab	Use meta string for messages	2023-09-27 23:11:11 +02:00
nordsoft	03c099d4fd	First steps	2023-09-27 22:53:13 +02:00
Ivan Savenko	9b482a2b1e	Fix boat creation for heroes recruited on water	2023-09-27 21:25:27 +03:00
Ivan Savenko	92fdaa20b1	Fix crash on loading Seer Hut with kill monster mission	2023-09-27 21:24:25 +03:00
Ivan Savenko	97097c20ad	Merge pull request #2874 from SoundSSGood/exchange-window-update ... Exchange window update	2023-09-27 15:50:52 +03:00
Ivan Savenko	3ea807fb8d	Fixed movement through teleporters by AI	2023-09-26 13:42:20 +03:00
nordsoft	a5492b30c3	Add pre-battle message	2023-09-23 02:35:21 +02:00
Ivan Savenko	8c0d78f1d9	Added initiator-player to packs that add/remove/move objects	2023-09-19 19:24:34 +03:00
Nordsoft91	807f308c91	Merge pull request #2844 from Nordsoft91/rewardable-quests ... New rewardable interface for SeerHuts and pandoras	2023-09-19 17:59:24 +02:00
nordsoft	326791886d	Rename and events modal mode always	2023-09-19 17:11:03 +02:00
SoundSSGood	48ec2d7e2a	Merge branch 'vcmi:develop' into exchange-window-update	2023-09-19 16:22:00 +03:00
SoundSSGood	a83f290e13	bulk move artifacts only equipped, only backpack	2023-09-19 13:31:42 +03:00
nordsoft	2960895041	Issues fixed	2023-09-17 22:19:45 +02:00
nordsoft	a517e6ad8e	Message split for pandora box	2023-09-17 18:02:24 +02:00
nordsoft	e3538f24ab	Fix components problem	2023-09-17 16:04:34 +02:00
nordsoft	7b22aefb12	Some minor fixes	2023-09-17 13:03:42 +02:00
Ivan Savenko	c8e6a7cd27	Fixed most common cases of movement actions	2023-09-16 20:07:26 +03:00
Ivan Savenko	80b80a0ae6	Minor cleanup of hero movemen code	2023-09-16 20:07:26 +03:00
nordsoft	a3b60bf829	Fix warning	2023-09-16 14:30:25 +02:00
nordsoft	4f76eb3fce	Add limiter serialization	2023-09-15 23:00:33 +02:00
nordsoft	4af2d917c0	Fix messages for pandoras	2023-09-15 21:13:07 +02:00
nordsoft	b5b5d881c4	Merge remote-tracking branch 'upstream/develop' into rewardable-quests	2023-09-15 21:08:22 +02:00
nordsoft	68c61797f8	Implement select all option for rewardable objects	2023-09-15 21:08:14 +02:00
nordsoft	c1c13cfafb	Pandora and events work as rewardable object	2023-09-15 15:29:41 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
nordsoft	06f01c3b82	Seerhut works as rewardable object	2023-09-15 10:06:06 +02:00
Dydzio	9399bcc15d	Fix pathfinder tile cost	2023-09-13 18:54:08 +02:00
nordsoft	574047c55c	Start making new serialization for rewardables	2023-09-13 09:18:46 +02:00
nordsoft	96d6a48f01	Backward compatible json serialization	2023-09-13 02:14:35 +02:00
nordsoft	ef3f0174dd	Rewardable seer hut and quest gate	2023-09-13 01:40:07 +02:00
nordsoft	a89a8019ab	Added skills customization	2023-09-11 20:37:25 +02:00
nordsoft	cc3864a0fa	Fix for random dwellings	2023-09-09 21:17:21 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	12c4f8d18c	Fixed serialization of PlayerColor in json	2023-09-04 22:22:24 +03:00
Ivan Savenko	a30e7ba321	Remove bitmasks of PlayerColor's. Add encode/decode methods	2023-09-04 18:56:16 +03:00
Ivan Savenko	8dfdfffd87	Use ResourcePath for audio files	2023-09-04 18:22:34 +03:00
Ivan Savenko	6f0108e462	Use ResourcePath for referencing texts and json's	2023-09-04 18:22:34 +03:00
Ivan Savenko	823ffa7a07	Always use ResourcePath for referencing images and animations	2023-09-04 18:22:34 +03:00
nordsoft	d113168db4	Fix neutral objects serializing	2023-09-04 01:42:51 +04:00
nordsoft	385202a02a	Fix abandoned map crash	2023-09-04 01:42:51 +04:00
Ivan Savenko	3e169ef2f5	Fix visiting of markets	2023-08-31 01:07:59 +03:00
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	ec8d31bbfc	First step at unifying game identifiers code	2023-08-25 13:38:01 +03:00
Konstantin	d746a96d55	vcmi: use SpellSchool identifier instead of enum ... Use identifier instead of enum inside callbacks. It is better and more expandable solution.	2023-08-23 17:53:09 +03:00
Konstantin	8724181a0f	vcmi: spell resistance rework ... Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY. All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY, and all previous bonuses of subtype 1 is covered by NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.	2023-08-23 17:52:16 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Ivan Savenko	70ddc1f3e5	Merge pull request #2577 from wb180/secondarySkillSerialization ... Preserve order of secondary skills during hero json serialization/deserialization	2023-08-18 15:24:02 +03:00
Evgeniy Meshcheryakov	2a83f06905	Preserve order of secondary skills during hero serialization/deserialization	2023-08-14 00:06:22 +03:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Ivan Savenko	942f8bbf05	Fix possible access to non-existing building	2023-08-11 18:50:39 +03:00
Ivan Savenko	88b23cdce1	Merge pull request #2511 from IvanSavenko/fix_starting_army ... Fix starting army	2023-08-11 11:36:30 +03:00
nordsoft	be6f6da397	Fix for canRefuse flag in rewardable building	2023-08-08 19:27:00 +04:00
Ivan Savenko	e57f8742cd	Rename ambiguos 'clear' to 'clearSlots' ... A lot of map objects inherit from CCreatureSet and as result - get clean() method that resets object army	2023-08-07 19:13:02 +03:00
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Tomasz Zieliński	f6247164ad	Fix crash, fix invisible boat blocking the tile	2023-08-01 18:51:33 +02:00
Ivan Savenko	62fddca21e	Split massive CModHandler class/file into multiple parts: ... - IdentifierStorage is now a separate handler in VLC - Renamed ModHandler::Incompatibility exception to ModIncompatibility - Extracted ModScope namespace from ModHandler - Extracted ModUtilities namespace from ModHandler - Split CModHandler.cpp on per-class basis - Replaced some direct members with unique_ptr to reduce header includes	2023-07-30 22:17:47 +03:00
Ivan Savenko	397c4c7595	Fix dismissing heroes on map with "Capture town" victory condition	2023-07-30 15:28:56 +03:00
Andrii Danylchenko	ec8898a0e7	#1965 - treat dwelling defenders as neutrals	2023-07-25 10:13:41 +03:00
Ivan Savenko	a619193e3c	Fixed initialization of heroes in taverns	2023-07-22 22:04:32 +03:00
Ivan Savenko	cfdc7e6e65	Merge pull request #2363 from IvanSavenko/rewardable_translation ... Translation support for configurable objects	2023-07-21 15:44:46 +03:00
Ivan Savenko	3a348abf4f	Text of configurable/rewardable objects now uses translator	2023-07-19 22:25:52 +03:00
Ivan Savenko	5660884ee5	Fix revisiting of cleared banks	2023-07-19 14:21:33 +03:00
Ivan Savenko	7f1b982264	Implemented support for showing amount of guards in banks	2023-07-19 13:17:50 +03:00
Ivan Savenko	8a92941681	Allow merging stack on recruitment to give place for recruited unit	2023-07-15 16:09:44 +03:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
SoundSSGood	fd9c7352a0	suggested changes	2023-07-03 22:54:03 +03:00
SoundSSGood	07c811dd67	CCombinedArtifactInstance refactoring	2023-06-30 19:40:57 +03:00
Ivan Savenko	cc91be3518	Added workaround for loading spellbook existance status	2023-06-27 13:58:45 +03:00
Ivan Savenko	48ac84110b	Replaced hero crossover logic with one that actually matches H3	2023-06-26 17:15:59 +03:00
Ivan Savenko	d1e5a347ff	Refactoring of campaign handler: rename types and use strong typing	2023-06-26 17:15:59 +03:00
Ivan Savenko	85262cf4f5	Moved CGameState files into a separate directory	2023-06-26 17:15:59 +03:00
Ivan Savenko	08cfbe79cf	Added encapsulation for movement points access	2023-06-25 17:42:36 +03:00
Ivan Savenko	f7b27da00e	Implemented support for "coast visitable" objects: ... - objects marked as coast visitable can be visited from land even when placed in water - added isBlockedVisitable and isCoastVisitable method to CGObjectInstance - implemented json config for these properties in banks	2023-06-25 17:42:33 +03:00
Ivan Savenko	ce3e150d59	Minor formatting	2023-06-23 13:55:52 +03:00
Ivan Savenko	44261ecc21	Fix boat positioning	2023-06-23 13:42:09 +03:00
Ivan Savenko	caccd58eb0	boat offsets for shipyards are counted from visitable position	2023-06-23 13:42:09 +03:00
Ivan Savenko	6a08a96d0c	Added createObject call as wrapper around NewObject netpack	2023-06-23 13:42:08 +03:00
Ivan Savenko	d8879f1e53	NewObject pack now receives visitable position instead of h3m position	2023-06-23 13:34:51 +03:00
Ivan Savenko	69dc95c3c8	Merge pull request #2235 from IvanSavenko/hota_h3m_support ... Hota h3m support	2023-06-23 13:32:10 +03:00
Ivan Savenko	bd4d2788ed	Split pathfinder into multiple smaller files	2023-06-21 13:46:09 +03:00
Ivan Savenko	87fcfa4add	Removed excessive pathfinder includes	2023-06-21 12:00:44 +03:00
Ivan Savenko	3913b8e98c	Heroes placed on water in map will be automatically given boat	2023-06-20 19:37:27 +03:00
Ivan Savenko	56d69e790b	Renamed MetaString methods to more logical names	2023-06-20 19:37:27 +03:00
Ivan Savenko	2636a0dcc3	Moved MetaString to a new file	2023-06-20 19:37:27 +03:00
Ivan Savenko	f35b3a0dc3	Replace MetaString operator << with member function	2023-06-20 19:37:27 +03:00
Ivan Savenko	8dde8018d0	Implemented support for fixed monster def's from hota	2023-06-20 19:37:27 +03:00
Ivan Savenko	6f743916db	Moved CGCreature to a new file	2023-06-20 19:37:27 +03:00
Ivan Savenko	ece9982ca0	Fix build	2023-06-16 18:11:45 +03:00
Ivan Savenko	77b58bc66d	Cleaned up object constructors to reduce duplicated code	2023-06-16 17:59:50 +03:00
Ivan Savenko	4d947be287	Adventure map shipyard nwo has configurable boat type	2023-06-16 17:59:50 +03:00
Ivan Savenko	487f441f47	Implemented boat selection for town shipyards	2023-06-16 17:59:49 +03:00
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