1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

11330 Commits

Author SHA1 Message Date
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
e9279cfbc4 Blocking dialogs supported 2023-05-01 00:14:53 +04:00
nordsoft
ddb683e237 Fix typo 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
3df0ce229e get rid of building id 2023-05-01 00:14:53 +04:00
nordsoft
cc4277748d Fix movement bonus subtype 2023-05-01 00:14:53 +04:00
nordsoft
839c6464aa Adjust config for markets 2023-05-01 00:14:53 +04:00
nordsoft
4e55279a6a Adjust client part for markets 2023-05-01 00:14:53 +04:00
nordsoft
67e6920e23 Implement markets 2023-05-01 00:14:53 +04:00
nordsoft
333e7d683c Change Callback to abstract 2023-05-01 00:14:53 +04:00
nordsoft
dfb078a4d9 Fix json value reader 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
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
Ivan Savenko
57399b5b32
Merge pull request #2094 from tytannial/Chinese_locale_update
Chinese locale update
2023-04-29 12:50:24 +03:00
Tomasz Zieliński
67c5381ae8 Add some non-zero value treasures to fix empty zones. 2023-04-29 11:48:47 +02: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