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,424 Commits 151 Branches 18 Tags 2.1 GiB
0e3980f656
Commit Graph

5424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel Märtens
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
Samuel Keiffer
35ff4b7b84 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
071ce08b69 Removed else branch and ran fmt and clippy 2020-10-25 16:43:07 -04:00
Brad
cfbdbf14aa Updated code to be more consistent with codebase 2020-10-25 15:54:08 -04:00
Brad
11f747cc5f Added is_dead check to item pickup 2020-10-25 03:40:34 -04:00
Imbris
4a7eb7f786 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
39feb6baa1 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
4dcac28f8a Ensure leap melee swing animation and hit are sync 2020-10-24 20:15:19 +00:00
Imbris
2be87f6ea8 Fix crash with unicode characters 2020-10-24 16:03:53 -04:00
Marcel
26d174fd81 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
e77cc3eae2 Fixed the server cli dropping new lines 2020-10-23 20:30:33 +01:00
Imbris
20ee9c77f6 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
7e92e21f8b Address issue #808: Add Frame Time in DebugInfo 2020-10-22 16:42:10 -06:00
Forest Anderson
14b5d01af3 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
Joshua Barretto
ff57d2a79d Merge branch 'zesterer/clouds' into 'master' 
Clouds

See merge request veloren/veloren!1442
 2020-10-21 21:05:26 +00:00