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

213 Commits

Author SHA1 Message Date
nordsoft
bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04: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
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
52b53ab307 Feature and setting implemented 2023-04-08 01:49:59 +04:00
nordsoft
b1d06b6141 Complete quick combat feature 2023-04-06 22:49:38 +04:00
Ivan Savenko
307065a633 Merge beta into develop 2023-04-04 16:06:20 +03:00
Ivan Savenko
cfe4cad8cb
Merge pull request #1818 from rilian-la-te/beta-fixes
config: CATAPULT_EXTRA_SHOTS should be hidden
2023-04-01 23:09:38 +03:00
Konstantin
766f599e41 config: CATAPULT_EXTRA_SHOTS should be hidden 2023-04-01 00:21:34 +03:00
Ivan Savenko
816d47ca01
Merge pull request #1802 from dydzio0614/polish-translations-patch
Polish translations patch
2023-03-31 23:17:40 +03:00
Konstantin
35e8ce2ead vcmi: update russian translation 2023-03-31 01:01:25 +03:00
Ivan Savenko
4f703df4ac Removed old bonuses data 2023-03-31 00:16:27 +03:00
Dydzio
93c9632814 Minor readability fix 2023-03-30 21:19:05 +02:00
Dydzio
e70dd599bb Update / tweak translations 2023-03-30 18:58:31 +02:00
Ivan Savenko
974be97e6d
Merge pull request #1792 from IvanSavenko/happy_dydzio
Fixes for beta - graphical artifacts
2023-03-30 00:11:19 +03:00
Ivan Savenko
8a3e1b0230
Merge pull request #1789 from IvanSavenko/beta_fixes
Fixes for 1.2 release
2023-03-30 00:09:51 +03:00
Ivan Savenko
abecda52b6
Merge pull request #1793 from heroesiiifan/patch-1
Update german translation
2023-03-30 00:09:40 +03:00
Ivan Savenko
f5a54d7e53 Removed no longer used field 2023-03-29 14:34:19 +03:00
heroesiiifan
8ea33d892f
Ingame strings - german 2023-03-28 23:18:45 +00:00
krs
3a4066a644 Minor tweak to PressKeyToSkipIntro 2023-03-28 23:06:29 +03:00
krs
c180878dc6 Some rewordings according to review 2023-03-28 22:46:39 +03:00
krs
f8fe56e8b3 English.json strings revisited 2023-03-28 22:10:22 +03:00
Ivan Savenko
ae242be180 Fix indexing of wog experience ranks 2023-03-28 17:03:47 +03:00
Ivan Savenko
b3b2426b19 Updated mod.json schema 2023-03-27 22:33:36 +03:00
Ivan Savenko
6a3f4fd73d
Merge pull request #1771 from IvanSavenko/beta_fixes
Fixes for issues discovered in beta
2023-03-26 01:36:38 +02:00
Ivan Savenko
c8fe079294 Added Chinese in-game translation from forum user 'By003' 2023-03-25 23:54:51 +02:00
Dydzio
c04fad5de5 Translate new damage format 2023-03-25 21:54:15 +01:00
Ivan Savenko
6f631a0aa7
Merge pull request #1759 from IvanSavenko/kills_in_tooltip
Show potential kill amount in attack tooltip
2023-03-25 20:03:27 +02:00
Ivan Savenko
970981cfc9 Show information on potential kills in attack tooltip 2023-03-24 17:18:47 +02:00
Dydzio
1e646d7c29 Fix missing translation 2023-03-22 19:42:26 +01:00
Andrey Filipenkov
6382e0a3a0
Merge pull request #1743 from rilian-la-te/russian-translation
vcmi: russian
2023-03-22 13:48:48 +03:00
Konstantin
a0a6f4ff94 vcmi: russian 2023-03-22 13:53:30 +03:00
Dydzio
1181f03b1f Update polish translation 2023-03-21 23:19:20 +01:00
Ivan Savenko
4919550a19 Show a message that battle intro can be skipped 2023-03-20 21:58:32 +02:00
Ivan Savenko
921c5d647e Fix Spanish translation 2023-03-16 18:42:47 +02:00
Ivan Savenko
17520b70ce
Merge pull request #1518 from rilian-la-te/arcane-intuition
Skills rework: separate bonus for each skill - part 1
2023-03-16 16:12:42 +02:00
Konstantin
34a26580a7 vcmi: skill-agnostic resistance
Uses exiting bonus and new PERCENT_TO_TARGET_TYPE value type
2023-03-16 16:46:41 +03:00
Konstantin
496c1def12 vcmi: remove FULL_HP_REGENERATION bonus
Just set HP_REGENERATION to high number
(in OH3 doubled stack health is sufficient)
2023-03-16 16:46:41 +03:00
Konstantin
62e579f672 vcmi: replace KINGx bonuses to one KING bonus
val = level of slayer which require to affect.
Can break saves.
2023-03-16 16:46:41 +03:00
Konstantin
1e73c2e1e6 vcmi: configurable charge
There is no reason not to make charge configurable.
Just do it.
2023-03-16 16:46:41 +03:00
Ivan Savenko
35aa6914c5
Merge pull request #1659 from macomarivas/spanish_translation
Spanish translation
2023-03-16 15:37:23 +02:00
Asirome
672a1fef04
spanish mod description 2023-03-15 20:49:15 +01:00
Asirome
3081e3a2cf
Merge branch 'vcmi:develop' into spanish_translation 2023-03-15 20:46:14 +01:00
Asirome
62ca82467b
some translation fixes 2023-03-15 20:44:25 +01:00
Ivan Savenko
f5f303202a Update localization 2023-03-14 22:04:08 +02:00
Konstantin
a0c644a0e5 vcmi: actually implement AUTO for CInfoWindow
This is possible to use infobar interactions now.
2023-03-11 21:41:57 +03:00
Konstantin
f2167904ed update russian translation 2023-03-11 21:41:57 +03:00
Asirome
c47b2351a3
Spanish translation
By ChatGpt
2023-03-08 21:19:55 +01:00
Michael
0450587ecc
synced with english & extended 2023-03-07 23:55:54 +01:00
Ivan Savenko
674711c959 Fix missing texts in RMG mod 2023-03-07 15:28:27 +02:00
Ivan Savenko
d7e914d0eb Fix resolution selection menu texts 2023-03-07 15:27:54 +02:00
Ivan Savenko
58cfea02f1 Added option to skip validation of mods 2023-03-07 00:06:58 +02:00
Ivan Savenko
b7025125d5 Added map swipe option 2023-03-05 23:53:06 +02:00
Ivan Savenko
95440ad540 Minor fixes 2023-03-05 19:55:38 +02:00
Ivan Savenko
d34268d7d5 Split "Show available creatures in town" into two buttons 2023-03-05 19:55:38 +02:00
Ivan Savenko
403730d1a3 Updated Ukrainian localization 2023-03-05 19:55:38 +02:00
Ivan Savenko
17dfd3d34a Updated English translation 2023-03-05 19:55:38 +02:00
Ivan Savenko
14e0ae32c7 Remove no longer used images 2023-03-05 19:55:38 +02:00
Ivan Savenko
b2e5e55c1e Added labels that indicate current option values 2023-03-05 19:55:37 +02:00
Ivan Savenko
2f556ccf60 Improved General options tab layout presentation 2023-03-05 19:53:27 +02:00
Ivan Savenko
33603f87f3 Finalized general layout 2023-03-05 19:53:27 +02:00
Ivan Savenko
b298895e61 Added placeholders for missing options 2023-03-05 19:53:27 +02:00
Ivan Savenko
f01d6daef3 Remove no longer used background 2023-03-05 19:53:27 +02:00
Ivan Savenko
919af720a8 Formatting cleanup 2023-03-05 19:53:27 +02:00
Ivan Savenko
c976176453 Added additional buttons for movement speeds 2023-03-05 19:53:26 +02:00
Ivan Savenko
c011a5a9cf Added lines to window to separate UI elements into groups 2023-03-05 19:51:42 +02:00
Ivan Savenko
273a06a878 Added frame for movement speed & map scrolling 2023-03-05 19:51:42 +02:00
Ivan Savenko
f23186f47d Slightly better layout for new settings window 2023-03-05 19:51:42 +02:00
Ivan Savenko
7ef5163d9d
Merge pull request #1581 from IvanSavenko/map_render_rewrite
Adventure Map - rendering rewrite
2023-03-05 19:51:07 +02:00
Ivan Savenko
d21c41e436 Fix caching 2023-03-05 17:48:02 +02:00
Ivan Savenko
16e7f860ff Added debug rendering 2023-03-05 17:48:02 +02:00
Ivan Savenko
974dd3a3db Updated Ukrainian localization 2023-03-05 17:30:38 +02:00
Ivan Savenko
cc84bed0c0
Merge pull request #1540 from dydzio0614/settings-rework
Settings rework
2023-02-26 22:56:35 +02:00
Olexandr Nesterenko
a368a067ee
Update ukrainian.json 2023-02-24 11:29:03 +02:00
Dydzio
7e409df3cb Apply manual changes from code review 2023-02-18 16:35:07 +01:00
Dydzio
c2ef3331ef Change main settings tabs to toggle group + fix json commas 2023-02-16 21:37:37 +01:00
Dydzio
1d37f8a62e New buttons graphics, add info about ESC key to battle intro option 2023-02-16 20:39:11 +01:00
Dydzio
9101f05835 Fixes for new battle settings 2023-02-15 22:38:41 +01:00
Dydzio
775db89241 Fix battle settings UI labels, add "dont show battle intro" setting 2023-02-15 20:29:29 +01:00
Dydzio
1d153f4ee9 "ForceMovementInfo" support + make other settings tab 2023-02-14 23:45:45 +01:00
Dydzio
daa2b63dde Further UI improvements 2023-02-14 22:22:11 +01:00
Dydzio
be9c71934c Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-14 21:00:17 +01:00
Dydzio
fb06aca0bb Further progress - UI tweaks, new settings etc 2023-02-14 20:30:06 +01:00
Dydzio
80a5595d6c Adding some settings options, minor UI fixes 2023-02-13 23:53:28 +01:00
Konstantin
203b7ed364 vcmi: russian translation 2023-02-12 22:05:25 +03:00
Dydzio
2f171fcc0e Merge branch 'develop' into settings-rework 2023-02-12 15:03:33 +01:00
Ivan Savenko
c8c38ac922
Merge pull request #1386 from IvanSavenko/resolutions_filter
Do not allow selecting resolutions not supported by display
2023-02-12 14:33:39 +02:00
Dydzio
fc7d2b9778 Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-12 11:55:21 +01:00
Dydzio
b9030fe9cc
Better name for bonus 2023-02-05 00:56:37 +01:00
Dydzio
719a11bdf6 Translate VCMI essential files 2023-02-04 18:51:30 +01:00
Dydzio
a9f279d1ab Add polish translations, tiny improvement of english translations 2023-02-04 18:45:32 +01:00
Ivan Savenko
01322aa4c5 Do not allow selecting resolution no supported by display 2023-02-03 12:57:38 +02:00
Dydzio
9dd692cea4 Initial draft of tabbed settings window 2023-01-30 20:18:59 +01:00
Ivan Savenko
17b510703e Added german, polish, and ukrainian translations 2023-01-25 12:36:03 +02:00
Ivan Savenko
35775b90f8 Moved bonus names to translation 2023-01-25 12:36:02 +02:00
Ivan Savenko
39131eba3e Added translation support for mods. VCMI translations are now in mod.
Moved existing (English) translation to vcmi mod
Added translations for:
- German
- Polish
- Ukrainian
2023-01-25 12:33:54 +02:00
Ivan Savenko
e4e5278f60 Merge with vcmi/develop 2022-12-25 23:10:52 +02:00
Ivan Savenko
a0c78e8ecb Added german translation by Laserlicht 2022-12-25 21:58:20 +02:00
Ivan Savenko
1696db8a3c Launcher translation upgrade, still WIP:
- launcher can be re-translated without restart
- mod info (name/description/etc) can have localized versions
2022-12-25 13:19:16 +02:00
Ivan Savenko
e8daf4033f Added missing files 2022-12-20 01:55:59 +04:00