11180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	916b41d9a7	Merge pull request #2078 from IvanSavenko/shortcuts ... Basic shortcuts system	2023-05-01 21:45:52 +03: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	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
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
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
Ivan Savenko	57399b5b32	Merge pull request #2094 from tytannial/Chinese_locale_update ... Chinese locale update	2023-04-29 12:50:24 +03:00
Tytannial	4e4698b4fb	Fix show grid option	2023-04-29 13:15:20 +08:00
Tytannial	e2312a733a	Update general and creature ability text	2023-04-29 13:02:11 +08:00
Tytannial	6b2a8b56e2	Update Chinese general text translation	2023-04-29 10:20:59 +08:00
nordsoft	17c9dc3115	fix tests	2023-04-29 06:15:14 +04:00
Ivan Savenko	318ac4f23b	Merge pull request #2091 from vcmi/DjWarmonger-patch-2 ... Add download counter for 1.2.1	2023-04-29 00:29:48 +03:00
Ivan Savenko	d985ac90d3	Merge master -> develop	2023-04-28 22:57:25 +03:00
Ivan Savenko	f26ff594b8	Merge pull request #2090 from IvanSavenko/android_fix ... Fix Android build?	2023-04-28 22:51:59 +03:00
DjWarmonger	21a603a293	Add download counter for 1.2.1	2023-04-28 21:33:19 +02:00