4053ef2e69
Make different mobs drop different assetts on death (not just lootbags)
2020-10-29 15:25:19 -05:00
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
52c93f613e
Addressed comments.
2020-10-28 22:04:15 -05:00
7971034fde
Fixed audio tests.
2020-10-28 18:15:28 -05:00
1a8cf33a60
Transitioned forced movement to an enum.
2020-10-28 18:15:27 -05:00
981eee5936
Transitioned knockback to an enum.
2020-10-28 18:15:27 -05:00
1ccbdec35c
Tweaked dash melee some more.
2020-10-28 18:15:26 -05:00
a7e3e55a12
Transitioned damage and healing from u32/i32s to enums.
2020-10-28 18:15:25 -05:00
844e6f2b60
Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3.
2020-10-28 18:15:25 -05:00
15286a094a
Leaps now require a non-negative vertical velocity to use.
2020-10-28 18:15:24 -05:00
555bc559f5
Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity.
2020-10-28 18:15:24 -05:00
63011241ea
Added keyframes to all states that were lacking them.
2020-10-28 18:15:23 -05:00
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
12d449f40f
Added translation for place holder quest.
2020-10-28 20:36:19 +00:00
0e3980f656
Fixed the missing comma
2020-10-28 19:25:42 +00:00
e24addd87d
Update tr_TR.ron
2020-10-28 18:44:34 +00:00
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
900e654252
update german translation, add missing string to en file
2020-10-28 14:39:58 +01:00
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
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
57d09be6b9
Added client-side is_dead check to inventory pickup
2020-10-26 23:23:29 -04:00
6559df459e
Addressed comments.
2020-10-26 21:32:01 -05:00
e8f6338eb0
Admin armor now provides immunity to debuffs.
2020-10-26 19:49:40 -05:00
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
f759895d63
add maxhealthmodifier
...
oops variable
2020-10-26 19:30:18 -05:00
8aad7adab8
add comments
2020-10-26 19:30:17 -05:00
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
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
fdf8decb18
Handled health change over time buff effect better.
2020-10-26 19:28:27 -05:00
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
3f7b5a095b
player buffs at minimap visuals
...
Update settings.rs
buff timers
2020-10-26 19:28:25 -05:00
be1767a5af
Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press
2020-10-26 19:28:25 -05:00
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
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
b31c6877b4
skillbar fixes, buff UI module
...
adjustments, fixes, assets, test buffs widgets
2020-10-26 19:28:23 -05:00
60a5346a0b
Addressed comments.
2020-10-26 19:28:22 -05:00
f096bece5c
skillbar update part 1
...
skillbar rework part 2
2020-10-26 19:28:21 -05:00
0df061a38e
Moved duration to inside BuffId enum to future-proof for when buffs are persisted.
2020-10-26 19:28:20 -05:00
1a1ceb54bc
Server event used to deal damage/heal with buffs. Buff kills now award xp.
2020-10-26 19:28:20 -05:00
de7191b985
Added functionality to remove buffs by category.
2020-10-26 19:28:19 -05:00
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
19c7ed7885
Added builder function for buffs
2020-10-26 19:28:18 -05:00
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
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
c50063ad0c
Move addition/removal of buffs to server event.
2020-10-26 19:28:15 -05:00
7ab99a3bbf
Initial WIP implementation of the Buff system
2020-10-26 19:28:14 -05:00
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
1b47913835
fix clippy after toolchain update
2020-10-26 22:30:51 +01:00
82d2859e92
Merge branch 'xMAC94x/fix-tarpaulin' into 'master'
...
xMAC94x/fixTarpaulin
See merge request veloren/veloren!1427
2020-10-26 16:54:37 +00:00
153c6c3b13
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
