f99bf91617
Added rules menu when connecting to server
2024-01-15 00:02:43 +01:00
3d9ab445d9
Added rules field to server description
2024-01-15 00:02:42 +01:00
05ca01ce89
Merge branch 'walpo/remove-twitter-refs' into 'master'
...
Remove Twitter account references on the documentation
Closes #1900
See merge request veloren/veloren!4187
2024-01-14 20:06:22 +00:00
b4ae34cd7c
Merge branch 'crabman/unstack-buffs' into 'master'
...
Don't stack buffs of the same kind with equal attributes
See merge request veloren/veloren!4251
2024-01-14 17:54:16 +00:00
dc215ace34
Merge branch 'juliancoffee/buff-misc-cmd' into 'master'
...
Add /buff_complex command
See merge request veloren/veloren!4243
2024-01-14 17:35:21 +00:00
3a7bb698fc
handle overlap and queueing correctly
2024-01-13 19:53:02 +01:00
df7c2ee70a
changelog
2024-01-13 18:58:50 +01:00
da08376e9a
Don't stack buffs of the same kind with equal attributes
2024-01-13 18:58:44 +01:00
3922d28c8b
Merge branch 'hrom/twig-shoulder-fix' into 'master'
...
renamed twiggy shoulders
See merge request veloren/veloren!4242
2024-01-09 23:54:32 +00:00
88c5a2e009
renamed twiggy shoulders
2024-01-09 23:54:32 +00:00
296f70c1b2
Unify /buff_complex and /buff
...
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
2024-01-08 20:13:17 +02:00
2746a98f40
Add /buff_complex command
2024-01-08 20:13:17 +02:00
5aa30b0175
Warn about complex buffs when using /buff
2024-01-08 20:13:17 +02:00
18742bc7fb
Fix veloren-server compilation
...
As veloren-server enables plugin feature automatically, it results in
veloren-common-state inherit this feature, which enables
common/state/plugin/mod.rs which asks for common::assets function that
is enabled only if plugin feature is enabled, but because
veloren-common-state doesn't depend on common::assets, this feature is
kind of lost half-way.
This commit fixes this by adding explicit optional dependency on
common-assets in common-state that is enabled by plugin feature.
2024-01-08 20:13:17 +02:00
f4939220cc
Add BuffKind::differentiate
2024-01-08 20:13:17 +02:00
5514df330b
Add BuffDescriptor enum
2024-01-08 20:13:17 +02:00
12a4c5a256
Merge branch 'the_dimasmith/update-uk' into 'master'
...
update Ukrainian translation
See merge request veloren/veloren!4215
2024-01-08 16:39:08 +00:00
95f63e46e6
update Ukrainian translation
2024-01-08 16:39:08 +00:00
16b2f05dbb
Merge branch 'isse/better-cave-entrances' into 'master'
...
Better cave entrances
See merge request veloren/veloren!4244
2024-01-07 13:43:18 +00:00
57efeecfbc
add to changelog
2024-01-07 13:15:43 +01:00
f8cb4369be
clamp cave alt base at terrain alt
2024-01-07 13:14:44 +01:00
4d4e7c8ea2
Merge branch 'yusdacra/nix-updates' into 'master'
...
build(nix): update flake dependencies and fix flake.nix
Closes #1916
See merge request veloren/veloren!4235
2024-01-06 02:53:48 +00:00
03e46de748
Merge branch 'imbris/construct-dispatcher-once' into 'master'
...
Only construct specs::Dispatcher once
See merge request veloren/veloren!4239
2024-01-06 02:47:37 +00:00
6eedea7821
review fixes #2
2024-01-04 19:55:17 -05:00
dbf3ed49a9
Merge branch 'More-potions' into 'master'
...
Potion of Agility
See merge request veloren/veloren!4197
2024-01-04 23:06:45 +00:00
db2a63357e
Update file CHANGELOG.md
2024-01-04 11:55:24 +00:00
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
807bd758b7
cargo fmt
2024-01-04 00:30:21 -05:00
6d57169875
review fixes
2024-01-04 00:01:08 -05:00
6c6b9181a5
Only construct specs::Dispatcher once
...
* use version of shred that has an added SendDispatcher so we can
construct the dispatcher and send it between threads (only State to
remain sendable)
* move closure for adding systems from State::tick to the creation
functions
* this does mean some voxygen systems always run instead of just in the
session state, but that should not cause issues and we can always
configure them to do nothing if needed
2024-01-03 18:11:06 -05:00
100568f955
Merge branch 'feat/time_length_on_map_settings' into 'master'
...
Feat: Day duration slider on map creation UI (#1909 )
Closes #1909
See merge request veloren/veloren!4204
2024-01-03 22:21:53 +00:00
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
6f28382a69
Merge branch 'shader-fixes' into 'master'
...
Avoid a warning in shader code (alleged unsupported function)
See merge request veloren/veloren!4238
2024-01-03 21:39:06 +00:00
c37f0d4c90
Merge branch 'imbris/convert-screenshot-earlier' into 'master'
...
Convert to rgb earlier in screenshot process.
See merge request veloren/veloren!4237
2024-01-03 20:21:32 +00:00
dc0725e104
Avoid a wgpu SPIR-V warning about BitFieldUExtract
...
premultiply-alpha-vert.glsl contains a function unpack() which, without this
change, causes the following warnings:
WARN wgpu_core::device: Failed to parse shader SPIR-V code for Some("premultiply-alpha-vert.glsl …"): UnsupportedInstruction(Function, BitFieldUExtract)
WARN wgpu_core::device: Proceeding unsafely without validation
This avoids that warning (and removes now-unnecessary type conversions).
2024-01-03 16:33:02 +00:00
26520b51ef
Added previously requested changes
2024-01-03 12:31:35 +00:00
448e1ba64a
Merge branch 'crabman/airship-fix-v6' into 'master'
...
Fix airship captains dismounting
See merge request veloren/veloren!4225
2024-01-02 23:19:48 +00:00
37b562aaf6
Clippyyy
2024-01-02 23:42:14 +01:00
551d783cac
Use correct scaling for volume entity collisions
2024-01-02 23:42:14 +01:00
004be6395f
Don't dismount if we're a steering entity
2024-01-02 23:42:14 +01:00
fc28629148
Convert to rgb earlier in screenshot process.
...
Also add path information to logs when screenshot folder or file
creation fails.
2024-01-01 16:45:44 -05:00
35fc92f872
Merge branch 'screenshot' into 'master'
...
Don't include an alpha channel when creating a screenshot file.
See merge request veloren/veloren!4222
2024-01-01 21:41:41 +00:00
9190a40cbd
build(nix): set veloren git tag and veloren git version variables in the development shell too
2024-01-01 12:48:43 +03:00
f7d9885723
build(nix): remove flake-parts debug option from flake.nix
2023-12-30 11:36:13 +03:00
4055eb15ec
build(nix): update flake dependencies and fix flake.nix
2023-12-30 11:15:25 +03:00
5bd089c56d
Merge branch 'sam/remove-combo-melee' into 'master'
...
Deprecated combo melee character state
See merge request veloren/veloren!4233
2023-12-29 17:29:44 +00:00
8ee054a462
Fix tests
2023-12-29 11:50:18 -05:00
016bb25242
Merge branch 'DaforLynx/audio-dec-2023' into 'master'
...
Audio fixes and new music
See merge request veloren/veloren!4223
2023-12-29 00:25:08 +00:00
0b62898060
Audio fixes and new music
2023-12-29 00:25:08 +00:00
f65d449aa3
Deprecated combo melee character state
2023-12-28 19:02:10 -05:00
