Commit Graph

2301 Commits

Author SHA1 Message Date
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
Imbris
e626519ec0 Replace "Present Mode" options with more user friendly terms:
'Fifo'       ->  'Vsync capped'
'Mailbox'    ->  'Vsync uncapped'
'Immediate'  ->  'Vsync off'
2022-08-25 23:24:43 -04:00
Imbris
334937568e Add an entity view distance setting that allows limiting the distance
entities are synced from and displayed in.

NOTE: Syncing entities work at the granularity regions which are
multi-chunk squares but the display of entities in voxygen is limited in
a circle with the radiues of the supplied distance.

Additional details and changes:
* Added `ViewDistances` struct in `common` that contains separate
  terrain and entity view distances (the entity view distance will be
  clamped by the terrain view distance in uses of this).
* View distance requests from the client to the server now use this
  type.
* When requesting the character or spectate state the client now passes
  its desired view distances. This is exposed as a new parameter on
  `Client::request_character`/`Client::request_spectate`. And the client
  no longer needs to send a view distance request after entering these
  states. This also allows us to avoid needing to initialize `Presence`
  with a default view distance value on the server.
* Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the
  change tracking isn't used for these components.
* Add sliders in voxygen graphics and network tabs for this new setting.
  Show the clamped value as well as the selected value next to the
  slider.
* Rename existing "Entities View Distance" slider (which AFAIK controls
  the distance at which different LOD levels apply to figures) to
  "Entities Detail Distance" so we can use the former name for this new
  slider.
2022-08-25 23:24:43 -04:00
tygyh
355f916a99 Update translations 2022-08-25 20:47:13 +02:00
flo
f9a31094b6 remove common_ron 2022-08-25 09:01:00 +00:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
tygyh
c5b83e0166 Update swedish translations 2022-08-23 21:18:32 +02:00
Matheus
055f40ddc6 changed/typo to generic masculine 2022-08-21 02:43:09 +00:00
Matheus
467e85dca2 typo fix 2022-08-21 02:28:36 +00:00
matheusclmb
3967501a03 Small/Cultural changes recommended by @jcezarms 2022-08-21 03:26:32 +01:00
matheusclmb
02d6090438 changed some words for better context 2022-08-21 01:42:12 +01:00
matheusclmb
fc9dca7e95 Added gameinput missing keys 2022-08-20 20:48:52 +01:00
matheusclmb
b662d9cce1 Added common missing keys 2022-08-20 20:48:36 +01:00
matheusclmb
636dbc8a22 Added char_selection missing keys 2022-08-20 20:48:20 +01:00
matheusclmb
b288214650 Added and formatted npcs missing keys 2022-08-20 20:48:04 +01:00
matheusclmb
00a13fd893 Added settings missing keys 2022-08-20 20:47:37 +01:00
juliancoffee
e15c375cb5 Use fluent attributes for abilities
* Better translation logic and ergonomics
* Cut two format!-s
2022-08-19 18:35:44 +03:00
Marcel
7587fb6e96 Merge branch 'tygyh/swedish-translation' into 'master'
Update swedish translations

See merge request veloren/veloren!3542
2022-08-19 07:53:01 +00:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something.
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
Marcel
c6bcdd7a2c Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master'
Implement i18n-tooling

See merge request veloren/veloren!3536
2022-08-17 20:39:00 +00:00
juliancoffee
3860b3ece3 Remove template.ftl file
They are empty anyway
2022-08-17 22:46:48 +03:00
tygyh
1ce4cb4901 Update swedish translations 2022-08-17 11:33:46 +02:00
AldanTanneo
ba87a405af Discord Activity 2022-08-15 15:58:37 +00:00
DaforLynx
daadf3abdb Gnarling Fort music; more specific sites; fix music spacing; new sfx 2022-08-14 01:57:58 +00:00
Julio Cezar Silva
9315482fc4 Craft all 2022-08-12 00:47:48 +00:00
DaforLynx
258feee634 Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing 2022-08-11 02:56:40 +00:00
IsseW
a165bc09bc character viewpoint 2022-08-09 18:45:45 +02:00
IsseW
bf44ebd12b spectate speedup key 2022-08-09 18:44:10 +02:00
Isse
0471e78f41 spectate mode :D 2022-08-09 18:43:13 +02:00
loki
a559645679 deleted .zip folder 2022-08-08 19:03:20 +03:00
loki
5d914c4577 changed folder to new format 2022-08-08 19:01:34 +03:00
loki
88b412f4c7 added romanian translation 2022-08-08 18:26:17 +03:00
Samuel Keiffer
8602a04e71 Merge branch 'floppy-DesertCity' into 'master'
DesertCity

See merge request veloren/veloren!3495
2022-08-08 09:58:19 +00:00
flo
5dd9991311 DesertCity 2022-08-08 09:58:18 +00:00
Samuel Keiffer
1066553f21 Merge branch 'juliancoffee/fluent-i18n' into 'master'
Use Fluent for localisation (l10n) and internationalisation (i18n)

See merge request veloren/veloren!3508
2022-08-07 18:21:31 +00:00
Marcel
4131b3ac20 Merge branch 'DaforLynx/river-hotfix' into 'master'
Lower volume of river sfx

See merge request veloren/veloren!3510
2022-08-06 21:29:38 +00:00
DaforLynx
9a8c288580 Lower volume of river sfx 2022-08-06 21:29:38 +00:00
juliancoffee
a994984b09 Migrate i18n files to new format 2022-08-06 21:57:08 +03:00
juliancoffee
48eeabcc93 Fix broken i18n files 2022-08-06 21:45:23 +03:00
Vincent Foulon
8862258f61 Deny any interaction received during hostile_tree 2022-08-06 18:31:42 +00:00
DaforLynx
bf4a582cf7 WIP: New music, "now playing" line in debug overlay, and music frequency slider 2022-08-01 17:41:44 +00:00
Isse
cfdc2a8ae6 Add setting to disable flashing lights 2022-07-31 21:53:25 +00:00
LunarEclipse
2a7174a4e6 Minor fixups of the Polish translation 2022-07-27 21:31:10 +02:00
Marcel
72b0b26004 Merge branch 'pfau/bg_new' into 'master'
new bg

See merge request veloren/veloren!3488
2022-07-22 11:49:57 +00:00
DaforLynx
d2710635d8 Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout 2022-07-21 08:27:35 +00:00
Monty Marz
6571068623 new bg 2022-07-19 20:53:06 +02:00
Marcel
35883c61cb Merge branch 'mckol/update-polish-translation' into 'master'
Update the Polish translation

See merge request veloren/veloren!3399
2022-07-17 11:50:50 +00:00
Joshua Barretto
0b16baf46a Improved rain performance 2022-07-16 14:44:58 +01:00
Treeco
7efddc33f7 Merge branch 'more_humanoid_models' into 'master'
Humanoid Model Overhaul

See merge request veloren/veloren!3478
2022-07-16 11:13:24 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Mckol
8861e12e70 Updated the Polish translation 2022-07-16 13:07:45 +02:00
Joshua Barretto
ea39f78dfd Minimised rain occlusion problems 2022-07-16 11:14:12 +01:00
Joshua Barretto
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00
Joshua Barretto
3c5de2991b More consistent texturing code 2022-07-15 08:43:35 +01:00
Joshua Barretto
9ad32b37e7 More efficient texture fetches 2022-07-15 08:43:34 +01:00
Joshua Barretto
61792d4135 Apply AO 2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917 Fixed lava 2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0 Better lighting and verticality in caves 2022-07-15 08:43:33 +01:00
Joshua Barretto
1f979e4133 More biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36 Began work on caves2 2022-07-15 08:42:56 +01:00
Joshua Barretto
62d2982990 Made rainbows ultra only 2022-07-15 07:08:30 +00:00
Joshua Barretto
e34f080c91 Fixed unrolling issue in rain shader 2022-07-15 07:06:11 +00:00
Joshua Barretto
964b315fc5 Fixed lightning point glow 2022-07-14 22:12:34 +00:00
Isse
5c7ed1e712 Merge branch 'vfoulon80/boat-loading-animation' into 'master'
Add a boat loading animation

See merge request veloren/veloren!3474
2022-07-14 07:17:30 +00:00
DaforLynx
194b1866c6 Music, ambience tweaks, and more 2022-07-14 00:55:35 +00:00
Joshua Barretto
f48665366b More lightning position variety 2022-07-13 21:45:37 +01:00
Vincent Foulon
2240fa4a23
Add a boat loading animation 2022-07-13 22:41:34 +02:00
Joshua Barretto
25c55b6a25 Better rain performance, wetness 2022-07-13 18:34:34 +01:00
Joshua Barretto
4e854a28ff Fixed occlusion bias 2022-07-10 16:56:45 +01:00
Joshua Barretto
d4906f55bc Fixed rain occlusion issues 2022-07-10 16:40:49 +01:00
Joshua Barretto
fc21b54f02 Better rain performance 2022-07-10 13:53:31 +01:00
Joshua Barretto
47b236b1f0 Better lightning rates, fixed shaders 2022-07-10 13:44:11 +01:00
Joshua Barretto
3b758cc7b0 Minor colour tweak 2022-07-09 02:25:24 +01:00
Joshua Barretto
85a292a854 Always take origin as lightning end point 2022-07-09 02:16:13 +01:00
Joshua Barretto
6fea7205fa Better lightning at distance 2022-07-09 02:08:55 +01:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
edc2720416 Better lightning effect 2022-07-09 00:39:18 +01:00