Imbris
9512a395a8
Merge branch 'bbenton91/fix-password-length' into 'master'
...
Changed password scale to allow 34 characters. Fixes issue #743
Closes #743
See merge request veloren/veloren!1464
2020-10-30 02:37:54 +00:00
Imbris
59be1d134b
Merge branch 'imbris/random-fixes' into 'master'
...
Random Fixes 3
See merge request veloren/veloren!1463
2020-10-30 01:52:36 +00:00
Brad
fcb0e788f3
Changed password scale to allow 34 characters
2020-10-29 21:17:31 -04:00
Imbris
d616fdb1b5
Update changelog, address comments, fmt
2020-10-29 19:12:54 -04:00
Imbris
5660cd6961
Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts
2020-10-29 18:40:11 -04:00
Imbris
40ab8c9dad
Only try to connect to the singleplayer server after it has been initialized
2020-10-29 18:30:49 -04:00
Imbris
20c6b171d6
Log where the userdata folder is in binary crates, fix bug where the old
...
path was logged instead of the new path when renaming invalid settings
2020-10-29 18:30:49 -04:00
Imbris
0f8b6926ea
Only allow hotbar keys instead of all UI related keys when the UI is hidden
2020-10-29 18:30:48 -04:00
Imbris
05e58a17f6
Rename running_tps_average -> running_average_delta
2020-10-29 18:30:19 -04:00
Samuel Keiffer
b4a9ce11e4
Merge branch 'sam/small-fixes' into 'master'
...
Sam/small fixes part 1
Closes #525 , #410 , #412 , and #397
See merge request veloren/veloren!1455
2020-10-29 04:03:07 +00:00
Sam
1315ad68b1
Addressed comments.
2020-10-28 22:04:15 -05:00
Sam
772295df09
Fixed audio tests.
2020-10-28 18:15:28 -05:00
Sam
e86b38f3d2
Transitioned forced movement to an enum.
2020-10-28 18:15:27 -05:00
Sam
d4a8320780
Transitioned knockback to an enum.
2020-10-28 18:15:27 -05:00
Sam
0806f3155f
Tweaked dash melee some more.
2020-10-28 18:15:26 -05:00
Sam
824a5e0aa7
Transitioned damage and healing from u32/i32s to enums.
2020-10-28 18:15:25 -05:00
Sam
af7d3fd1ef
Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3.
2020-10-28 18:15:25 -05:00
Sam
060dd269f3
Leaps now require a non-negative vertical velocity to use.
2020-10-28 18:15:24 -05:00
Sam
7c3779582c
Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity.
2020-10-28 18:15:24 -05:00
Sam
dd3e5f9a64
Added keyframes to all states that were lacking them.
2020-10-28 18:15:23 -05:00
Dominik Broński
a492ecbb1f
Merge branch 'Tadabito-master-patch-76036' into 'master'
...
Update tr_TR.ron
See merge request veloren/veloren!1459
2020-10-28 23:11:46 +00:00
Tadabito
339a4070ee
Added translation for place holder quest.
2020-10-28 20:36:19 +00:00
Tadabito
957337d05d
Fixed the missing comma
2020-10-28 19:25:42 +00:00
Tadabito
66b34f0f76
Update tr_TR.ron
2020-10-28 18:44:34 +00:00
Monty Marz
740a407de2
Merge branch 'pfau/german_translation' into 'master'
...
Update german translation, add missing string to en file
See merge request veloren/veloren!1457
2020-10-28 14:40:11 +00:00
Monty Marz
52a6a9ab47
update german translation, add missing string to en file
2020-10-28 14:39:58 +01:00
Samuel Keiffer
5ed81cf97a
Merge branch 'BottledByte/buff_system' into 'master'
...
The Buff system
Closes #413
See merge request veloren/veloren!1285
2020-10-27 17:11:02 +00:00
Samuel Keiffer
489c97004c
Merge branch 'bbenton91/client-item-pickup-check' into 'master'
...
Added client-side is_dead check to inventory pickup
See merge request veloren/veloren!1456
2020-10-27 13:39:29 +00:00
Brad
e2b8969ccb
Added client-side is_dead check to inventory pickup
2020-10-26 23:23:29 -04:00
Sam
cafa218850
Addressed comments.
2020-10-26 21:32:01 -05:00
Sam
e0637f2e31
Admin armor now provides immunity to debuffs.
2020-10-26 19:49:40 -05:00
Sam
074e44c0e7
Addressed more comments. Changed how buffs were sorted so that duration was also taken into account.
2020-10-26 19:30:18 -05:00
Adam Whitehurst
e83942fecd
add maxhealthmodifier
...
oops variable
2020-10-26 19:30:18 -05:00
Adam Whitehurst
aa95e2ba5b
add comments
2020-10-26 19:30:17 -05:00
Sam
02f5f0facd
Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now.
2020-10-26 19:30:17 -05:00
Sam
f95a0411d8
Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented.
2020-10-26 19:30:10 -05:00
Sam
c013ae8b5c
Handled health change over time buff effect better.
2020-10-26 19:28:27 -05:00
Sam
6619ac8c0f
Cleaned up logic used to handle buff addition. Old active buffs now get deleted if they had a smaller duration and weaker strength.
2020-10-26 19:28:26 -05:00
Monty Marz
d258fc5bda
player buffs at minimap visuals
...
Update settings.rs
buff timers
2020-10-26 19:28:25 -05:00
Imbris
2ce14e9e8a
Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press
2020-10-26 19:28:25 -05:00
Monty Marz
ac17c57975
Initial implementation of buffs UI
...
player buffs animation
more testing debuffs
sorting and display limit fix
overhead buffs
fix
WIP buff removal function
fmt
Update buffs.rs
Now with compiling: WIP group UI buffs
positioning
Update group.rs
Update group.rs
Small optimizations.
Fixed positioning of buffs in group panel. Broke buff tooltips in group panel.
buff frame visuals
added setting for displaying buffs at minimap
2020-10-26 19:28:24 -05:00
Sam
e83e219d4b
Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs.
2020-10-26 19:28:23 -05:00
Monty Marz
6495684dc2
skillbar fixes, buff UI module
...
adjustments, fixes, assets, test buffs widgets
2020-10-26 19:28:23 -05:00
Samuel Keiffer
bf3e41a3ad
Addressed comments.
2020-10-26 19:28:22 -05:00
Monty Marz
8d9ac68c80
skillbar update part 1
...
skillbar rework part 2
2020-10-26 19:28:21 -05:00
Sam
a414ddf830
Moved duration to inside BuffId enum to future-proof for when buffs are persisted.
2020-10-26 19:28:20 -05:00
Sam
3bcec0c409
Server event used to deal damage/heal with buffs. Buff kills now award xp.
2020-10-26 19:28:20 -05:00
Sam
1d008dca33
Added functionality to remove buffs by category.
2020-10-26 19:28:19 -05:00
Sam
ddebad6a73
Separated buffs into active and inactive buffs. There can only be 1 active buff at a time of a particular buff id. If a new buff is stronger than an active buff, it moves the active buff to inactive buffs. When active buffs are removed, it checks inactive buffs for any buffs of the same id and moves the strongest one to active buffs.
2020-10-26 19:28:18 -05:00
Sam
4f6be340ce
Added builder function for buffs
2020-10-26 19:28:18 -05:00
