Commit Graph

2285 Commits

Author SHA1 Message Date
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
10e4b94599 Update the Spanish LA translation. 2022-09-25 17:07:31 +00:00
0b0fde5254 Faster wave shader 2022-09-23 00:08:23 +01:00
34522b39bd Balance caustics with depth better 2022-09-22 23:45:16 +01:00
3b195fbd55 Improved shiny water shader 2022-09-22 23:08:32 +01:00
4bb5660f40 Fixed incorrect specular light in water 2022-09-22 22:40:16 +01:00
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
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
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
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
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
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
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
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
0ae7980a2a Update the Russian translation 2022-09-18 19:57:38 +00:00
bb0382e76c Koboo/update de de 2022-09-18 18:58:34 +00:00
6ad02b1fb0 Added i18n stuff for volume muting keybinds for en and pl_PL locales 2022-09-16 22:17:00 +02:00
716d4e476e Updated mute buttons to have less distracting borders (they don't have indexed color) 2022-09-16 21:58:09 +02:00
a724c014c8 Update swedish translation 2022-09-15 13:32:26 +00:00
54e3b3e9f5 Koboo/update de de 2022-09-14 07:48:19 +00:00
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
71c2d99aef Update the German translation (hud-skill-dodge resolve error) 2022-09-12 16:58:39 +02:00
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
b3b2f404e5 Fixed FXAA at non-1.0x scales 2022-09-10 13:33:38 +01:00
85a1c06be6 Better depth-aware HQX 2022-09-10 13:16:47 +01:00
80fa0baf09 Added HQX anti-aliasing 2022-09-10 10:56:22 +01:00
03e8eb42ad Added experimental BetterAA shader 2022-09-09 11:59:40 +01:00
aa7569061b Merge branch 'juliancoffee/more-buffs' into 'master'
Add Golden Cheese debug potion

See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
411aa3b0d9 Merge branch 'matheusclmb/update-pt_BR' into 'master'
pt_BR - Added all missing keys and formatted some old ones.

See merge request veloren/veloren!3556
2022-09-07 04:12:31 +00:00
3cbfe02a8e Add Golden Cheese debug item 2022-09-06 15:50:04 +03:00
34c5e95d8a Add Energy regen buff
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
7ea720b2ef Merge branch 'creature_model_updates' into 'master'
Creature model updates

See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
c39be960a0 Merge branch 'zDrag0nG/update-es_ES' into 'master'
Update Spanish Translation

See merge request veloren/veloren!3594
2022-09-04 23:41:15 +00:00
18e1b48006 Update Spanish Translation 2022-09-04 23:41:15 +00:00
9dbff4c342 [voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing) 2022-09-03 20:24:50 -04:00
36167f2e3a Renamed some files, added missing img_ids. 2022-09-03 21:56:25 +02:00
33ded63da9 Improved mute button assets (TODO merge with a5f446a7) 2022-09-03 21:56:25 +02:00
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
e35e533d88 Merge branch 'sau/update-es_ES' into 'master'
update the Spanish translation

See merge request veloren/veloren!3583
2022-09-02 23:29:40 +00:00
Sau
767041ae5c update the Spanish translation 2022-09-02 23:29:40 +00:00
17cd06bc5e Update Spanish translation 2022-09-02 17:51:18 +02:00
cf9f2d36d0 Update swedish translation 2022-09-01 08:21:07 +00:00
91a4a9e187 Merge branch 'put_organ_under_toolkind_instrument' into 'master'
put Organ under Toolkind Instrument

See merge request veloren/veloren!3580
2022-08-30 16:55:03 +00:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
8f1c45af17 Russian translation fixes 2022-08-30 12:29:18 +00:00