Samuel Keiffer
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
Maxicarlos08
3a7bb698fc
handle overlap and queueing correctly
2024-01-13 19:53:02 +01:00
Maxicarlos08
da08376e9a
Don't stack buffs of the same kind with equal attributes
2024-01-13 18:58:44 +01:00
juliancoffee
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
juliancoffee
2746a98f40
Add /buff_complex command
2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175
Warn about complex buffs when using /buff
2024-01-08 20:13:17 +02:00
juliancoffee
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
juliancoffee
f4939220cc
Add BuffKind::differentiate
2024-01-08 20:13:17 +02:00
juliancoffee
5514df330b
Add BuffDescriptor enum
2024-01-08 20:13:17 +02:00
Imbris
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
Pybit
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
Imbris
807bd758b7
cargo fmt
2024-01-04 00:30:21 -05:00
Imbris
6d57169875
review fixes
2024-01-04 00:01:08 -05:00
Imbris
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
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
Pybit
26520b51ef
Added previously requested changes
2024-01-03 12:31:35 +00:00
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions
2024-01-02 23:42:14 +01:00
Samuel Keiffer
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
DaforLynx
0b62898060
Audio fixes and new music
2023-12-29 00:25:08 +00:00
Sam
f65d449aa3
Deprecated combo melee character state
2023-12-28 19:02:10 -05:00
flo
8e76aaceb8
make_crustaceans_tameable
2023-12-26 19:55:21 +00:00
Christof Petig
5af8c4687e
Merge branch 'christof/christmas23' into 'master'
...
Christmas theme revival
See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
flo
0a42a51810
Merge branch 'poise_resilience_buffs' into 'master'
...
poise_resilience_buffs_for_dagon_and_wyverns
See merge request veloren/veloren!4207
2023-12-17 20:12:13 +00:00
flo
6f5e385d2a
poise_resilience_buffs_for_dagon_and_wyverns
2023-12-17 20:12:13 +00:00
Uniior
737b5761f6
Crate and Barrel sprites
2023-12-17 16:17:14 +00:00
flo
569ab5c5ed
crustacean-skeleton and crab
2023-12-16 13:47:55 +00:00
Christof Petig
f55a70a2a8
fix doctest
2023-12-16 14:40:26 +01:00
Christof Petig
4b7f3d07d2
add hirdrasil ornament variants and fix clippy
2023-12-16 12:10:17 +01:00
Christof Petig
9b485456eb
Calendar based gear for villagers
2023-12-14 16:31:48 +01:00
Isse
8569f30336
review fixes
2023-12-12 19:41:40 +01:00
Isse
a3a19ecc3a
tavern rtsim
2023-12-07 20:08:03 +01:00
Isse
eb2395a401
walk fixes
2023-12-07 20:08:03 +01:00
Isse
63e500d3d8
laying and steering animation
2023-12-07 20:08:02 +01:00
HEIEnthusiast
933c897450
Renamed to potion of agility, burning potion to combustion
2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8
Renamed swiftness to retreating, changed model
2023-12-05 13:09:14 -04:00
HEIEnthusiast
7d7937df36
,
2023-11-28 13:42:24 -04:00
HEIEnthusiast
2497c04a63
Code quality fix :(
2023-11-28 12:11:34 -04:00
HEIEnthusiast
5001c4a262
Added swiftness debuffs
2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0
Swiftness potion changes
2023-11-28 10:03:07 -04:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
Maxicarlos08
2da97747e5
Addressed review comments
2023-11-27 21:29:13 +01:00
maxicarlos08
d05586f08a
fix small precision bug
2023-11-27 21:28:12 +01:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee
2023-11-27 21:28:12 +01:00
HEIEnthusiast
b6c67a7f41
Made handle_jump use it's own jump_modifier stat
2023-11-27 16:15:29 -04:00
HEIEnthusiast
bb2adfb2e5
Removed strength and regeneration potions
2023-11-27 15:16:44 -04:00
Py bit
e0de63dbf8
Update buff.rs
2023-11-27 12:25:23 +00:00
Py bit
16b873590b
Update buff.rs
2023-11-27 12:02:54 +00:00
Py bit
0074be2339
Update buff.rs
2023-11-27 11:39:30 +00:00
HEIEnthusiast
783cfdc719
Merge branch 'master' into More-potions
2023-11-27 07:00:48 -04:00
