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

5421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel
53546567c3 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
ce8491405f add more tracing and drop lock earlier 2020-10-13 19:01:53 +02:00
Imbris
cc38034d1d 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
d824bfaaee 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
0c7ab6a4c2 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
69b3d8616c rename a file, fix error msg, dont spam persistence by default 2020-10-13 00:06:24 +02:00
Marcel
b5c98a6b47 Merge branch 'xMAC94x/netfixA' into 'master' 
xmac94x/netfixA

See merge request veloren/veloren!1425
 2020-10-12 21:07:00 +00:00
Enrico Marconi
57ed0b56d9 Fix issue #788 
Missing items in the 'require' section are now shown in red.
 2020-10-12 17:41:17 +02:00
Marcel Märtens
e8e6e7e49a 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
67d9be193f various small fixes according to the MR 2020-10-12 11:25:20 +02:00
Marcel Märtens
6b68a2dc39 remove a Mutex and AtomicBool 2020-10-11 23:02:39 +02:00
Marcel Märtens
ebd4ff084a create a ServerMsg and ClientMsg enum and verify the state when in debug mode to benefit from the transition 2020-10-11 22:59:53 +02:00
Marcel Märtens
17bcccbed0 fix naming, replace NotInGame with CharacterScreen 2020-10-11 22:55:38 +02:00
Marcel Märtens
c1b27cc3e1 No longer block the main thread for client connections, new clients will be handled by server without waiting. 
- Instread we have a dedicated thread that will async wait for new participants to connect and then notify the main thread
- registry no longer sends a view distance with it.
- remove ClientMsg::Command again as it's unused
 2020-10-11 22:55:02 +02:00