11240 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
nordsoft	32277a007d	Fix compilation after merge	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	11840b9f6d	Get rid of hardcoded logic for markets	2023-05-01 21:49:37 +04:00
nordsoft	b29fc1a5f4	Fix movement bonus subtype	2023-05-01 21:49:37 +04:00
nordsoft	193cf6676a	Adjust config for markets	2023-05-01 21:49:37 +04:00
nordsoft	07f7c318dc	Adjust client part for markets	2023-05-01 21:49:37 +04:00
nordsoft	3d20538c1e	Implement markets	2023-05-01 21:49:37 +04:00
nordsoft	4b1b58b617	Change Callback to abstract	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	e9e5355af0	Added commented-out wog campaigns set	2023-05-01 18:00:35 +03:00
Ivan Savenko	0662ad49dd	Fix build	2023-05-01 17:59:21 +03:00
Ivan Savenko	6c637dd8e6	Integrated hotkeys with InterfaceObjectConfigurable	2023-05-01 17:59:21 +03:00
Ivan Savenko	dea10e6091	Use more descriptive names for hotkeys	2023-05-01 17:59:20 +03:00
Ivan Savenko	a654cc2391	Removed vstd::advance. Added vstd::next to handle similar cases.	2023-05-01 17:58:18 +03:00
Ivan Savenko	832e56e005	Implementation of (very basic) shortcuts system ... - Added EShortcut enumeration that contains all in-game shortcuts - CIntObject::keyPressed now receive values from hotkey enumeration - On keypress, SDL key code will be translated to shortcut ID - Removed access to SDL key codes from most of engine	2023-05-01 17:58:17 +03:00
Ivan Savenko	ac09f78c67	Merge pull request #2109 from IvanSavenko/server_fix ... Fix potential nullptr-to-reference conversion	2023-05-01 16:36:51 +03:00
Ivan Savenko	c7bee037d2	Fix potential nullptr-to-reference conversion	2023-05-01 14:44:52 +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
SoundSSGood	8b531ca6c4	CArtifactHolder divided into files	2023-05-01 00:34:45 +03:00
nordsoft	6fc3bb6690	Attempt to fix msvs build 1	2023-05-01 01:15:48 +04:00
nordsoft	5bdd6c5cf5	Fix compiling	2023-04-30 22:36:25 +04:00
nordsoft	b964cf6ec3	Revert "Auxiliary commit to revert individual files from 1b4d1177905ea3382ed90c07aee3e18aa3ccc65e" ... This reverts commit 2ff64410f7ff5d08d21ee4aea95959c8b6b383f2.	2023-04-30 17:25:37 +04:00
nordsoft	1b4d117790	deeper decoupling	2023-04-30 17:13:07 +04:00
Ivan Savenko	3378a3c740	Merge pull request #1991 from rilian-la-te/modernization-rule-ver1 ... vcmi: rule-based modernization part1	2023-04-30 15:06:14 +03:00
Konstantin	86f5d6de69	vcmi: modernize headers	2023-04-30 13:35:54 +03:00
nordsoft	51a261b449	Auto-adjust size	2023-04-30 12:49:45 +04:00
nordsoft	e8a8e893ee	Export grabs whole map	2023-04-30 12:49:45 +04:00
nordsoft	dee235ea19	Implement map export to image	2023-04-30 12:49:45 +04:00
nordsoft	9aaa8c0d89	Fix teams switching	2023-04-30 12:49:45 +04:00
nordsoft	1de9a57a76	Add validation for hero duplicate	2023-04-30 12:49:45 +04:00
nordsoft	bab84309a5	Support teams in map editor	2023-04-30 12:49:45 +04:00
nordsoft	1899dd97c7	Customize colors and teams	2023-04-30 12:49:45 +04: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	bd1105e2b7	Merge pull request #2098 from tytannial/Chinese_locale_update ... Launcher zhCN translation	2023-04-29 15:57:57 +03:00
Tytannial	72fae323af	Launcher zhCN translation	2023-04-29 19:50:05 +08:00