Commit Graph

4644 Commits

Author SHA1 Message Date
aea4aca057 Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
6c9deee491 revert wgpu/shaderc changes 2022-09-11 16:38:08 +02:00
a32b269252 steal sharps clippy improvements to the old nightly 2022-09-11 16:10:56 +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
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
796a5f2f90 Added the possibility to toggle muting of any volume category via a keybind 2022-09-09 11:39:27 +02:00
986d104faa Update Rust toolchain. 2022-09-08 15:43:53 -07:00
d9e6f10688 update dependencies 2022-09-08 23:29:08 +02:00
5bb27d9292 Fix swallowed network error messages. 2022-09-08 04:00:46 -07:00
58e74a26cd Revert "Merge branch 'revert-441acd3e' into 'master'"
This reverts commit f170da4da6, reversing
changes made to aa7569061b.
2022-09-08 12:28:56 +03:00
e55b541bcc Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
This reverts merge request !2951
2022-09-08 08:33:35 +00: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
c95c08ee54 Merge branch 'sharp/fix-full-server' into 'master'
Allow mods/admins to log in when server is full.

See merge request veloren/veloren!3600
2022-09-07 05:21:08 +00:00
f5aee1d2a7 Allow mods/admins to log in when server is full.
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).

Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen.  This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
441acd3e48 Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): refactor and update nix flake

See merge request veloren/veloren!2951
2022-09-07 03:42:28 +00: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
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
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
be9e0497d1 Fixed the ambience volume ui element positions 2022-09-03 21:56:25 +02:00
24c50fab3b Updated the code to use the new hover icons 2022-09-03 21:56:25 +02:00
36167f2e3a Renamed some files, added missing img_ids. 2022-09-03 21:56:25 +02:00
e9ba3ffa4a Added the possibility to not assign a default keybind to a GameInput 2022-09-03 21:56:00 +02:00
e4b213cac5 Added a keybind for muting the music [F8] 2022-09-03 20:33:08 +02:00
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
7a2d647400 build(nix): wrap veloren-voxygen in wrapper derivation 2022-09-03 07:12:18 +03:00
1ca6ebdda0 build(nix): add missing library for voxygen 2022-09-03 03:34:10 +03:00
5b901d9775 build(nix): update flake lock, fix stuff 2022-09-02 21:13:57 +03:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
b892e00699 Fix hud-skill-sc_wardaura_duration key 2022-08-30 00:49:40 +03:00
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
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
6032dbd22a Merge branch 'seachapel_fixes' into 'master'
seachapel_fixes

See merge request veloren/veloren!3572
2022-08-27 08:03:04 +00:00
eae1c5ff69 set difficulty indicator to 4 2022-08-27 08:11:35 +02:00
76cd36b179 Remake price-tips internationalization 2022-08-26 17:56:32 +03:00
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
37caab539c Replace uses of "65" with client::MAX_SELECTABLE_VD in client and
voxygen crates.
2022-08-25 23:24:43 -04:00
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
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
b1176aa9d3 set difficulty indicator to 3 2022-08-25 16:32:31 +02:00
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
49e8cec5eb Fix i18n keys 2022-08-25 16:30:26 +03:00
ae399b3c7c Remove cfg(feature = stat) for localization test 2022-08-25 14:23:27 +03:00
f2eb1fe7c8 Make i18n csv own binary
* Put file that needs care back into csv
2022-08-25 14:23:26 +03:00
9a0ac8dcce Make test_all_localizations run at unittest 2022-08-25 13:18:06 +03:00