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
Ivan Savenko
346b8a4619
Merge pull request #2079 from rilian-la-te/cstack-some-private
...
vcmi: make some CStack properties private
2023-04-28 22:18:20 +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
Ivan Savenko
d4ff2cbf12
attempt to fix Android build
2023-04-28 22:02:19 +03:00
Ivan Savenko
25d5a1555c
Merge pull request #2088 from vcmi/beta
...
Release 1.2.1
2023-04-28 19:47:07 +03:00
Ivan Savenko
e4864bf25a
Merge pull request #2087 from IvanSavenko/beta_fixes
...
Last fixes for 1.2.1
2023-04-28 19:02:08 +03:00
Ivan Savenko
2da5b7efb8
Updated changelog
2023-04-28 17:08:50 +03:00
Ivan Savenko
3ae4819fcb
Merge pull request #2085 from Nordsoft91/mapeditor-fix
...
[1.2.1] Fix portrait serialization
2023-04-28 17:06:29 +03:00
Ivan Savenko
c55f52e84f
Fixed disabled special weeks
2023-04-28 16:54:00 +03:00
Ivan Savenko
76d5b459f1
Fixed music playback on switching between towns
2023-04-28 16:53:45 +03:00
Ivan Savenko
93362eb692
Merge pull request #2083 from IvanSavenko/artifact_fix
...
Fix list of treasures getting overwritten
2023-04-28 15:41:38 +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
Ivan Savenko
881c434833
Fix list of treasures getting overwriteen leading to weird bugs
...
... such as having Grail in crypts or getting relics as starting
artifact
2023-04-27 23:40:56 +03:00
Konstantin
88f8694825
tests: fix modhandler assert
2023-04-27 20:59:55 +03:00
Konstantin
15d933d354
tests: disable settings.init()
...
This will remove debug assertion than will prevent any test
from running in debug mode
2023-04-27 20:59:55 +03:00
Konstantin
2a8f9629ae
tests: attempt to fix build without lua
2023-04-27 20:59:55 +03:00
Konstantin P
f03819fba2
vcmi: disable lua for GCC
2023-04-27 20:59:55 +03:00
Konstantin P
00487e3257
vcmi: disable -Wvirtual-move-assign from tests
2023-04-27 20:59:55 +03:00
Konstantin P
0d8e59a172
tests: add test directories to core loader
...
Fixes all tests loading
2023-04-27 20:59:55 +03:00
Konstantin P
d14c951005
CBattleInfoCallbackTest: fix catch-value
2023-04-27 20:59:55 +03:00
