Commit Graph

12330 Commits

Author SHA1 Message Date
juliancoffee
54a1adea31 Assets work
* Remove endgame /kit, move cultist weapons to cultist, move legendaries
  to tier-5
* Remove root_evil sceptre from endgame travelers
2022-09-05 00:24:59 +03:00
juliancoffee
421aa44d5f Make kit generate all possible modulars 2022-09-05 00:24:58 +03:00
juliancoffee
0c5a33b031 Add functions to generate collection of modulars 2022-09-05 00:24:58 +03:00
Imbris
81b8521710 Merge branch 'imbris/server-arg-for-airshipper' into 'master'
Add `--server` argument to specify the server when launching voxygen.

See merge request veloren/veloren!3591
2022-09-04 19:02:43 +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
Imbris
1888863915 Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu. 2022-09-03 17:26:07 -04: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
Isse
01efcbf69d Merge branch 'zDrag0nG/update-es_ES' into 'master'
Update Spanish translation

See merge request veloren/veloren!3588
2022-09-02 23:20:00 +00:00
Joshua Barretto
f45cb7ce3a Merge branch 'zesterer/better-stable-dt' into 'master'
Switched to median dt for stable dt

See merge request veloren/veloren!3540
2022-09-02 17:53:35 +00:00
Joshua Barretto
6a1e560906 Switched to median dt for stable dt 2022-09-02 18:21:24 +01:00
Dong
17cd06bc5e Update Spanish translation 2022-09-02 17:51:18 +02:00
Isse
6c456ac113 Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translation

See merge request veloren/veloren!3581
2022-09-01 08:21:07 +00:00
Jonathan Berglin
cf9f2d36d0 Update swedish translation 2022-09-01 08:21:07 +00:00
Marcel
aa7cdd2864 Merge branch 'christof/econ_goods_in_ron' into 'master'
Economy: Move decay and transportation effort from hardcoded into ron

See merge request veloren/veloren!3578
2022-08-31 08:26:24 +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
Marcel
defb72d81c Merge branch 'MadirexRus/russian-translation-fix' into 'master'
Russian translation fixes

See merge request veloren/veloren!3576
2022-08-30 12:29:18 +00:00
MadirexRus
8f1c45af17 Russian translation fixes 2022-08-30 12:29:18 +00:00
Imbris
0678273a3f Merge branch 'juliancoffee/fix-i18n-keys' into 'master'
Fix hud-skill-sc_wardaura_duration key

See merge request veloren/veloren!3577
2022-08-29 23:01:46 +00:00
Christof Petig
5e2474230e oh, Potions do not decay in master 2022-08-30 00:37:38 +02:00
Christof Petig
863f9857b5 cargo fmt 2022-08-30 00:37:38 +02:00
Christof Petig
04b7090197 handle terrain more correctly 2022-08-30 00:37:38 +02:00
Christof Petig
fbe0aee40d move trading good properties (decay, transportation) from hard coded to ron file 2022-08-30 00:37:38 +02:00
juliancoffee
b892e00699 Fix hud-skill-sc_wardaura_duration key 2022-08-30 00:49:40 +03: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
Joshua Yanovski
6032dbd22a Merge branch 'seachapel_fixes' into 'master'
seachapel_fixes

See merge request veloren/veloren!3572
2022-08-27 08:03:04 +00:00
flo666
eae1c5ff69 set difficulty indicator to 4 2022-08-27 08:11:35 +02:00
flo666
1876d169c8 - Dagon, SeaCrocodile hitboxes 2022-08-27 08:06:33 +02:00
flo666
87bac7c24a - remove barriers in chapel tube & tower tube
- change pitfall entry
2022-08-26 17:40:46 +02:00
juliancoffee
76cd36b179 Remake price-tips internationalization 2022-08-26 17:56:32 +03:00
Imbris
bc51d4d2a7 Merge branch 'imbris/subscription-vd-fix' into 'master'
Fix issue with the region subscription system not updating on view distance changes and other semi related changes

See merge request veloren/veloren!3557
2022-08-26 04:12:02 +00:00
Imbris
d3c90f9078 Update changelog, update client/src/bin/* with changes in Client API 2022-08-25 23:25:58 -04:00
Imbris
7d88baef42 Move up changelog entries that were added after the latest release 2022-08-25 23:25:31 -04:00
Imbris
4126194a5c View distances small fixes and improvement:
* Properly set view_distance field in Client when sending it to the
  server in request_character/request_spectator.
* Removed invalid check I had included in Client::set_view_distance
* ViewDistances::clamp now clamps min to 1 for both types of view distance.
2022-08-25 23:24:43 -04: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
cc1de8334d Clean up common/src/lib.rs to avoid repetitive wasm cfgs. Not many lines
actually removed but it looks a lot better IMO.
2022-08-25 23:24:43 -04:00
Imbris
37caab539c Replace uses of "65" with client::MAX_SELECTABLE_VD in client and
voxygen crates.
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
Imbris
895d6a2d8b Impove UX of server limits on the view distance
* When client gets its view distance set by the server it stores that as
  the max view distance allowed by the server.
* This is used to avoid skip sending requests if `set_view_distance` is
  called with larger values.
* This is then also displayed in the UI via greying out the slider when
  it goes past the limit and drawing another slide at the limit.
* The server clamping the client's view distance no longer leads to
  edits in voxygen's view distance settings (the view distance setting
  is instead preserved).
2022-08-25 23:24:43 -04:00
Imbris
c36d6e873f Fix issue with the region subscription system not updating on view
distance changes (until the player crossed a chunk boundary and
triggered the normal update).

This introduces a `ViewDistance` struct that provides an abstraction
around limiting the rate the view distance can be cycled up and down.
This helps avoid unnecessary sending, deleting, and then resending of
synced things like entities (the client will still delete its terrain
locally and re-request it though).

The second part of this fix is storing the last view distance in the
`RegionSubscription` struct and then updating region subscriptions if
this doesn't match the current view distance in the `Presence`
component.
2022-08-25 23:24:43 -04:00
Imbris
638d91e58a Merge branch 'changelog-fix' into 'master'
put seachapel in unrealesed in changelog

See merge request veloren/veloren!3568
2022-08-26 03:20:39 +00:00
tygyh
355f916a99 Update translations 2022-08-25 20:47:13 +02:00
flo666
b1176aa9d3 set difficulty indicator to 3 2022-08-25 16:32:31 +02:00
Ben Wallis
a00a92def1 Merge branch 'juliancoffee/fix-i18n-keys' into 'master'
Fix i18n keys

See merge request veloren/veloren!3567
2022-08-25 14:15:21 +00:00