Marcel
d16fb731ca
Merge branch 'UMR1352/fix#788' into 'master'
...
Fix issue #788
Closes #788
See merge request veloren/veloren!1432
2020-10-16 12:17:49 +00:00
Samuel Keiffer
7f2c122bcb
Merge branch 'sam/staff-overhaul' into 'master'
...
Staff Rework
Closes #767 and #762
See merge request veloren/veloren!1429
2020-10-16 02:22:00 +00:00
Sam
fb2e94360d
Made ability key not hardcoded in tool.rs.
2020-10-15 20:05:58 -05:00
Joshua Barretto
4f4dad3707
Merge branch 'UMR1352/fix#790' into 'master'
...
Fix issue #790
Closes #790
See merge request veloren/veloren!1439
2020-10-15 14:14:52 +00:00
Enrico Marconi
14ec1b4d2a
Suggested edit
2020-10-15 14:47:29 +02:00
Enrico Marconi
57b66261f6
Reviewer's suggested edit
2020-10-15 14:36:59 +02:00
Enrico Marconi
4f7d0c8b5c
Fix issue #790 : hotbar working while ui is toggled off
2020-10-15 13:28:29 +02: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
0cc203bbb1
clippy
2020-10-14 21:06:35 -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
Monty Marz
45f78876b0
new staff skill icons
2020-10-14 20:56:58 -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
Sam
f546bea809
Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.
2020-10-14 20:56:22 -05:00
Sam
42d5e91540
Reworked explosions. Tweaked staff fireball.
2020-10-14 20:56:21 -05:00
Sam
70839bdd42
Flamethrower particles.
2020-10-14 20:56:21 -05:00
Sam
a4f5dc589e
Started to add particles.
2020-10-14 20:56:20 -05:00
Sam
2a157168f2
Initial implementation of new staff abilities.
2020-10-14 20:56:16 -05:00
Samuel Keiffer
92ed8d275b
Merge branch 'james/hammer-axe-bow-skillz' into 'master'
...
Add 3rd skill for hammer, bow, and axe
Closes #766 , #765 , and #764
See merge request veloren/veloren!1399
2020-10-15 01:34:53 +00:00
jiminycrick
6221245e57
Consolidated recover code in repeater_ranged
2020-10-14 17:10:27 -07:00
jiminycrick
30a01df013
Fixed clippy errors and added SFX
2020-10-14 15:30:58 -07:00
jiminycrick
76e63840ec
Skill icons with proper rotation
2020-10-14 12:50:33 -07:00
jiminycrick
f6ce3f1957
Responded to testing feedback
2020-10-14 12:50:33 -07:00
jshipsey
40da71bfaf
energy values, remove hotload
2020-10-14 12:50:33 -07:00
jshipsey
724331a6fd
axeleap tweaks
2020-10-14 12:50:33 -07:00
jiminycrick
bdf7d96833
Smoother leap and recovery leap handling
2020-10-14 12:50:33 -07:00
jshipsey
4093d4f808
adjustments to chargedmelee, repeater
2020-10-14 12:50:33 -07:00
Snowram
163e76ac37
Axe MeleeLeap character animation
2020-10-14 12:50:33 -07:00
jshipsey
296037d234
cleanup
2020-10-14 12:50:33 -07:00
jshipsey
46508875ea
anims
2020-10-14 12:50:33 -07:00
Sam
1f02048058
Slight tweaks to leap
2020-10-14 12:50:33 -07:00
jshipsey
b5d3cd09e6
hammer leap melee anim
2020-10-14 12:50:33 -07:00
Sam
197755c233
Fixed errors from transitioning some states to keyframes.
2020-10-14 12:50:33 -07:00
Sam
30b45fc079
Added keyframes to leap melee.
2020-10-14 12:50:33 -07:00
Sam
b2501a5b5d
Added keyframes to repeater ranged.
2020-10-14 12:50:33 -07:00
Sam
05091687df
Added keyframes to charged melee.
2020-10-14 12:50:32 -07:00
jiminycrick
90e93e63bd
Made bow leap more graceful and set energy costs and removed jitter for no leap
2020-10-14 12:50:32 -07:00
jiminycrick
a16046c598
Fix what broke during rebase
2020-10-14 12:50:32 -07:00
jiminycrick
a84faedf17
Reducing the amount of data in character state
2020-10-14 12:50:32 -07:00
jiminycrick
973f59da6e
Addressed comments
2020-10-14 12:50:32 -07:00
jiminycrick
7e5ced158b
Add skillbar stuff for 3rd skills
2020-10-14 12:50:32 -07:00
jiminycrick
7e091dddc6
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-10-14 12:50:32 -07:00
Marcel
c5e9267b72
Merge branch 'xMAC94x/small-fixes' into 'master'
...
apparently span doesnt work for async, so i replaced it by an instrument version
See merge request veloren/veloren!1438
2020-10-14 16:30:16 +00:00
Marcel Märtens
ccd93ee876
apparently span doesnt work for async, so i replaced it by an instrument version
2020-10-14 17:54:01 +02:00
Marcel
7995a0e124
Merge branch 'xMAC94x/netfixB' into 'master'
...
FIX for hanging participant deletion.
See merge request veloren/veloren!1437
2020-10-14 14:16:38 +00:00
Marcel Märtens
a32ec08f08
FIX for hanging participant deletion.
...
There is a rare bug that recently got triggered more often with the release of xMAC94x/netfixA
if the bug triggeres, a Participant never gets cleaned up gracefully.
Reason:
When `participant_shutdown_mgr` was called it stopped all managers at once.
Especially stream_close_mgr and send_mgr.
The problem with stream_close_mgr is, it's responsible for gracefully flushing streams when the Participant is dropped locally.
So when it was interupted self.streams where no longer flushed gracefully.
The next problem was with send_mgr.
It is triggering the PrioManager, and the PrioManager is responsible for notifying once a stream is completly flushed.
This lead to the problem, that a stream flush could be requested, but was actually never executed (as send_mgr was already down).
Solution:
1. when stream_close_mgr is stopped it MUST flush all remaining streams
2. wait for stream_close_mgr to finish before shutting down the send_mgr
3. no longer delete streams when closing the API (this also wasn't tracked in metrics so far)
Additionally i added a dependency, so that the network/examples compile again, fixed some spelling.
I created a `delete_stream` fn that basically just moved the code over.
2020-10-14 15:03:49 +02:00
Marcel
ad6020ca4b
Merge branch 'xMAC94x/quick-fix' into 'master'
...
quickfix for closing participants more reliable
See merge request veloren/veloren!1436
2020-10-13 18:40:59 +00:00
Marcel Märtens
52a2b7416e
quickfix for closing participants more reliable
2020-10-13 20:06:20 +02:00
