1020 Commits

Author SHA1 Message Date
Imbris
a5a51b91ef Send ability map from the server to the client on connection instead of loading from the assets 2020-11-14 16:07:07 -05:00
Ben Wallis
896a703717 Fixed character data not being persisted on character switch 2020-11-14 13:36:54 +00:00
Sam
479bda3895 Fixed tests. Addressed comments. 2020-11-13 10:41:34 -06:00
Sam
0752157935 Speed and power on weapons are now able to modify abilities after they are loaded from ron files. 2020-11-12 21:24:36 -06:00
Imbris
c42bdc3641 Remove ability map from top level functions 2020-11-12 21:24:35 -06:00
Sam
275deabae9 Started moving loading of ability manifest to an ecs variable. 2020-11-12 21:24:34 -06:00
Joshua Barretto
27821c3aed Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Christof Petig
e288677af0 Make waypoints persistent
Closes #549
2020-11-08 22:15:47 +01:00
Christof Petig
7ef0636614 Patch for the position de-synchronization by imbris
See https://discordapp.com/channels/449602562165833758/449650240350453760/774724295452393522
2020-11-08 18:56:55 +01:00
AlKabir
1cfa96e830 changed to an or operand 2020-11-07 23:37:15 -06:00
AlKabir
f5e5511057 added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
AlKabir
568743d75d Make different mobs drop different assetts on death (not just lootbags) cargo fmt 2020-11-07 22:50:38 -06:00
AlKabir
362e84c631 Make different mobs drop different assetts on death (not just lootbags) 2020-11-07 22:50:38 -06:00
Imbris
db6eeaeb6c Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
76db4b338d Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
AlKabir
ee64934c94 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
Marcel Märtens
77bbc44051 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
df8567c5a9 Merge branch 'sam/make-roll-great-again' into 'master'
Roll overhaul

See merge request veloren/veloren!1484
2020-11-06 03:25:18 +00:00
Sam
bd6acca55c Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox. 2020-11-05 20:40:20 -06:00
Snowram
c9b3b5b904 Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Snowram
1b1e322a1a Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
97b988a747 Roll now gives i-frames. 2020-11-05 16:48:04 -06:00
Sam
d5bbe761ae Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment. 2020-11-05 12:28:18 -06:00
Marcel
0fdbf4a488 Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master'
xMAC94x/feuerzeugBierflasche

See merge request veloren/veloren!1478
2020-11-05 09:22:50 +00:00
Sam
e2c8a0f665 Fixed crash from changes in explosion code. 2020-11-04 22:21:02 -06:00
Sam
90e8b1f504 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
a9e34739ed Removed Damages struct. Added GroupTarget enum. Changed RadiusEffect to use Effect instead of Daamges. Added Damage variant to Effect Eenum. 2020-11-04 19:22:07 -06:00
Sam
07766a6e6c Energy and health change server events now reference EcsEntity instead of Uid. Added TargetGroup to use to determine targets of effects/damage. Added Entity(TargetGroup, Effect) to RadiusEffect enum. 2020-11-04 19:22:06 -06:00
Sam
e34f5f09e9 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
be2f376176 Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Sam
099933bf2a Added energy change server event. 2020-11-04 19:22:01 -06:00
Sam
b63a13bef1 Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage. 2020-11-04 19:22:00 -06:00
Joshua Barretto
870ec8e9f7 Merge branch 'christof/home_town' into 'master'
implement /home to return to home town

See merge request veloren/veloren!1481
2020-11-04 15:58:35 +00:00
Marcel Märtens
7ef1b1f38e put cache in ECS to get rid of allocations 2020-11-04 14:19:28 +01:00
Marcel Märtens
99da3c7150 add metrics for physics sys and implement concurrent physics 2020-11-04 11:53:13 +01:00
Marcel Märtens
7b155d96d3 Improve Phyiscs speed of entity handling.
Before we had accessed velocities in a nested loop O(n²).
Now we copy it only once out of the ECS system and store it in a tmp Vec.
As we no longer need to hold a mut and imutable reference, we can iter of `&mut velocities` again in the outer loop.
Also improved many calculations called in the loop to make the check if 2 entities are to far apart as easy as possible
2020-11-04 11:53:09 +01:00
Marcel Märtens
fe14932f4f keep Presence when possesing 2020-11-04 11:49:05 +01:00
Christof Petig
61384aaf0e implement /home to return to home town 2020-11-04 00:55:15 +01:00
Marcel Märtens
e24f908280 Undo one Componenet per Stream and instead use Client.
In order to keep the performance we made it Internal Mutability and use a `Mutex` per Stream, till `Stream.send` is no longer `&mut self`.
The old solution didn't rely on this, but needed multiple Components instead which zest didn't liked
2020-11-03 08:56:08 +01:00
Marcel Märtens
dc26a6e36f extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
3efcca88af Fix an error that a failed initialization of a client lead to a Kill of the gameserver. Instead we just log a msg now. 2020-11-03 08:55:56 +01:00
Marcel Märtens
93451d12ed Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly 2020-11-03 08:55:54 +01:00
Marcel Märtens
50ac07c752 review:
- fix wording in error msg
 - find better name for structs
 - unify errors and cleanup code with `(|| {foo?; Some(())})()` pattern
 - fix the negative PlayersOnline, it was caused by having a gracefull shutdown AND a timeout error. we now unregister the client when he issues TERMINATE
2020-11-03 08:55:51 +01:00
Marcel Märtens
b11ee10b9c implement lazy_msg which only serialize + compress AT MAX ONCE if the same msg is send to multiple participants 2020-11-03 08:55:46 +01:00
Marcel Märtens
cc6f094e8a remove clippy warnings no longer needed 2020-11-03 08:55:44 +01:00
Marcel Märtens
bfe623fe8d replace the single message system with 5 message systems. one per stream to handle less ECS systems PER msg system.
As the MAIN message system was already on 25 of the max of 26 possible Ressources
2020-11-03 08:55:42 +01:00
Marcel Märtens
378b769999 working on implementing seperated msg system.
Does compile, but only reach connection till character screen.
Full play not yet possible
2020-11-03 08:55:36 +01:00
Marcel Märtens
3cbde52735 remote all streams from Client and put it directly in the ecs system.
This commit does not run compile as the message sys now would requiere 30 imput parameters which is over the max of 26 :/
2020-11-03 08:55:35 +01:00
Imbris
9ec29c5465 Merge branch 'bbenton91/add-mount-range-check' into 'master'
Fixes #814. Added range check to mounting

Closes #814

See merge request veloren/veloren!1466
2020-10-31 03:50:00 +00:00
Brad
647f000b0a Added range check to mounting 2020-10-30 22:34:44 -04:00