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

9373 Commits

Author SHA1 Message Date
nordsoft
e8845244f7 Fix tactic button 2023-01-03 13:02:54 +04:00
nordsoft
660d25a335 Make control panel configurable 2023-01-03 13:02:54 +04:00
nordsoft
87c47fff1d Business logic of alternative actions 2023-01-03 13:02:54 +04:00
Ivan Savenko
c479504646 Formatting cleanup 2023-01-01 22:50:38 +02:00
Ivan Savenko
6fd50a7ded MXE compile fix 2023-01-01 22:26:07 +02:00
Ivan Savenko
d237bee927 Removed unused code 2023-01-01 21:12:47 +02:00
Ivan Savenko
7c0d5666a0 Return string by copy to fix cases when string is constructed on stack 2023-01-01 20:55:43 +02:00
Ivan Savenko
33a9aa8ee5 Reduced log to console 2023-01-01 20:55:26 +02:00
Dydzio
ebe4121327 Add clion related folder to gitignore 2023-01-01 15:47:21 +02:00
Ivan Savenko
9a620a9091 Refactoring of GeneralTextHandler to reduce boilerplate code in callers 2023-01-01 15:13:02 +02:00
Ivan Savenko
01d0cd4f7a Changed configurable UI to match text refactoring:
- help.txt strings are now loaded as (hover, help) pairs
- renamed string pairs from translate.json to use (hover, help) form
- interface builder will always load label texts via unified ID
- interface builder way of loading buttons text has been changed:
- - field has been renamed "zelp" -> "help" for consistency
- - "help" field now only accepts string or object json type
2023-01-01 14:56:45 +02:00
Ivan Savenko
84493e1bff Translate received string identifier before storing 2023-01-01 14:56:45 +02:00
Ivan Savenko
10541855d9 Don't load empty rumor strings 2023-01-01 14:56:45 +02:00
Ivan Savenko
a499390b9c Restored text export command 2023-01-01 14:56:45 +02:00
Ivan Savenko
1979b3e97f Fixes typo 2023-01-01 14:56:45 +02:00
Ivan Savenko
e9e2ebb1c9 Cleanup 2023-01-01 14:56:45 +02:00
Ivan Savenko
cb4f5edae9 All Heroes 3 texts are now passed through translator 2023-01-01 14:56:45 +02:00
Ivan Savenko
85d7b470d4 Access to quests texts is now processed via translator 2023-01-01 14:56:45 +02:00
Ivan Savenko
bdb8e0ee5c Introduced string identifiers for H3 texts, still WIP 2023-01-01 14:56:44 +02:00
Ivan Savenko
71bedf130f
Merge pull request #1351 from dydzio0614/cartographer-logic-fix
Change cartographer tile reveal logic to match H3
2023-01-01 12:57:24 +02:00
Dydzio
7e321b2405 Fix missing formatting 2022-12-30 16:14:04 +01:00
Dydzio
306348c301 Tweak condition to remove hardcoded terrain ID 2022-12-30 16:04:19 +01:00
Dydzio
2c09bfb22a Fix code formatting 2022-12-30 15:51:13 +01:00
Dydzio
c40dcec7cd Improve terrain check condition 2022-12-30 15:46:10 +01:00
Dydzio
1967416eb2 Remove no longer needed code 2022-12-30 15:26:27 +01:00
M
23de4a188b Change cartographer tile reveal logic to match H3 2022-12-30 15:09:09 +01:00
Ivan Savenko
4bfdb44c78 Restore status bar on BattleWindow reactivation 2022-12-30 12:32:36 +02:00
Ivan Savenko
f8dec3861b Fixed animation skipping with no sound mod and enemy having first turn 2022-12-30 11:56:26 +02:00
Ivan Savenko
0c78e47dce Fixed serialization due to changed lsit of bonuses 2022-12-30 11:55:40 +02:00
Ivan Savenko
a9808a6541 Fix battle start when hero has tactics and no battle sounds mod is on 2022-12-30 11:55:22 +02:00
Ivan Savenko
81164100da Fix crash on exiting game during battle 2022-12-30 11:54:37 +02:00
Ivan Savenko
f6c8f7305c Fix compilation on daily PPA 2022-12-30 01:39:56 +02:00
Ivan Savenko
5d80457eda Merge with vcmi/develop branch 2022-12-30 00:52:23 +02:00
Ivan Savenko
b8b1e07621 Fix serialization 2022-12-30 00:36:10 +02:00
Ivan Savenko
486c9612b8 Fix regression from warnings_fix branch 2022-12-30 00:23:34 +02:00
Ivan Savenko
b89e8a9dfe Fix serialization 2022-12-29 23:37:46 +02:00
Ivan Savenko
c8cd8aaf10 merge fix - do not attempt to display multiple dialogs at once 2022-12-29 22:11:47 +02:00
Ivan Savenko
b275d9de72 merge beta branch into develop 2022-12-29 22:08:53 +02:00
Ivan Savenko
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
Ivan Savenko
b1082aa621 Do not attempt to display multiple assembly dialogs at once 2022-12-29 21:50:25 +02:00
Ivan Savenko
90b669f507 Fix order of dialogs on assembling artefacts after battle 2022-12-29 21:50:25 +02:00
Ivan Savenko
d3d8a6de1b Fix directory test 2022-12-29 21:50:04 +02:00
Ivan Savenko
b6735618f5 Formatting 2022-12-29 21:50:04 +02:00
Ivan Savenko
ce76696af4 Detect slightly different gog.com installer file layout 2022-12-29 21:50:04 +02:00
Ivan Savenko
986c0c534d Main menu buttons are now defined using position of their center
Fixes positioning of main menu buttons in localized versions of the game
2022-12-29 21:50:04 +02:00
Ivan Savenko
e19dc41295 Support Polish version of H3 data files 2022-12-29 21:50:04 +02:00
Ivan Savenko
61ed408f61 Fix typo 2022-12-29 21:49:20 +02:00
Ivan Savenko
588b635d1c Workaround for a potential deadlock in MusicHandler 2022-12-29 21:49:20 +02:00
Ivan Savenko
d6674e73cd Explicitly define build type to add NDEBUG flag 2022-12-29 19:49:06 +02:00
Ivan Savenko
ad7944bb83 Fix loading of translations 2022-12-29 17:45:32 +02:00