cafa218850
Addressed comments.
2020-10-26 21:32:01 -05:00
e0637f2e31
Admin armor now provides immunity to debuffs.
2020-10-26 19:49:40 -05:00
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
e83942fecd
add maxhealthmodifier
...
oops variable
2020-10-26 19:30:18 -05:00
aa95e2ba5b
add comments
2020-10-26 19:30:17 -05:00
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
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
c013ae8b5c
Handled health change over time buff effect better.
2020-10-26 19:28:27 -05:00
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
d258fc5bda
player buffs at minimap visuals
...
Update settings.rs
buff timers
2020-10-26 19:28:25 -05:00
2ce14e9e8a
Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press
2020-10-26 19:28:25 -05:00
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
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
6495684dc2
skillbar fixes, buff UI module
...
adjustments, fixes, assets, test buffs widgets
2020-10-26 19:28:23 -05:00
bf3e41a3ad
Addressed comments.
2020-10-26 19:28:22 -05:00
8d9ac68c80
skillbar update part 1
...
skillbar rework part 2
2020-10-26 19:28:21 -05:00
a414ddf830
Moved duration to inside BuffId enum to future-proof for when buffs are persisted.
2020-10-26 19:28:20 -05:00
3bcec0c409
Server event used to deal damage/heal with buffs. Buff kills now award xp.
2020-10-26 19:28:20 -05:00
1d008dca33
Added functionality to remove buffs by category.
2020-10-26 19:28:19 -05:00
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
4f6be340ce
Added builder function for buffs
2020-10-26 19:28:18 -05:00
d7f1ffc991
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
ddce5b78fc
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
7ae25e1e56
Move addition/removal of buffs to server event.
2020-10-26 19:28:15 -05:00
4c10491263
Initial WIP implementation of the Buff system
2020-10-26 19:28:14 -05:00
ff5395a9c2
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
b02f8428fb
fix clippy after toolchain update
2020-10-26 22:30:51 +01:00
5b50819436
Merge branch 'xMAC94x/fix-tarpaulin' into 'master'
...
xMAC94x/fixTarpaulin
See merge request veloren/veloren!1427
2020-10-26 16:54:37 +00:00
27cf6d8439
Fixing Tarpaulin isn't easy.
...
So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version.
Then we had to update several dependencies, which broke:
- need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27
- use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23
- update conrod to use modern copypasta 0.7
- use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project.
- adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type.
It was called `convert_event`
- make a `simd` feature which is default and introduce conditional compiling.
AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS.
- tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-10-26 17:04:20 +01:00
31021d5f87
Merge branch 'bbenton91/fix-item-pickup-when-dead' into 'master'
...
Fix for issue #809 . Added is_dead check to item pickup
See merge request veloren/veloren!1453
2020-10-25 22:27:30 +00:00
08c74d1322
Removed else branch and ran fmt and clippy
2020-10-25 16:43:07 -04:00
29daae6cc2
Updated code to be more consistent with codebase
2020-10-25 15:54:08 -04:00
f7f1445b2a
Added is_dead check to item pickup
2020-10-25 03:40:34 -04:00
127652c361
Merge branch 'imbris/fix' into 'master'
...
Fix crash with unicode characters
See merge request veloren/veloren!1452
2020-10-24 21:41:52 +00:00
24f42bbae2
Merge branch 'tweak-leap_melee' into 'master'
...
Ensure leap melee swing animation and hit are sync
See merge request veloren/veloren!1451
2020-10-24 20:15:19 +00:00
5efb7232bd
Ensure leap melee swing animation and hit are sync
2020-10-24 20:15:19 +00:00
c83cb2707f
Fix crash with unicode characters
2020-10-24 16:03:53 -04:00
d9e09e6604
Merge branch 'capucho/cli-scroll-fix' into 'master'
...
Fixed the server cli dropping new lines
See merge request veloren/veloren!1449
2020-10-24 14:27:33 +00:00
a05bc46e32
Fixed the server cli dropping new lines
2020-10-23 20:30:33 +01:00
2e12ef17e6
Merge branch 'nward/debug-hud-frame-time' into 'master'
...
Address issue #808 : Add Frame Time in DebugInfo
See merge request veloren/veloren!1448
2020-10-23 02:01:50 +00:00
dd2fe90d94
Address issue #808 : Add Frame Time in DebugInfo
2020-10-22 16:42:10 -06:00
2751c171d6
Merge branch 'angel/add-dutch-translation' into 'master'
...
Added Dutch translation
See merge request veloren/veloren!1446
2020-10-22 18:09:52 +00:00
e038491e9e
Merge branch 'zesterer/clouds' into 'master'
...
Clouds
See merge request veloren/veloren!1442
2020-10-21 21:05:26 +00:00
b7215c9bf1
Clouds
2020-10-21 21:05:25 +00:00
114140abf2
More small fixes
2020-10-21 19:02:59 +00:00
173247d5f5
Some fixes by @Jurre
2020-10-21 18:45:00 +00:00
a1d5184e9e
Added Dutch translation, created by @Namp007
2020-10-21 13:39:36 -04:00
0047af93cf
Merge branch 'snowram/beast-animation' into 'master'
...
Snowram/beast animation
See merge request veloren/veloren!1297
2020-10-19 15:59:18 +00:00
c8b4b3c3f5
Merge branch 'xMAC94x/netfixC' into 'master'
...
xmac94x/netfixc
See merge request veloren/veloren!1440
2020-10-19 15:24:07 +00:00
b78a75293b
Fixed hammer AI and added axe AI
2020-10-19 16:20:59 +02:00
