Imbris
0ca3d51f29
Only allow hotbar keys instead of all UI related keys when the UI is hidden
2020-10-29 18:30:48 -04:00
Imbris
74ef766051
Rename running_tps_average -> running_average_delta
2020-10-29 18:30:19 -04:00
Samuel Keiffer
6566802b7f
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
52c93f613e
Addressed comments.
2020-10-28 22:04:15 -05:00
Sam
7971034fde
Fixed audio tests.
2020-10-28 18:15:28 -05:00
Sam
1a8cf33a60
Transitioned forced movement to an enum.
2020-10-28 18:15:27 -05:00
Sam
981eee5936
Transitioned knockback to an enum.
2020-10-28 18:15:27 -05:00
Sam
1ccbdec35c
Tweaked dash melee some more.
2020-10-28 18:15:26 -05:00
Sam
a7e3e55a12
Transitioned damage and healing from u32/i32s to enums.
2020-10-28 18:15:25 -05:00
Sam
844e6f2b60
Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3.
2020-10-28 18:15:25 -05:00
Sam
15286a094a
Leaps now require a non-negative vertical velocity to use.
2020-10-28 18:15:24 -05:00
Sam
555bc559f5
Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity.
2020-10-28 18:15:24 -05:00
Sam
63011241ea
Added keyframes to all states that were lacking them.
2020-10-28 18:15:23 -05:00
Dominik Broński
5b19158da3
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
12d449f40f
Added translation for place holder quest.
2020-10-28 20:36:19 +00:00
Tadabito
0e3980f656
Fixed the missing comma
2020-10-28 19:25:42 +00:00
Tadabito
e24addd87d
Update tr_TR.ron
2020-10-28 18:44:34 +00:00
Monty Marz
8fe00b385c
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
900e654252
update german translation, add missing string to en file
2020-10-28 14:39:58 +01:00
Samuel Keiffer
19e210672a
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
fab3802587
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
57d09be6b9
Added client-side is_dead check to inventory pickup
2020-10-26 23:23:29 -04:00
Sam
6559df459e
Addressed comments.
2020-10-26 21:32:01 -05:00
Sam
e8f6338eb0
Admin armor now provides immunity to debuffs.
2020-10-26 19:49:40 -05:00
Sam
5d0fd3d9bc
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
f759895d63
add maxhealthmodifier
...
oops variable
2020-10-26 19:30:18 -05:00
Adam Whitehurst
8aad7adab8
add comments
2020-10-26 19:30:17 -05:00
Sam
f60985d733
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
337cf6e137
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
fdf8decb18
Handled health change over time buff effect better.
2020-10-26 19:28:27 -05:00
Sam
5a5d35fade
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
3f7b5a095b
player buffs at minimap visuals
...
Update settings.rs
buff timers
2020-10-26 19:28:25 -05:00
Imbris
be1767a5af
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
8fa398954d
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
007d3c09ac
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
b31c6877b4
skillbar fixes, buff UI module
...
adjustments, fixes, assets, test buffs widgets
2020-10-26 19:28:23 -05:00
Samuel Keiffer
60a5346a0b
Addressed comments.
2020-10-26 19:28:22 -05:00
Monty Marz
f096bece5c
skillbar update part 1
...
skillbar rework part 2
2020-10-26 19:28:21 -05:00
Sam
0df061a38e
Moved duration to inside BuffId enum to future-proof for when buffs are persisted.
2020-10-26 19:28:20 -05:00
Sam
1a1ceb54bc
Server event used to deal damage/heal with buffs. Buff kills now award xp.
2020-10-26 19:28:20 -05:00
Sam
de7191b985
Added functionality to remove buffs by category.
2020-10-26 19:28:19 -05:00
Sam
ccad1fa0b8
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
19c7ed7885
Added builder function for buffs
2020-10-26 19:28:18 -05:00
Sam
b8690473e4
When buffs expire from duration, now only they expire rather than ending all buffs of the same type.
2020-10-26 19:28:17 -05:00
Sam
125de0b46e
Creatures and playrs now have buffs component, buffs that expire now only end their particular buff instead of every buff with the same type.
2020-10-26 19:28:16 -05:00
Sam
c50063ad0c
Move addition/removal of buffs to server event.
2020-10-26 19:28:15 -05:00
BottledByte
7ab99a3bbf
Initial WIP implementation of the Buff system
2020-10-26 19:28:14 -05:00
Marcel
32d707e57f
Merge branch 'fix_clippy' into 'master'
...
fix clippy after toolchain update
See merge request veloren/veloren!1454
2020-10-26 22:29:22 +00:00
Marcel Märtens
1b47913835
fix clippy after toolchain update
2020-10-26 22:30:51 +01:00
Marcel
82d2859e92
Merge branch 'xMAC94x/fix-tarpaulin' into 'master'
...
xMAC94x/fixTarpaulin
See merge request veloren/veloren!1427
2020-10-26 16:54:37 +00:00
