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,609 Commits 151 Branches 18 Tags 2.1 GiB
b25162635a
Commit Graph

1014 Commits

Author SHA1 Message Date
Joshua Barretto
9b233708e2 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
b56919b123 Make waypoints persistent 
Closes #549
 2020-11-08 22:15:47 +01:00
Christof Petig
b11da85ff9 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
4803ee5c81 changed to an or operand 2020-11-07 23:37:15 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
AlKabir
289126d9c8 Make different mobs drop different assetts on death (not just lootbags) cargo fmt 2020-11-07 22:50:38 -06:00
AlKabir
134c481408 Make different mobs drop different assetts on death (not just lootbags) 2020-11-07 22:50:38 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
ca65cdace1 Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
Marcel Märtens
40f5afc2b0 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c 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
37ecb165ef 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
0d92f02deb Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
4a1a3f3ecc Roll now gives i-frames. 2020-11-05 16:48:04 -06:00
Sam
55e75adec0 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
121364821a Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master' 
xMAC94x/feuerzeugBierflasche

See merge request veloren/veloren!1478
 2020-11-05 09:22:50 +00:00
Sam
f69f494524 Fixed crash from changes in explosion code. 2020-11-04 22:21:02 -06:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
bda7fefdc0 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
d38f1d319c 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
87bff41a66 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
c48c022f7e Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Sam
f1f5c2b21b Added energy change server event. 2020-11-04 19:22:01 -06:00
Sam
e0cbbf52ed 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
87ac4bd998 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
a7123c6e14 put cache in ECS to get rid of allocations 2020-11-04 14:19:28 +01:00
Marcel Märtens
ce3173ecdf add metrics for physics sys and implement concurrent physics 2020-11-04 11:53:13 +01:00
Marcel Märtens
bbe6e8be7c 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
094bb7c45a keep Presence when possesing 2020-11-04 11:49:05 +01:00
Christof Petig
ac92c8a6af implement /home to return to home town 2020-11-04 00:55:15 +01:00
Marcel Märtens
3d9c3e481e 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
00456c8373 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
084b60d7ec 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
6bb74c9c6f 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
37d08e93ca 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
9ba19a1cd9 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
2290efd219 remove clippy warnings no longer needed 2020-11-03 08:55:44 +01:00
Marcel Märtens
e9be36c993 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
9459ccf61b 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
dd966dd00e 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
cf06912b7b 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
95163a5a65 Added range check to mounting 2020-10-30 22:34:44 -04:00
Brad
a1baab1a5c Added range check to block pickup 2020-10-30 19:50:36 -04:00
Imbris
64def3cde4 Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts 2020-10-29 18:40:11 -04:00
Imbris
47b06658b0 Log where the userdata folder is in binary crates, fix bug where the old 
path was logged instead of the new path when renaming invalid settings
 2020-10-29 18:30:49 -04:00
Sam
a7e3e55a12 Transitioned damage and healing from u32/i32s to enums. 2020-10-28 18:15:25 -05:00
Sam
5d0fd3d9bc Addressed more comments. Changed how buffs were sorted so that duration was also taken into account. 2020-10-26 19:30:18 -05:00
Adam Whitehurst
f759895d63 add maxhealthmodifier 
oops variable
 2020-10-26 19:30:18 -05:00