Ivan Savenko
322c5faf63
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-26 16:52:23 +02:00
Ivan Savenko
4d0c0f10a9
Merge pull request #3530 from Laserlicht/tavern
...
Invite hero
2024-01-26 13:12:55 +02:00
Ivan Savenko
2a193effcc
Merge branch 'master' into 'develop'
2024-01-25 16:23:13 +02:00
Ivan Savenko
2f5bf64340
Do not crash on attempt to load campaign with unsupported maps
2024-01-24 13:44:22 +02:00
Laserlicht
b82a51d184
remove unused translation
2024-01-20 17:58:54 +01:00
Laserlicht
a0098eb065
Gui for hero invite
2024-01-20 12:54:06 +01:00
Laserlicht
4813179abb
Invite hero setting
2024-01-20 01:24:34 +01:00
Ivan Savenko
ffa58152ac
Client-side support for hosting game server via lobby
2024-01-19 23:49:59 +02:00
Ivan Savenko
4271fb3c95
Extension of lobby server functionality
...
Support for:
- listing of active players
- listing of active rooms
- joining and leaving rooms
- placeholder support for multiple chat rooms
- proxy connections
- invites into private rooms
(only lobby server side for now, client and match server need work)
2024-01-19 23:49:59 +02:00
Ivan Savenko
55b504792e
Implemented basic version of login window and persistent connection on
...
client
2024-01-19 23:49:59 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Ivan Savenko
69e87f929b
Merge pull request #3516 from IvanSavenko/release_143
...
Release 1.4.3
2024-01-18 22:35:42 +02:00
Dydzio
6a5620e06e
Update polish translation
2024-01-18 21:25:17 +01:00
Ivan Savenko
9be0dcf456
Translate missing line
2024-01-18 22:21:32 +02:00
Ivan Savenko
9da60a2738
Updated Ukrainian translation
2024-01-18 17:18:31 +02:00
Laserlicht
a1f4fcb78a
hide adventuremap
2024-01-18 00:47:18 +01:00
Laserlicht
85294f5990
update german
2024-01-16 22:45:12 +01:00
Ivan Savenko
9acd436a09
Review suggestion
2024-01-15 13:18:27 +02:00
Ivan Savenko
f6e0f46040
Merge pull request #3467 from dydzio0614/hota-fixes
...
Fix HotA creature abilities (add bonuses allowing implementing them)
2024-01-12 21:55:18 +02:00
Ivan Savenko
29eab0fdbe
Merge pull request #3476 from kdmcser/develop
...
Add Chinese translate for mapeditor
2024-01-12 21:54:22 +02:00
Ivan Savenko
7cf738b20e
Merge pull request #3462 from Laserlicht/trim_text
...
limit textboxes
2024-01-12 21:53:30 +02:00
kdmcser
765425a785
fix wrong translate string in Chinese
2024-01-12 23:12:19 +08:00
M
9ee526d202
Fixes from code review
2024-01-11 21:10:22 +01:00
M
bf7c6a4c3f
Extract method for death stare / accurate shot, fix translation key
2024-01-10 23:23:10 +01:00
Ivan Savenko
952520a8e7
Merge pull request #3463 from ToRRent1812/patch-1
...
Update to Polish translation
2024-01-10 15:47:37 +02:00
Asirome
53b8e557a2
Updated Spanish translation
2024-01-10 12:55:38 +01:00
M
67f18729fa
REVENGE bonus that matches HotA haspid ability
2024-01-09 19:10:43 +01:00
Dydzio
675f9b11fa
Add ENEMY_ATTACK_REDUCTION bonus - fixes HotA Nix
2024-01-08 19:37:04 +01:00
kdmcser
beb849ee3d
update Chinese translation
2024-01-08 22:20:37 +08:00
Łukasz Zając
709a349a23
Update polish.json
2024-01-08 00:48:04 +01:00
Laserlicht
24d4816a36
trim text
2024-01-07 23:42:48 +01:00
Ivan Savenko
ae79c5e953
Merge pull request #3397 from Laserlicht/cheat_allow
...
option for disabling cheats
2024-01-07 21:42:02 +02:00
Laserlicht
8b262e49a6
add sort for changedate
2024-01-07 20:17:44 +01:00
Dydzio
7283a4861e
Initial version of ACCURATE_SHOT implementation
2024-01-04 22:27:51 +01:00
Dydzio
7cf7543747
Configurable ferocity bonus
2024-01-01 21:16:38 +01:00
Dydzio
898b8f3c71
Add initial version of Ferocity ability (for Ayssids)
2024-01-01 19:58:32 +01:00
kdmcser
76388d6085
Update Chinese translation ( #3410 )
...
* Update Chinese translate
2023-12-31 22:27:48 +02:00
Laserlicht
2e7ac8d02d
small config fixes
2023-12-28 20:55:37 +01:00
Laserlicht
cb9c4bbaf0
unlimited replay option
2023-12-28 20:48:19 +01:00
Laserlicht
a3e27b859e
extra option tab
2023-12-28 19:41:01 +01:00
Ivan Savenko
a9005da01e
Merge pull request #3366 from Laserlicht/battle_informations
...
Battle stacks informations
2023-12-28 12:39:26 +02:00
Laserlicht
fc4827c89c
option for allowing cheats
2023-12-27 14:39:35 +01:00
Ivan Savenko
8c4de0d093
Update Ukrainian localization
2023-12-24 19:29:33 +02:00
Dydzio
b5f56f29fa
Translate new settings to polish
2023-12-24 19:29:33 +02:00
Ivan Savenko
161fc6eb58
Merge pull request #3344 from cewbdex/czech-work
...
More Czech translation work
2023-12-24 19:28:29 +02:00
Dydzio
70aed9490d
Change wording to less technical
2023-12-24 17:49:58 +01:00
Dydzio
046d3abee4
Add new setting for instant adventure map fade in / fadeout effects
2023-12-24 17:18:48 +01:00
Kryštof Černý
9213ec548b
More work
2023-12-23 21:36:46 +01:00
Kryštof Černý
8933ee994b
Finish Czech translation of random maps
2023-12-23 21:26:33 +01:00
Laserlicht
f0c97b344a
add duration + morale/luck
2023-12-23 16:07:12 +01:00
Kryštof Černý
23c58861ff
More Czech translation work
2023-12-18 17:15:50 +01:00
Ivan Savenko
732cdfec73
Merge pull request #3254 from Laserlicht/spell_search
...
search spells
2023-12-18 13:23:06 +02:00
Ivan Savenko
c04efa8ac4
Merge pull request #3310 from cewbdex/cz-adw
...
Czech language improvements
2023-12-17 22:38:47 +02:00
Ivan Savenko
f38a09e71a
Merge pull request #3321 from dydzio0614/chinese-translations-update
...
Update chinese translation
2023-12-17 22:05:49 +02:00
Ivan Savenko
9f8a5119f9
Less strict check for Armageddon's Blade data files presence
2023-12-16 15:04:41 +02:00
Dydzio
4ab34c872a
Update chinese translation
2023-12-15 19:00:05 +01:00
Kryštof Černý
78faffb2d2
Translate touch tips
2023-12-15 17:42:18 +01:00
Kryštof Černý
7bac1c37cc
Fix typo
2023-12-15 09:41:04 +01:00
Kryštof Černý
a292bf1ce8
Translate editor
2023-12-14 11:10:27 +01:00
Kryštof Černý
cd6651b8f7
More work
2023-12-13 22:06:00 +01:00
Kryštof Černý
f12d7591fe
UI translated and improvements
2023-12-13 21:57:37 +01:00
Kryštof Černý
c10dca8136
More changes
2023-12-12 13:57:34 +01:00
Kryštof Černý
180cb1ba88
Czech language improvements
2023-12-12 13:11:49 +01:00
Ivan Savenko
3465ab629e
Update Ukrainian localization
2023-12-11 18:23:52 +02:00
Ivan Savenko
4fa33c8d2e
Merge pull request #3279 from Laserlicht/smooth_scroll_fix
...
smooth scroll fix and gui option to disable
2023-12-10 22:49:43 +02:00
Ivan Savenko
e44a8ebfd9
Merge pull request #3291 from Laserlicht/audio_mute_setting
...
audio mute on focus lost setting
2023-12-10 22:48:52 +02:00
Laserlicht
df2a5f05d8
audio mute on focus lost setting
2023-12-10 14:49:27 +01:00
Laserlicht
e74c2262c3
add option to gui to disable smooth dragging
2023-12-10 13:38:58 +01:00
Ivan Savenko
adb720c8ea
Bump version to 1.4.1
2023-12-09 19:03:05 +02:00
Laserlicht
dfb10bdfcb
search rectangle
2023-12-08 22:52:34 +01:00
Ivan Savenko
ddf741423c
Updated translations
2023-12-08 12:02:12 +02:00
Ivan Savenko
b4b81289d8
Update Ukrainian localization
2023-12-07 23:57:01 +02:00
Dydzio
68e43b0622
Update turn settings translations
2023-12-07 19:37:33 +01:00
Dydzio
e330a8d2be
Merge branch 'beta' into polish-translation-1.4
2023-12-07 17:49:59 +01:00
Ivan Savenko
edbe25b33a
Updated layout and localizations
2023-12-07 16:36:44 +02:00
Ivan Savenko
bac46e3992
Added arrow icon to dropdown images
2023-12-07 13:57:16 +02:00
Ivan Savenko
cb8e9e633a
Implemented layout for simturn/timer presets
2023-12-07 13:57:16 +02:00
Dydzio
3b832126a9
Translate game client strings for VCMI 1.4 to polish
2023-12-07 00:47:34 +01:00
Laserlicht
3540a8a915
Update german.json
2023-12-02 18:36:07 +01:00
Laserlicht
0c270401b0
update german in client
2023-12-02 14:10:38 +01:00
Dydzio
a4d76b2529
Split large spellbook from UI enhancements setting
2023-11-26 19:16:53 +01:00
Ivan Savenko
ff6260e5c5
Merge pull request #3195 from IvanSavenko/identifier_string_serialization
...
Serialize Identifiers that can be added by mods as strings
2023-11-20 14:07:24 +02:00
Ivan Savenko
07990644b5
Merge pull request #3191 from Laserlicht/touch-introduction
...
Touch introduction
2023-11-20 14:05:47 +02:00
Ivan Savenko
cc71651ee4
Show proper error message if player attempts to load save with missing
...
identifiers instead of silent crash to main menu
2023-11-19 19:30:55 +02:00
Laserlicht
70b6906e6d
adjust messages, add radial wheel
2023-11-17 18:23:11 +01:00
Laserlicht
a6dd5c2887
translation
2023-11-16 23:03:41 +01:00
Laserlicht
1bf05d43a1
fix video implementation error; implement paging; video loading
2023-11-16 22:39:50 +01:00
Laserlicht
2cfbcd067b
videos
2023-11-16 02:58:43 +01:00
Ivan Savenko
d1a4e84255
Show message about mods that failed to load on opening main menu
2023-11-15 17:57:40 +02:00
Ivan Savenko
f65f4b1285
Disable new UI if enhancements are off
2023-11-13 19:49:41 +02:00
Ivan Savenko
eb20e29b2a
Updated translations
2023-11-13 19:21:17 +02:00
Ivan Savenko
c5eeaa6526
Added non-linear slider for better simturn duration selection
2023-11-13 19:06:56 +02:00
Ivan Savenko
7d54f6a9c0
Implemented basic support for plural forms in translations
2023-11-13 19:06:56 +02:00
Ivan Savenko
7391f2a6ee
Added custom-made blue version of checkbox
2023-11-13 19:06:56 +02:00
Ivan Savenko
e160b8557b
Implement min/max simturns callbacks
2023-11-13 19:06:56 +02:00
Ivan Savenko
1f045ab128
Layout improvements for turn options tab
2023-11-13 19:06:56 +02:00
Ivan Savenko
32633d5f52
Initial version of Turn Options tab screen
2023-11-13 19:06:56 +02:00
Ivan Savenko
05e861c862
Added tooltip for revisit object button
2023-11-12 17:42:03 +02:00
Tomasz Zieliński
e105b23a37
Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
...
# Conflicts:
# Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
# Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
# Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
# client/lobby/RandomMapTab.cpp
2023-10-30 20:08:13 +01:00
Tomasz Zieliński
3504cd4e6c
More EOL conversions
2023-10-30 19:58:58 +01:00
Tomasz Zieliński
d3352cc6da
Fix line endings
2023-10-30 19:54:58 +01:00
Tomasz Zieliński
ec0bf05163
Rename "cpu" parameter to correct "humans"
2023-10-30 17:21:03 +01:00
Tomasz Zieliński
1028041eae
Fixed messed up player count in 7sb0c non-standard template
2023-10-30 07:48:17 +01:00
Tomasz Zieliński
b0830a837b
Fixed template with no starting towns for players 3 and 4.
2023-10-29 09:35:38 +01:00
Alexander Wilms
0ff423ff0e
Change remaining CRLF line endings to LF
...
find . -type f -name "*.JSON" -exec dos2unix {} \+;
2023-10-22 16:41:09 +00:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Laserlicht
9003e55158
color mode to rgb
2023-10-21 19:31:44 +02:00
Nordsoft91
f3acc939b9
Merge pull request #3062 from Laserlicht/sort_towns
...
sort town/hero feature
2023-10-20 22:51:26 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
...
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.
This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.
Files that are Windows specific like *.vcxproj and *.props files were
not converted.
Closes : #3073
2023-10-19 16:23:21 +02:00
Laserlicht
e05102192b
heroes and more buttons
2023-10-17 21:13:08 +02:00
Laserlicht
464577be28
new icons
2023-10-17 20:06:35 +02:00
Laserlicht
0401b4a071
adjusted icons
2023-10-15 21:34:58 +02:00
Laserlicht
3b853bff08
sort town feature
2023-10-15 14:31:33 +02:00
Laserlicht
23e1b0b0d5
radial wheel for hero
2023-10-15 02:43:42 +02:00
Alexander Wilms
8d1b5e24dd
Add russian translation for connection error message
2023-10-11 18:49:47 +02:00
Alexander Wilms
7c627d8163
Show info dialog when connection to multiplayer server fails
2023-10-10 18:11:11 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
...
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Fabrice Tiercelin
99221c2d56
Fix Chinese translation
2023-10-04 21:04:06 +02:00
Ivan Savenko
d97a7ac5d3
Merge pull request #3000 from Nordsoft91/russian-translation
...
Update russian translation
2023-10-04 19:33:01 +03:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
nordsoft
7c3329a184
Update translation
2023-10-02 20:46:20 +02:00
Laserlicht
7f4361eb10
name -> path
2023-10-01 01:11:11 +02:00
Laserlicht
23b8a321f6
file ending
2023-10-01 00:46:29 +02:00
Laserlicht
648a37310f
description
2023-10-01 00:35:11 +02:00
Laserlicht
c6adcc40f5
add date; cleanup
2023-09-30 17:56:51 +02:00
Ivan Savenko
71a1ed816a
Merge pull request #2892 from Laserlicht/highscore_menu
...
Highscore Menu & end video
2023-09-27 15:48:47 +03:00
Ivan Savenko
efe3393408
Merge pull request #2947 from Laserlicht/enableUiEnhancements_button
...
enableUiEnhancements button
2023-09-27 15:47:25 +03:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check
...
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
Laserlicht
d40eb03d5b
description
2023-09-26 15:44:35 +02:00
Laserlicht
5061792cce
enableUiEnhancements button
2023-09-25 13:11:08 +02:00
An Vu
b8eba01b7d
add Launcher and Map Editor
2023-09-24 21:09:09 +07:00
An Vu
59e1ec3ae7
add vietnamese
2023-09-23 10:59:38 +07:00
nordsoft
dce1ac1538
Redesign mod incompatibility message
2023-09-23 00:32:48 +02:00
Laserlicht
fe0adfa4bd
fix
2023-09-22 02:21:23 +02:00
Laserlicht
92b0e2b400
initial highscore support
2023-09-22 01:39:35 +02:00
Nordsoft91
648e8c7acb
Merge pull request #2856 from Laserlicht/hero_overview
...
Hero overview
2023-09-19 19:36:19 +02:00
Laserlicht
95e8c7ce2e
suggestions
2023-09-18 16:45:05 +02:00
Laserlicht
a994fa00aa
fixes; translation
2023-09-17 16:15:17 +02:00
Alexander Wilms
ee935e9fa7
Fix JSON files
2023-09-17 12:36:57 +00:00
Ivan Savenko
f8541d0ae4
Merge branch 'vcmi/master' into 'vcmi/develop'
2023-09-15 13:59:02 +03:00
Ivan Savenko
8980286ef7
Merge pull request #2817 from cewbdex/czech-init
...
Initial Czech translation 2
2023-09-14 12:23:58 +03:00
Kryštof Černý
db8da40e2c
Last minute fixes
2023-09-13 23:20:37 +02:00
Kryštof Černý
26d8981221
More work on Czech translation
2023-09-13 08:32:55 +02:00
Kryštof Černý
abfd1394b7
Add dots to english.json for improved consistency
2023-09-13 08:19:20 +02:00
Kryštof Černý
d93d84a668
Add Czech to mod.json
2023-09-12 20:41:16 +02:00
Kryštof Černý
7adce2c661
Initial Czech translation
2023-09-12 20:35:01 +02:00
Ivan Savenko
d070953c28
Fix open backpack strings
2023-09-12 21:28:36 +03:00
Kryštof Černý
8639d5ff7c
Remove dot in english.json for consistency
2023-09-12 16:27:43 +02:00
Ivan Savenko
e8453916cf
Merge remote-tracking branch 'vcmi/beta' into develop
2023-09-08 18:49:06 +03:00
Ivan Savenko
9e6424c545
Merge pull request #2775 from IvanSavenko/radial_fill_ones
...
(1.3.2) Add "Fill with single creatures" option to radial wheel
2023-09-08 13:16:00 +03:00
