Marcel Märtens
b5f48014a9
Streams no longer panic when recv on a StreamClosed Stream. Panicing is a "feature" of futures::channel
...
Refactor the `send_raw` and `recv_raw` completly. We now expost `Message` which has a public `serialize` and `deseialize` fn for the first time.
This makes using the `raw` methods of a stream much easier and is a requierement for using "copy_less" sending to multiple streams
2020-10-19 10:23:30 +02:00
Marcel Märtens
572b83e262
add a try_recv fn to Stream which is NOT async
2020-10-19 10:23:27 +02:00
Justin Shipsey
ab411406b0
Merge branch 'UMR1352/fix#793' into 'master'
...
Fix #793 : hide message for player coming online
Closes #793
See merge request veloren/veloren!1443
2020-10-18 21:04:23 +00:00
Enrico Marconi
80b863da3b
Fix #793
2020-10-18 11:03:02 +02:00
Marcel
f6692aee74
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
b5a969862a
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
e6684009c2
Made ability key not hardcoded in tool.rs.
2020-10-15 20:05:58 -05:00
Joshua Barretto
8617b17569
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
af0542db90
Suggested edit
2020-10-15 14:47:29 +02:00
Enrico Marconi
d85473bccf
Reviewer's suggested edit
2020-10-15 14:36:59 +02:00
Enrico Marconi
9c184b60e4
Fix issue #790 : hotbar working while ui is toggled off
2020-10-15 13:28:29 +02:00
Sam
d869f7e430
Moved explsion struct from within comp to common.
2020-10-14 21:06:55 -05:00
Sam
14e4af7ab6
Addressed playtesting feedback.
2020-10-14 21:06:52 -05:00
jshipsey
6f3f6996a6
clippy
2020-10-14 21:06:35 -05:00
jshipsey
6a744eed82
anims
2020-10-14 21:06:32 -05:00
Sam
1ba8a6cfb3
Balance tweaks to staff abilities.
2020-10-14 20:57:01 -05:00
Monty Marz
4b2eba71e7
new staff skill icons
2020-10-14 20:56:58 -05:00
Sam
b5091a5891
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-14 20:56:24 -05:00
Sam
1c21362bc3
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
7ef73f5981
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
cbb72363af
Reworked explosions. Tweaked staff fireball.
2020-10-14 20:56:21 -05:00
Sam
04dcd012da
Flamethrower particles.
2020-10-14 20:56:21 -05:00
Sam
c80f16ae74
Started to add particles.
2020-10-14 20:56:20 -05:00
Sam
256846a669
Initial implementation of new staff abilities.
2020-10-14 20:56:16 -05:00
Samuel Keiffer
4a90f7c088
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
4de42e36fd
Consolidated recover code in repeater_ranged
2020-10-14 17:10:27 -07:00
jiminycrick
512d881cd2
Fixed clippy errors and added SFX
2020-10-14 15:30:58 -07:00
jiminycrick
95c36cc3fb
Skill icons with proper rotation
2020-10-14 12:50:33 -07:00
jiminycrick
1f3bd0e1d2
Responded to testing feedback
2020-10-14 12:50:33 -07:00
jshipsey
3bb59b36cd
energy values, remove hotload
2020-10-14 12:50:33 -07:00
jshipsey
64f72a73f9
axeleap tweaks
2020-10-14 12:50:33 -07:00
jiminycrick
691acd730d
Smoother leap and recovery leap handling
2020-10-14 12:50:33 -07:00
jshipsey
22d8792c4b
adjustments to chargedmelee, repeater
2020-10-14 12:50:33 -07:00
Snowram
697ea80665
Axe MeleeLeap character animation
2020-10-14 12:50:33 -07:00
jshipsey
521ffd64ba
cleanup
2020-10-14 12:50:33 -07:00
jshipsey
28eb58ddfa
anims
2020-10-14 12:50:33 -07:00
Sam
fadba23dde
Slight tweaks to leap
2020-10-14 12:50:33 -07:00
jshipsey
281155186f
hammer leap melee anim
2020-10-14 12:50:33 -07:00
Sam
e1634fa83a
Fixed errors from transitioning some states to keyframes.
2020-10-14 12:50:33 -07:00
Sam
21cf1e2168
Added keyframes to leap melee.
2020-10-14 12:50:33 -07:00
Sam
7e0cc2d8e5
Added keyframes to repeater ranged.
2020-10-14 12:50:33 -07:00
Sam
97f580be2b
Added keyframes to charged melee.
2020-10-14 12:50:32 -07:00
jiminycrick
9ebda3c353
Made bow leap more graceful and set energy costs and removed jitter for no leap
2020-10-14 12:50:32 -07:00
jiminycrick
ae4b259250
Fix what broke during rebase
2020-10-14 12:50:32 -07:00
jiminycrick
431f99a791
Reducing the amount of data in character state
2020-10-14 12:50:32 -07:00
jiminycrick
05623eb8bd
Addressed comments
2020-10-14 12:50:32 -07:00
jiminycrick
04175bab09
Add skillbar stuff for 3rd skills
2020-10-14 12:50:32 -07:00
jiminycrick
951acfca21
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-10-14 12:50:32 -07:00
Marcel
5bcfb6bd0a
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
ba1299e670
apparently span doesnt work for async, so i replaced it by an instrument version
2020-10-14 17:54:01 +02:00
