Commit Graph

2378 Commits

Author SHA1 Message Date
flo666
60a48e450c facegourd and helmet offset (Female Orc) 2022-10-23 20:05:39 +02:00
flo666
1d98050f28 halloween npcs:
in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd
2022-10-23 20:05:39 +02:00
Joshua Barretto
b85fd11443 Added refraction 2022-10-23 15:15:25 +01:00
Joshua Barretto
c072dc4082 Place puddle details behind extra experimental shader 2022-10-23 01:42:01 +01:00
Joshua Barretto
d0894a189e Added SSR to wet surfaces 2022-10-23 01:42:01 +01:00
Joshua Barretto
a7c24ed518 Added figure noise 2022-10-23 01:42:01 +01:00
Joshua Barretto
ae66432a1e Make cheap water look better underwater 2022-10-23 01:42:01 +01:00
Joshua Barretto
764adb67c7 Fixed no SSR shaders 2022-10-23 01:42:01 +01:00
Joshua Barretto
51c3a25b9a Handle obscured SSR elements better 2022-10-23 01:42:01 +01:00
Joshua Barretto
be8ef302bc Make SSR water verticals behave better 2022-10-23 01:42:01 +01:00
Joshua Barretto
d40be0ea5f Apply clouds more correctly 2022-10-23 01:42:01 +01:00
Joshua Barretto
d4c81cf8b8 Handle SSR transition better 2022-10-23 01:42:01 +01:00
Joshua Barretto
9285e48ff0 Don't reflect rain 2022-10-23 01:42:01 +01:00
Joshua Barretto
8dd63940b0 Fixed SSR at distance 2022-10-23 01:42:01 +01:00
Joshua Barretto
bc4c93bc5e More accurate SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
0561a168de Added tracing to SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
387d7e65d2 Improved SSR quality 2022-10-23 01:42:00 +01:00
Joshua Barretto
daef86d813 Make screen-space reflections an experimental shader 2022-10-23 01:42:00 +01:00
Joshua Barretto
f00cc5f2de The worst SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
81ac4f9125 Various water-related lighting fixes 2022-10-23 01:42:00 +01:00
Joshua Barretto
b45586902a Made cheap water display velocity 2022-10-23 01:42:00 +01:00
Joshua Barretto
ce7dda3e2f Substantially faster water shaders 2022-10-23 01:42:00 +01:00
Joshua Barretto
30de7b4fb8 Better attenuation 2022-10-23 01:42:00 +01:00
Joshua Barretto
db4cc21ec3 Fixed seams 2022-10-23 01:42:00 +01:00
Joshua Barretto
3f2efea4f2 Experimental river velocity in shaders 2022-10-23 01:42:00 +01:00
flo
1d04c9ba8c floppy_instrument_samples 2022-10-21 07:58:41 +00:00
Monty Marz
3a63f210b2 fix drop model for chieftain mask 2022-10-21 00:20:15 +02:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +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
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
Joshua Barretto
03e8eb42ad Added experimental BetterAA shader 2022-09-09 11:59:40 +01:00
Samuel Keiffer
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
Imbris
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
juliancoffee
3cbfe02a8e Add Golden Cheese debug item 2022-09-06 15:50:04 +03:00
juliancoffee
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
Isse
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
Dominik Broński
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
zDrag0nG
18e1b48006 Update Spanish Translation 2022-09-04 23:41:15 +00:00
Imbris
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
LunarEclipse
36167f2e3a Renamed some files, added missing img_ids. 2022-09-03 21:56:25 +02:00
LunarEclipse
33ded63da9 Improved mute button assets (TODO merge with a5f446a7) 2022-09-03 21:56:25 +02:00
Mckol
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
Isse
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
Dong
17cd06bc5e Update Spanish translation 2022-09-02 17:51:18 +02:00
Jonathan Berglin
cf9f2d36d0 Update swedish translation 2022-09-01 08:21:07 +00:00
Ben Wallis
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
MadirexRus
8f1c45af17 Russian translation fixes 2022-08-30 12:29:18 +00:00
Marcel
f3e13ee49d Merge branch 'sau/update-es_ES' into 'master'
update the Spanish translation

See merge request veloren/veloren!3575
2022-08-29 20:19:39 +00:00
Marcel
60f05f45a7 Merge branch 'juliancoffee/better-i18n-keys' into 'master'
Remake price-tips internationalization

See merge request veloren/veloren!3571
2022-08-29 12:18:36 +00:00
Sau
a8ff0e4e5f update the Spanish translation 2022-08-29 11:48:54 +00:00
Samuel Keiffer
52ce12f383 Merge branch 'floppy-music-instruments' into 'master'
Music Instruments

See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
Marcel
1a11205dbf Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3561
2022-08-28 16:38:16 +00:00
juliancoffee
76cd36b179 Remake price-tips internationalization 2022-08-26 17:56:32 +03:00