Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,428 Commits 151 Branches 18 Tags
Commit Graph

1604 Commits

Author SHA1 Message Date
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
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
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
Samuel Keiffer
bf3e41a3ad Addressed comments. 2020-10-26 19:28:22 -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
Sam
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
Sam
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
Sam
7ae25e1e56 Move addition/removal of buffs to server event. 2020-10-26 19:28:15 -05:00
BottledByte
4c10491263 Initial WIP implementation of the Buff system 2020-10-26 19:28:14 -05:00
Marcel Märtens
b02f8428fb fix clippy after toolchain update 2020-10-26 22:30:51 +01:00
Marcel Märtens
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
Adam Whitehurst
5efb7232bd Ensure leap melee swing animation and hit are sync 2020-10-24 20:15:19 +00:00
jiminycrick
b78a75293b Fixed hammer AI and added axe AI 2020-10-19 16:20:59 +02:00
Snowram
0cfa7d5c3e Addressed comments 2020-10-19 16:20:59 +02:00
jiminycrick
4111fb117e Addressed comments on agent code 2020-10-19 16:20:59 +02:00
jshipsey
9503cf9cb9 roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
c5e61f7d7c small fixes 2020-10-19 16:20:59 +02:00
Snowram
f17ea65135 Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
7ac662b82e Add roshwalr npc 2020-10-19 16:20:59 +02:00
jiminycrick
23df57627d fixed agent code for staff rework 2020-10-19 16:20:59 +02:00
jshipsey
dc3454cceb rebase 2020-10-19 16:20:58 +02:00
Snowram
8d5742776f Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
a2ee32140c fix agent bug 2020-10-19 16:20:58 +02:00
jshipsey
f81a4446af werewolf work 2020-10-19 16:20:58 +02:00
jiminycrick
ad5dd0b043 Added secondary skills to agent code (except bow) 2020-10-19 16:20:58 +02:00
Snowram
e2308ef96e Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
dbac820034 Add treant npc 2020-10-19 16:20:58 +02:00
unknown
5f1ff1de99 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
Snowram
996e295be6 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
ae07c9ffb5 Add werewolf npc 2020-10-19 16:20:57 +02:00
Sam
fb2e94360d Made ability key not hardcoded in tool.rs. 2020-10-15 20:05:58 -05:00
Sam
90a1185096 Moved explsion struct from within comp to common. 2020-10-14 21:06:55 -05:00
Sam
fbd91918e7 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00
jshipsey
26b93b347e anims 2020-10-14 21:06:32 -05:00
Sam
0b8558ba73 Balance tweaks to staff abilities. 2020-10-14 20:57:01 -05:00
Sam
62723e1279 Ai for staff-wielding enemies. Keyframes for shockwave state. 2020-10-14 20:56:24 -05:00
Sam
6672b5cd91 Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles. 2020-10-14 20:56:23 -05:00