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

695 Commits

Author SHA1 Message Date
Łukasz Zając
e5d9496710
Update polish.json
with new strings + minor changes to old ones for more clarity.
2024-08-15 22:57:03 +02:00
Laserlicht
b4131398c6
Update Mods/vcmi/config/vcmi/german.json
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2024-08-15 07:24:38 +02:00
Laserlicht
5743f151a1 icon drawing 2024-08-15 00:21:02 +02:00
Laserlicht
a42afa2910 code review 2024-08-14 21:51:08 +02:00
Laserlicht
3551470919 adjusted texts 2024-08-14 21:15:18 +02:00
Laserlicht
39aaa6fe32 data to clipboard; simplify types 2024-08-14 21:01:37 +02:00
Laserlicht
df8e491b72 prepare icons 2024-08-14 21:11:57 +02:00
Laserlicht
ec2163b974 add val; stat at end turn; events 2024-08-14 19:24:40 +02:00
Laserlicht
e83a30ea11 darkened; added values 2024-08-14 02:49:54 +02:00
Laserlicht
70bb918872 added values 2024-08-14 01:38:18 +02:00
Laserlicht
4b042aa153 table fill 2024-08-14 01:06:29 +02:00
Laserlicht
504aec3b52 statistic selection 2024-08-13 23:32:12 +02:00
Laserlicht
4f8b965b36 selection 2024-08-13 21:30:54 +02:00
Laserlicht
6e6ca16d4e gui stuff 2024-08-13 20:41:55 +02:00
Laserlicht
9e9a6f1c5f
Merge branch 'develop' into extended_statistic 2024-08-13 00:49:51 +02:00
Laserlicht
1980f56668 statusbar 2024-08-13 00:17:12 +02:00
Laserlicht
ca99dfd12f csv export 2024-08-12 02:56:33 +02:00
Laserlicht
299ee35c48 extended statistic: Window 2024-08-11 22:44:16 +02:00
Laserlicht
b4c25a148a
Merge branch 'develop' into bank_support 2024-08-09 23:36:59 +02:00
Laserlicht
a15cd05da3 gui stuff for bank 2024-08-04 18:25:21 +02:00
altiereslima
2813f5cccc Update portuguese.json 2024-08-04 12:13:11 -03:00
altiereslima
ae652f8e59 Update portuguese.json 2024-08-04 11:16:17 -03:00
Laserlicht
a8fe8cbcf0 adjust text; increase gold input size 2024-07-29 23:48:00 +02:00
Laserlicht
f7376b8fd3
Merge branch 'vcmi:develop' into handicap 2024-07-29 23:10:20 +02:00
Laserlicht
6adc49b814
add help text 2024-07-29 00:54:58 +02:00
Laserlicht
fea491be82 multiplayer announcement 2024-07-25 00:28:33 +02:00
altiereslima
27adc78d6c Update portuguese.json 2024-07-20 09:28:50 -03:00
Ivan Savenko
08a6b859d2
Merge pull request #4304 from Laserlicht/quickspell-option
option to enable quickspell
2024-07-20 12:53:36 +03:00
Laserlicht
ee0cf58395 option to enable quickspell 2024-07-19 19:43:22 +02:00
Ivan Savenko
4f8f217b49 Moved range highlight transforms to config file 2024-07-19 10:08:50 +00:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Ivan Savenko
3134d8383c
Merge pull request #4207 from Laserlicht/map_format_additional
[1.6] Map format additional infos
2024-07-16 12:15:58 +03:00
altiereslima
39516b275e Update Portuguese Translation 2024-07-11 19:11:54 -03:00
Kryštof Černý
3219adace9 Base cz work 2024-07-07 16:39:18 +02:00
Laserlicht
02bd52041b extend map format 2024-06-29 13:13:59 +02:00
altiereslima
edf10d8174 Update Portuguese Translation (#4121)
* Update Portuguese Translation
2024-06-19 20:00:25 +00:00
Ivan Savenko
adac4ffa92
Merge pull request #4126 from IvanSavenko/ukrainian
Ukrainian translation update
2024-06-12 11:26:59 +03:00
Ivan Savenko
d15610de3d Updated game translation to Ukrainian 2024-06-11 15:01:15 +00:00
Laserlicht
a7d5f97a80
update german 2024-06-10 21:54:37 +02:00
Dydzio
9921e6849e Update polish translation 2024-05-29 23:49:40 +02:00
kdmcser
77cde094fb update Chinese translation 2024-05-25 18:37:15 +08:00
Asirome
ff0d5d63d9 Update spanish.json (#3967) 2024-05-16 08:03:06 +00:00
Asirome
90c494f05f Update spanish.json 2024-05-16 08:03:06 +00:00
Ivan Savenko
1b1f724de1
Merge pull request #3970 from Laserlicht/extra
ExtraOptions improvements
2024-05-15 15:20:59 +03:00
Laserlicht
1274790023
reuse strings 2024-05-15 12:40:01 +02:00
Laserlicht
8b59b78003
Publish if cheats or unlimited replays allowed to all players 2024-05-14 22:48:32 +02:00
altiereslima
b8d463d0bc Update portuguese.json 2024-05-13 18:12:16 -03:00
Ivan Savenko
6d25c08561 Update translations 2024-05-10 19:40:44 +00:00
altiereslima
1486b0f9e6 Update Portuguese translation 2024-05-09 07:31:58 +00:00
kdmcser
c96216ec68 update Chinese translation 2024-05-08 13:38:13 +00:00
Łukasz Zając
9b79f40871 Added pvp options 2024-05-08 13:38:13 +00:00
Łukasz Zając
ba2f23a67e Update polish.json 2024-05-08 13:38:13 +00:00
Łukasz Zając
e297ae891b Updated polish.json
Added new stuff + minor changes to old ones.
2024-05-08 13:38:13 +00:00
Ivan Savenko
3ab8b609ed
Merge pull request #3884 from Laserlicht/german_update
update german translation
2024-05-06 19:15:06 +03:00
Ivan Savenko
be5afd4748
Merge pull request #3880 from altiereslima/develop
Update Portuguese Translation
2024-05-06 19:14:56 +03:00
Laserlicht
090715f83c update german translation 2024-05-03 21:27:34 +02:00
altiereslima
e01a8492e1 Update portuguese.json 2024-05-03 12:12:52 -03:00
Ivan Savenko
6ac67775f5
Merge pull request #3861 from Laserlicht/pvp_options
Pvp options
2024-05-03 10:38:42 +03:00
altiereslima
f5e5dc344e Update portuguese.json 2024-05-02 18:48:37 -03:00
Laserlicht
37d9e862c2 Code review 2024-05-02 20:15:34 +02:00
Laserlicht
5b8b75da22 small fixes 2024-05-01 15:30:35 +02:00
Laserlicht
89b750c749 allow translations in chat 2024-05-01 15:00:36 +02:00
Laserlicht
5413fc2c7e finished 2024-05-01 01:26:51 +02:00
Ivan Savenko
1dd8d164cb Fixed version of vcmi mod 2024-04-30 11:20:32 +03:00
Ivan Savenko
80bd420203 Remove duplicated element in json 2024-04-30 11:20:15 +03:00
Ivan Savenko
c524648c7b
Merge pull request #3825 from kdmcser/chinese_translate
update chinese translation
2024-04-26 11:59:01 +03:00
Ivan Savenko
16b8b0807d
Merge pull request #3798 from altiereslima/develop
Update Portuguese Translation
2024-04-26 11:58:52 +03:00
altiereslima
ad519ea296 Update portuguese.json 2024-04-24 23:07:57 -03:00
altiereslima
749f6520b0 Update portuguese.json 2024-04-24 23:00:44 -03:00
kdmcser
94aa9482e7 update chinese translation 2024-04-24 22:26:22 +08:00
Ivan Savenko
de4ab94ef3 Update translation 2024-04-23 19:22:07 +03:00
Ivan Savenko
e05a05c455 Updated translations 2024-04-23 17:15:59 +03:00
Ivan Savenko
8ec989bbdc Removed no longer used icon 2024-04-23 17:15:59 +03:00
Ivan Savenko
662a508944 Better UI design for room preview dialog 2024-04-23 17:15:59 +03:00
Ivan Savenko
1840666327 Implemented join room dialog 2024-04-23 17:15:59 +03:00
Ivan Savenko
82b921d852 Fix json formatting 2024-04-22 16:03:06 +03:00
Ivan Savenko
a1f4f3bd6e Added strings for hota quests for translations 2024-04-22 13:49:38 +03:00
altiereslima
e38d73ae08 Update portuguese.json 2024-04-19 22:02:41 -03:00
altiereslima
278c3e5d96 Update Portuguese Translation 2024-04-19 20:32:36 -03:00
Ivan Savenko
c3455dfa00 Updated Ukrainian translation 2024-04-18 19:23:12 +03:00
Ivan Savenko
4e0d3f2b9b Remove unused string 2024-04-18 19:15:13 +03:00
Ivan Savenko
fafd10bca5 Clarify English string phrasing 2024-04-18 19:14:06 +03:00
Ivan Savenko
e0964fcb13
Merge pull request #3744 from altiereslima/develop
Update Portuguese Translation
2024-04-14 13:19:17 +03:00
altiereslima
1aea0b570f Update Portuguese Translation 2024-04-10 21:13:44 -03:00
Ivan Savenko
8353bca34f Small refactoring of adventure map spell casting:
- Removed duplicated checks for DD possibility
- Moved most of spell-specific code from AdventureMapInterface to library
code
- AdventureSpellMechanics class now provides methods to check whether
spellcast is possible, similarly to battle spells
- If it is not possible to cast adventure map spell (e.g. no mana or no
move points) game will show infowindow immediately on clicking spellbook
instead of on cast attempt
- If hero does not have movement points for a DD, game will show correct
error message
- Added game settings 'dimensionDoorFailureSpendsPoints' due to
discovered H3 logic
2024-04-10 20:04:08 +03:00
altiereslima
2c29c15d18 Update portuguese.json 2024-04-08 21:46:47 -03:00
altiereslima
85f7d64e01 Update portuguese.json 2024-04-07 15:44:16 -03:00
altiereslima
2d4be97b6a Update portuguese.json 2024-04-07 14:55:31 -03:00
altiereslima
b960a992fd Update mod.json 2024-04-07 14:17:30 -03:00
altiereslima
b5f86caefc Create portuguese.json 2024-04-07 14:17:24 -03:00
Ivan Savenko
975cf7de95 Tweaks to lobby login window to make it more clear to use 2024-03-29 17:05:41 +02:00
DjWarmonger
4e8e4d2547
Merge pull request #3682 from kdmcser/develop
update Chinese translation
2024-03-28 11:36:52 +01:00
Ivan Savenko
d700e94189 Code cleanup 2024-03-27 13:10:55 +02:00
Ivan Savenko
89d091a386 Set matches that never reached gameplay state to 'cancelled' state 2024-03-27 13:10:55 +02:00
Ivan Savenko
862f6f8c7b Added descriptions for new buttons in pregame menu 2024-03-27 13:10:55 +02:00
Ivan Savenko
69f7b3169e UI improvements for lobby:
- Added notifications sounds for invites and chat messages
- Added notifications for unread chat messages in inactive channels
- Added click sound when switching between channels
- Added workaround to prevent clicks due to list recreation
- Partial support for receiving invites
2024-03-27 13:10:55 +02:00
Ivan Savenko
ace43e97b9 Added UI for inviting players into a match 2024-03-27 13:10:55 +02:00
Ivan Savenko
4dce0479ba UI improvements for lobby screen:
- Show description of current chat room in header
- Show count of online accounts / active rooms
- Highlight currently selected chat room
2024-03-27 13:10:55 +02:00
Ivan Savenko
b50d9de912 Show opponent name in 1-vs-1 games, minor tweaks 2024-03-27 13:10:55 +02:00
Ivan Savenko
829b754091 Implemented matches history in lobby 2024-03-27 13:10:55 +02:00
Ivan Savenko
0b89d3804c Added Ukrainian translation 2024-03-27 13:10:55 +02:00
Ivan Savenko
df5af589ae Implemented per-language, player-player and (untested) match channels. 2024-03-27 13:10:55 +02:00
Ivan Savenko
5d188024db Set room status to "In Game" once gameplay starts 2024-03-27 13:10:55 +02:00
Ivan Savenko
7c9aa9d953 Show all rooms (including private) in room list 2024-03-27 13:10:55 +02:00
Ivan Savenko
69236b73ca Added player count icon and enter room icon to room widget 2024-03-27 13:10:55 +02:00
Ivan Savenko
d6aa9845de Reduced size of pre-existing icons 2024-03-27 13:10:55 +02:00
Ivan Savenko
310b81db9f Fixes UI of buttons in lobby to use blue theme 2024-03-27 13:10:55 +02:00
kdmcser
cbfd0d05b0 update Chinese translation 2024-03-24 14:14:41 +08:00
Ivan Savenko
20008cd5a5 Replaced premade buttons on hero screen with generated ones 2024-02-29 13:57:25 +02:00
Ivan Savenko
e89835779b Replaced custom buttons in options window with runtime-generated ones 2024-02-29 13:57:25 +02:00
Ivan Savenko
0051ffa7a9 Implemented configurable buttons. Replaced 'animateLonelyFrame' logic. 2024-02-29 13:57:25 +02:00
Ivan Savenko
bd901cb001 Replaced lines in settings with primitives 2024-02-19 16:55:07 +02:00
Ivan Savenko
ef8eb330d6
Merge branch 'develop' into random_template_description 2024-02-11 17:54:18 +02:00
Ivan Savenko
f2ecd4cf11 Merge branch 'develop' into 'lobby' 2024-02-11 16:13:13 +02:00
Ivan Savenko
51f24178a3
Merge pull request #3603 from macomarivas/develop
Updated spanish.json translation
2024-02-11 12:28:01 +02:00
Ivan Savenko
4a0dd2da2c Added option to create new account even if player already have one 2024-02-09 23:02:41 +02:00
Asirome
51756f9889
Updated spanish.json translation 2024-02-08 10:45:24 +01:00
Tytannial
23e1b38c4f Update Chinese translation 2024-02-07 08:50:40 +08:00
Ivan Savenko
b160cf1598
Merge pull request #3579 from kdmcser/develop
update Chinese translation
2024-02-05 18:44:59 +02:00
Ivan Savenko
d4bedd8d8d Fixed handling of match server crash 2024-02-04 19:58:09 +02:00
Ivan Savenko
80fc2bb695 Merge remote-tracking branch 'vcmi/develop' into lobby 2024-02-03 21:11:34 +02:00
Tomasz Zieliński
b7df6064cd Add random map description and display it in RMG menu 2024-02-03 16:23:56 +01:00
Ivan Savenko
049c352511 Added loss condition "lose part of Angelic Alliance" to Yog campaign 2024-01-31 12:52:16 +02:00
Laserlicht
4aaebc834e
Merge branch 'develop' into end_autocombat 2024-01-29 21:36:11 +01:00
Laserlicht
7cc004e139
code review 2024-01-29 21:33:20 +01:00
kdmcser
131e5600cd update Chinese translation 2024-01-29 23:26:04 +08:00
Laserlicht
4508800400
fix transl 2024-01-27 17:41:21 +01:00
Laserlicht
0225590bb5
add info for not implemented replay; reorder button code; fix exit position 2024-01-27 17:36:19 +01:00
Laserlicht
a2fd5039ab
setting 2024-01-27 01:16:55 +01:00
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