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
Marcel
15a96f5812
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
e914c29728
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
663d5aead4
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
24af657fd5
quickfix for closing participants more reliable
2020-10-13 20:06:20 +02:00
Marcel
2246e8b860
Merge branch 'xMAC94x/small-fixes' into 'master'
...
add more tracing and drop lock earlier
See merge request veloren/veloren!1435
2020-10-13 17:36:25 +00:00
Marcel Märtens
9af2fcfe46
add more tracing and drop lock earlier
2020-10-13 19:01:53 +02:00
Imbris
f4f2fb9891
Merge branch 'imbris/userdata-fixes' into 'master'
...
Fix system data folder name, panic when outside the project dir and there is no env var set
See merge request veloren/veloren!1434
2020-10-13 08:00:55 +00:00
Imbris
9e7f521489
Fix system data folder name, panic when outside the project dir and there is no env var set
2020-10-13 02:29:32 -04:00
Marcel
e72bfc3d2a
Merge branch 'xMAC94x/small-fixes' into 'master'
...
rename a file, fix error msg, dont spam persistence by default
See merge request veloren/veloren!1433
2020-10-12 23:12:00 +00:00
Marcel Märtens
f1c9b959f4
rename a file, fix error msg, dont spam persistence by default
2020-10-13 00:06:24 +02:00
Marcel
2668731a05
Merge branch 'xMAC94x/netfixA' into 'master'
...
xmac94x/netfixA
See merge request veloren/veloren!1425
2020-10-12 21:07:00 +00:00
Marcel Märtens
2a7378b4ae
pack together InGame, CharacterScreen and General variant in a single enum, as requested by zesterer.
...
His reason to reqeust that is, that there might not be a perfect disctinction in the future.
Now we need to send ServerGeneral over streams and do additional checking at various places to verify that not the wrong variant is send.
2020-10-12 11:27:21 +02:00
Marcel Märtens
55b59fbe07
various small fixes according to the MR
2020-10-12 11:25:20 +02:00
