James Melkonian
99d547c7c6
Add unit test to validate recipe keys
2022-10-09 20:50:09 -07:00
Marcel
160cbbf449
Merge branch 'steel_pick_desc' into 'master'
...
Removes blue vein reference from Steel Pickaxe description
See merge request veloren/veloren!3491
2022-10-09 19:50:31 +00:00
Julio Cezar Silva
0d090bb93e
Removes blue vein reference from Steel Pickaxe description
2022-10-09 19:50:30 +00: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
Marcel
e5dfc6261c
Merge branch 'ztianyang/lantern' into 'master'
...
Crafting recipe for black lantern
See merge request veloren/veloren!3590
2022-10-02 17:46:38 +00:00
Tianyang Zhang
99bedde100
Crafting recipe for black lantern
2022-10-02 17:46:36 +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
Marcel
a1d0d0283f
Merge branch 'Welvex/update-es_LA' into 'master'
...
Update the Spanish LA translation.
See merge request veloren/veloren!3635
2022-09-25 17:07:31 +00:00
Welvex
10e4b94599
Update the Spanish LA translation.
2022-09-25 17:07:31 +00:00
Joshua Barretto
0b0fde5254
Faster wave shader
2022-09-23 00:08:23 +01:00
Joshua Barretto
34522b39bd
Balance caustics with depth better
2022-09-22 23:45:16 +01:00
Joshua Barretto
3b195fbd55
Improved shiny water shader
2022-09-22 23:08:32 +01:00
Joshua Barretto
4bb5660f40
Fixed incorrect specular light in water
2022-09-22 22:40:16 +01:00
Joshua Barretto
b48b3eea02
Improved caustic shaders
2022-09-22 21:12:20 +01:00
flo
cfbadd36ea
fix_desert_rock_animals
2022-09-22 18:42:34 +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
LunarEclipse
716d4e476e
Updated mute buttons to have less distracting borders (they don't have indexed color)
2022-09-16 21:58:09 +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
Joshua Yanovski
0d09d1f88e
Merge branch 'fix_salamander_and_elbst' into 'master'
...
fix_salamander_and_elbst
See merge request veloren/veloren!3609
2022-09-13 17:32:53 +00:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Koboo
71c2d99aef
Update the German translation (hud-skill-dodge resolve error)
2022-09-12 16:58:39 +02:00
Samuel Keiffer
513b135d58
Merge branch 'floppy_instrument_sample_edits' into 'master'
...
add guitar & instrument sample edits
See merge request veloren/veloren!3574
2022-09-10 17:23:38 +00:00
flo
e43608ce80
add guitar & instrument sample edits
2022-09-10 17:23:38 +00:00
Joshua Barretto
b3b2f404e5
Fixed FXAA at non-1.0x scales
2022-09-10 13:33:38 +01:00
Joshua Barretto
85a1c06be6
Better depth-aware HQX
2022-09-10 13:16:47 +01:00
Joshua Barretto
80fa0baf09
Added HQX anti-aliasing
2022-09-10 10:56:22 +01:00
