Commit Graph

717 Commits

Author SHA1 Message Date
Monty Marz
3abfa4d2cc Add Exp-Bar 2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1 Merge branch 'master' into 'master'
Italian transaltion

See merge request veloren/veloren!3687
2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8 Italian transaltion 2022-11-21 16:24:06 +00:00
Marcel
107cc8963f Merge branch 'Halosesparta13-master-patch-90913' into 'master'
Translation for the "ability.ftl" file to the es_LA folder

See merge request veloren/veloren!3613
2022-11-20 18:16:49 +00:00
Halosesparta
cfcf197e32 Translation for the "ability.ftl" file to the es_LA folder 2022-11-20 18:16:48 +00:00
Marcel
e5979c78f8 Merge branch 'kuba1001t/update-pl_PL' into 'master'
Update polish translations

See merge request veloren/veloren!3677
2022-11-20 18:13:01 +00:00
tygyh
abd2e0832f Update swedish translations 2022-11-01 11:05:51 +01:00
Kuba 1001
92465bfe59 lang(pl_PL): update polish translations 2022-10-28 17:46:17 +02:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
1782408676 Address UX issues of contextual abilities. 2022-10-27 20:07:08 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed.
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
356c26cc66 UI for sword skill tree. 2022-10-27 20:06:54 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Marcel
779cccd238 Merge branch 'kevinsmia1939/thai-translate' into 'master'
Improve and fix Thai translation.

See merge request veloren/veloren!3666
2022-10-25 21:37:58 +00:00
Kavin Teenakul
40c949c274 Improve and fix Thai translation. 2022-10-25 21:37:58 +00:00
kitswas
9b692d072f Added checkbox in the settings for poisebar
See [this message on Discord](https://discord.com/channels/449602562165833758/1014778601368997958/1033838446575370351).
2022-10-24 22:05:11 +05:30
Joshua Barretto
40e47b4f3e Added reflection mode settings 2022-10-23 20:03:21 +01:00
Joshua Barretto
3f2efea4f2 Experimental river velocity in shaders 2022-10-23 01:42:00 +01:00
tygyh
fcc096c599 Update swedish translation 2022-10-05 09:48:18 +02:00
Marcel
f07c0b67ee Merge branch 'update_simplified_chinese' into 'master'
Upgrade Simplified Chinese Translation

See merge request veloren/veloren!3641
2022-10-04 22:59:41 +00:00
WanCheng Ye
85b345054e Upgrade Simplified Chinese Translation 2022-10-04 22:59:41 +00:00
Marcel
b9c249940c Merge branch 'galaipa/update-eu' into 'master'
Translate missing Basque strings

See merge request veloren/veloren!3647
2022-10-04 22:25:23 +00:00
Bingen Galartza
4c4a1bf80b Translate missing Basque strings 2022-10-04 22:25:23 +00:00
Marcel
4b0033ff91 Merge branch 'Nether190/update-pt_BR' into 'master'
Nether190/update-pt_BR

See merge request veloren/veloren!3632
2022-10-04 22:10:11 +00:00
Valter Sanches
60c3d80d57 Nether190/update-pt_BR 2022-10-04 22:10:11 +00:00
Marcel
f584a3f0f6 Merge branch 'fix_Latin-American_translation' into 'master'
correction in the translation Spanish Latin American

See merge request veloren/veloren!3646
2022-10-04 21:50:03 +00:00
Henning Meyer
8581d3da38 Complete German Translation 2022-10-02 17:45:26 +00:00
Juan Pablo Lagos
b716284ef2 correction in the translation Spanish Latin American 2022-10-02 17:09:55 +09:00
Henning Meyer
fee11cc438 German Translation Edits 2022-10-01 16:53:27 +00:00
Marcel
dd5523785c Merge branch 'master' into 'master'
UA localization update

See merge request veloren/veloren!3640
2022-09-29 18:00:41 +00:00
fanix472
34e75a1796 UA localization update 2022-09-29 18:00:40 +00:00
Marcel Märtens
0fe0192a2d get rid of string replacements in template strings 2022-09-29 17:33:53 +02:00
Marcel Märtens
ba260e8419 translate MOD and YOU messages 2022-09-27 13:46:12 +02:00
Welvex
10e4b94599 Update the Spanish LA translation. 2022-09-25 17:07:31 +00:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master'
seachapel npc work

See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff Merge branch 'sharp/parallel-ingame' into 'master'
Parallelize ingame messages.

See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet.
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Marcel
f590e68f7e Merge branch 'mckol/mute-keybinds' into 'master'
Mute audio keybinds (and respective buttons in settings)

See merge request veloren/veloren!3361
2022-09-21 09:22:45 +00:00
Imbris
1b48a3008c Merge branch 'Couls/TestBed' into 'master'
Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
Marcel
27a368defd Merge branch 'MadirexRus/update-ru_RU' into 'master'
Update the Russian translation

See merge request veloren/veloren!3631
2022-09-18 19:57:38 +00:00
MadirexRus
0ae7980a2a Update the Russian translation 2022-09-18 19:57:38 +00:00
Koboo
bb0382e76c Koboo/update de de 2022-09-18 18:58:34 +00:00
LunarEclipse
6ad02b1fb0 Added i18n stuff for volume muting keybinds for en and pl_PL locales 2022-09-16 22:17:00 +02:00
Jonathan Berglin
a724c014c8 Update swedish translation 2022-09-15 13:32:26 +00:00
Koboo
54e3b3e9f5 Koboo/update de de 2022-09-14 07:48:19 +00:00
Koboo
71c2d99aef Update the German translation (hud-skill-dodge resolve error) 2022-09-12 16:58:39 +02:00