1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

10894 Commits

Author SHA1 Message Date
nordsoft
69ad62ef58 Fixes from code review 2023-04-09 23:00:20 +04:00
nordsoft
a8f31fabd1 Fix bug 2023-04-09 23:00:20 +04:00
nordsoft
67c0d29478 Fix header 2023-04-09 23:00:20 +04:00
nordsoft
e7c6f596ee Little code improvement 2023-04-09 23:00:20 +04:00
nordsoft
ab7d316c3f Rename fields 2023-04-09 23:00:20 +04:00
nordsoft
b40a3a1b14 Banned arts and skills cannot be randomly rewarded 2023-04-09 23:00:20 +04:00
nordsoft
26c3277895 New format for skills selection 2023-04-09 23:00:20 +04:00
nordsoft
b7ccc4d649 Revert "Random selection for secondary skills"
This reverts commit 6e538dab30.
2023-04-09 23:00:20 +04:00
nordsoft
6c5f3f21a5 Extend loadKey function 2023-04-09 23:00:20 +04:00
nordsoft
fe21acb0d0 Revert "Random selection for resources"
This reverts commit 0e4ff3e2bf.
2023-04-09 23:00:20 +04:00
nordsoft
dce5a924b0 Random selection for secondary skills 2023-04-09 23:00:20 +04:00
nordsoft
53e16c7e22 Random selection for primary skills 2023-04-09 23:00:20 +04:00
nordsoft
bb915b0e7e Random selection for resources 2023-04-09 23:00:20 +04:00
Ivan Savenko
e2d0cd37e4
Merge pull request #1910 from IvanSavenko/beta_fixes
Fixes for 1.2 branch
2023-04-09 20:09:03 +03:00
Ivan Savenko
bfd77d871c
Merge pull request #1918 from IvanSavenko/fix_map_loading
Fix vcmi map loading
2023-04-09 20:08:23 +03:00
Ivan Savenko
6e90c0fd09
Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot
Fix initialization of spell effects registry
2023-04-09 20:07:29 +03:00
Konstantin
235fddaf4b vcmi: constexpr IDs 2023-04-09 19:54:41 +03:00
Andrii Danylchenko
737c34b8c6 BattleAI: avoid selfblocking on siege 2023-04-09 16:22:37 +03:00
Ivan Savenko
a6ce99573c Added fallback identifiers for reading older vcmi maps 2023-04-09 12:27:33 +03:00
Ivan Savenko
148cc0b280
Merge pull request #1896 from rilian-la-te/change-gcc-build-settings
vcmi: change gcc variant to build lua and no pch
2023-04-09 01:14:22 +03:00
Konstantin
75a52953f2 vcmi: change gcc variant to build lua and no pch 2023-04-09 00:15:09 +03:00
Ivan Savenko
ae5d273df9
Merge pull request #1905 from IvanSavenko/fix_rewardables
Fixed UI of objects that provide one reward that can be refused
2023-04-08 22:15:22 +03:00
Adriankhl
1d6192ca62 Shut down the thread for tactic phase properly 2023-04-08 22:52:46 +04:00
Ivan Savenko
a97ebc2bf1
Merge pull request #1874 from krs0/feature/separate_movement_highlight_for_hoverd_units_in_battle
Separate movement highlight for hovered units in battle
2023-04-08 21:47:49 +03:00
Ivan Savenko
f211207f83
Merge pull request #1893 from trofi/fix-build-without-pch
Add missing include headers when building with -DENABLE_PCH=OFF
2023-04-08 21:45:47 +03:00
Ivan Savenko
84af64ce6b Removed magical initialization of registry via static variables 2023-04-08 21:29:04 +03:00
krs
7eda4b6c1e replaced SDLK_LSHIFT check with GH.isKeyboardShiftDown() 2023-04-08 20:42:37 +03:00
krs
3194999809 Add SHIFT + hover shortcut to show movement highlight while pressed. 2023-04-08 20:42:37 +03:00
krs
709a8a6eb3 movementHighlightOnHover is now saved with settings 2023-04-08 20:42:16 +03:00
krs
aba5840a6f Removed Max Movement Highlight stubs 2023-04-08 20:40:30 +03:00
krs
1644cab938 Added combat option Highlight Movement on Hover 2023-04-08 20:40:30 +03:00
krs
9012a25276 Stub For Max Movement Range highlight
When a creature is hovered., besides movement, for max possible movement, a hex in center of map is now highlighted.
2023-04-08 20:39:59 +03:00
krs
51ad49532b Fix for wrong merge :( 2023-04-08 20:39:59 +03:00
krs
dab07bdef9 Now unit range is shown in Tactics phase as well
A new parameter: isActiveStack was needed in battleGetAvailableHexes, so that we show the propper Tactics range.
2023-04-08 20:39:59 +03:00
krs
e1c388465a HD mod highlighting of movement for hovered stack.
Does not work as intended in tactics mode.
2023-04-08 20:39:59 +03:00
nordsoft
50115c3113 Rename variables 2023-04-08 20:56:05 +04:00
Ivan Savenko
454168897e Fix handling of invalid hotkeys in configurable UI 2023-04-08 19:53:13 +03:00
Ivan Savenko
71ddaeea6e Fix crash on missing music file 2023-04-08 19:47:16 +03:00
Ivan Savenko
4d37686eb3
Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll
InfoBar: disable scrollbar
2023-04-08 19:12:48 +03:00
Ivan Savenko
d00fa5bf86
Merge pull request #1887 from Adriankhl/fix_dropbox_left_click
Fix: close dropbox with left mouse click outside of the dropbox
2023-04-08 19:11:50 +03:00
Ivan Savenko
0abc00f82e Fix assertion failure in in-game console 2023-04-08 18:53:47 +03:00
Ivan Savenko
3dedc963f7 Fix double-playing of battle effects 2023-04-08 18:53:28 +03:00
SoundSSGood
e58be8e7f7 vcmiartifacts fixed 2023-04-08 12:28:53 +03:00
Ivan Savenko
e35a1ba471
Merge pull request #1876 from rilian-la-te/refactoring-v1
VCMI Refactoring
2023-04-08 11:14:05 +03:00
Konstantin
50c9a57133 InfoBar: fix tiny selection with data 2023-04-08 01:44:08 +03:00
nordsoft
e4cd167062 Compilation fix 2023-04-08 01:49:59 +04:00
nordsoft
3e6a656e4c Define touchscreen mode at first launch 2023-04-08 01:49:59 +04:00
nordsoft
52b53ab307 Feature and setting implemented 2023-04-08 01:49:59 +04:00
SoundSSGood
ea7dd14d8b client is able to erase artifact 2023-04-08 00:41:55 +03:00
Ivan Savenko
50da080130 Fixed UI of objects that provide one reward that can be refused 2023-04-08 00:13:38 +03:00