Commit Graph

5513 Commits

Author SHA1 Message Date
flo
ab89750a9a Merge branch 'terracotta_tweaks' into 'master'
terracotta_small_tweaks

See merge request veloren/veloren!4332
2024-02-21 21:52:09 +00:00
flo
673425f9f1 terracotta_small_tweaks 2024-02-21 21:52:09 +00:00
Samuel Keiffer
94f6c3350c Merge branch 'danielkenji83/block-based-on-poise' into 'master'
Block based on poise

See merge request veloren/veloren!4283
2024-02-21 16:53:24 +00:00
Imbris
b05350946a Merge branch 'imbris/shaderc-opt-default-off' into 'master'
Make shaderc optimization off by default for now

See merge request veloren/veloren!4335
2024-02-21 16:44:29 +00:00
Imbris
9ff9a535fd Make shaderc optimization off by default for now since wgpu currently rejects if fragment shader inputs are optimized out such that they don't match fragment shader outputs 2024-02-21 00:18:06 -05:00
uniior
e720ee834e Initial 2024-02-20 16:18:01 +01:00
danielkenji83
961edf910d Updates from review 2024-02-19 19:42:37 -03:00
danielkenji83
c449b229d5 Updates from review 2024-02-17 19:09:32 -03:00
danielkenji83
53fddba3ef Remove block_strength stat 2024-02-17 13:12:34 -03:00
danielkenji83
81cfb26059 Updates from review 2024-02-17 00:50:30 -03:00
danielkenji83
5c401215cf Rebase commit 2024-02-17 00:50:23 -03:00
Imbris
8e62c17a81 Merge branch 'imbris/shaderc-opt' into 'master'
Fix issue with missing capability when enabling shaderc optimizations

Closes #1936

See merge request veloren/veloren!4322
2024-02-15 17:25:12 +00:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
Imbris
ab24cf3732 Switch to using an experimental shader option to toggle shaderc optimizations 2024-02-14 16:36:59 -05:00
Imbris
5434ce546b Fix issue with missing capability when enabling shaderc optimizations
See https://github.com/gfx-rs/wgpu/issues/4915

Also:
* Remove unused vert-out frag-in variables from shaders (naga doesn't
  like this probably because they are optimized out on the fragment
  side). This restriction from naga may be relaxed in the future
  see https://github.com/gfx-rs/wgpu/issues/3748.
* Enable OptimizationLevel::Performance for shaderc by default
* Add a environment variable VOXYGEN_SHADERC_OPTS for disabling this
  (e.g. to test if it actually makes a difference on any platform).
  (TODO: testing might be easier if there was a way to do toggle it
  without restarting...)
2024-02-14 16:36:59 -05:00
evgenkot
f4ce05a657 I18n move stats 2024-02-13 17:01:27 +05:00
evgenkot
eb4911f60d I18n pickup-msg correction for en uk ru 2024-02-12 23:26:14 +05:00
evgenkot
eee330c9e9 I18n loot_scroller correct name 2024-02-12 21:24:57 +05:00
evgenkot
f9ee398a17 I18n loot_scroller user_gender 2024-02-12 21:24:57 +05:00
Imbris
59596874e1 Don't include compute in shadow push constant shader stages
(avoids panic on metal backend: https://gitlab.com/veloren/veloren/-/issues/1951)
2024-02-11 12:29:07 -05:00
Joshua Barretto
cdd94c899f Minor tweaks to aiming 2024-02-09 22:43:35 +00:00
juliancoffee
ce98de4370 Move debug_vectors_enabled flag to Scene 2024-02-08 16:25:40 +02:00
juliancoffee
ff3f1b9b1c Re-enable glider trails 2024-02-08 16:25:40 +02:00
juliancoffee
1dee12af85 Improve airflow particles 2024-02-08 16:25:39 +02:00
juliancoffee
16c41109d3 Add Air Velocity to debug info 2024-02-08 16:25:39 +02:00
juliancoffee
52328b89d2 rebase 2024-02-08 16:25:39 +02:00
laundmo
283b404724 Working wind/lift particles
+ clippy fixes
2024-02-08 16:25:39 +02:00
laundmo
2ae7c68dde move sun/moon direction to common 2024-02-08 16:25:39 +02:00
laundmo
4e37430189 draw debug vectors, and toggle them in egui 2024-02-08 16:25:39 +02:00
laundmo
761953513b Initial work for gliding lift, updraft, thermals 2024-02-08 16:25:38 +02:00
Nadja von Reitzenstein Čerpnjak
2d2ffa2b10 Add SRV lookup functionality to voxygen
This will make voxygen issue a SRV lookup when connecting to a host, allowing server owners to configure non-standard ports for servers and host servers using vanity domains easily. It additionally allows servers to be hosted on both QUIC and TCP at the same time, with the client connecting to the preferred protocol automatically, but gracefully falling back if a connection is not possible.
2024-02-07 14:28:37 +01:00
juliancoffee
895d0e604e Fix /tell messages 2024-02-06 14:44:52 +02:00
Marcel
56f8587ce1 Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `nightly-2024-01-17`

See merge request veloren/veloren!4257
2024-02-06 09:48:04 +00:00
Marcel Märtens
6ebbb89d4d update toolchain to nightly-2024-01-17 2024-02-05 19:51:50 +01:00
juliancoffee
c8fa6f8b74 Widen Item Tooltip 2024-02-05 00:40:27 +02:00
juliancoffee
30717f46af Remove tracing::error! to avoid log-spam
This error shouldn't be possible to trigger, unless you're playing as
spectator in which case you don't have a character, so we can't pick
right gender.
This should be fixed when we do add UI to pick the gender.
2024-02-04 18:45:07 +02:00
juliancoffee
0d69a258b1 Address review 2024-02-03 22:19:03 +02:00
juliancoffee
913cc169d8 Refactor buff handling in kill message match expr 2024-02-03 19:56:17 +02:00
juliancoffee
5aa88ac223 Store the gender in CharacterInfo 2024-02-03 18:58:46 +02:00
juliancoffee
eeb7cab8c3 Implement gender, kind of 2024-02-03 18:58:46 +02:00
juliancoffee
450de681e4 Refactor chat message i18n
- All message types now use i18n to declare format, similar to /tell
- hud-chat-you is removed for now, along with its usage in
  insert_alias()
2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448 Remove/Deprecate KillSource::Environment 2024-02-03 18:58:46 +02:00
juliancoffee
f7b8e079b4 Expose player gender to existing chat messages
TODO: localize /tell and expose gender in 'hud-chat-you'
2024-02-03 18:58:46 +02:00
Tim Vincent
87ff55e938 resets the cursor position instead of centering it when grabbed 2024-02-02 21:46:37 -08:00
Sam
b87d1b649d Overflwo slots now appear as red in the inventory. 2024-02-02 20:06:59 -05:00
Sam
632e922db6 Overflow slots displayed in bag 2024-02-02 20:06:58 -05:00
Sam
d01997ca56 Overflow slots as slots 2024-02-02 20:06:55 -05:00
Woeful_Wolf
7b843444be Renamed closest_points_ls3 to closest_points_3d, added comments, disable raycast aiming in FPV, get shortest between entity and terrain raycast 2024-02-02 18:11:37 +02:00
Woeful_Wolf
63394719a1 Make camera offsets and aiming system only apply when wielding ranged 2024-02-01 23:33:05 +02:00