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,426 Commits 151 Branches 18 Tags
Commit Graph

5426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Marcel Märtens
b02f8428fb fix clippy after toolchain update 2020-10-26 22:30:51 +01:00
Marcel
5b50819436 Merge branch 'xMAC94x/fix-tarpaulin' into 'master' 
xMAC94x/fixTarpaulin

See merge request veloren/veloren!1427
 2020-10-26 16:54:37 +00: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
Samuel Keiffer
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
Brad
08c74d1322 Removed else branch and ran fmt and clippy 2020-10-25 16:43:07 -04:00
Brad
29daae6cc2 Updated code to be more consistent with codebase 2020-10-25 15:54:08 -04:00
Brad
f7f1445b2a Added is_dead check to item pickup 2020-10-25 03:40:34 -04:00
Imbris
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
Samuel Keiffer
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
Adam Whitehurst
5efb7232bd Ensure leap melee swing animation and hit are sync 2020-10-24 20:15:19 +00:00
Imbris
c83cb2707f Fix crash with unicode characters 2020-10-24 16:03:53 -04:00
Marcel
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
Capucho
a05bc46e32 Fixed the server cli dropping new lines 2020-10-23 20:30:33 +01:00
Imbris
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
NathanW
dd2fe90d94 Address issue #808: Add Frame Time in DebugInfo 2020-10-22 16:42:10 -06:00