1654 Commits

Author SHA1 Message Date
AlKabir
f5e5511057 added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Sam
6879c880fe Other stupid fix. 2020-11-07 21:07:53 -06:00
Imbris
db6eeaeb6c Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
e392e37c47 Yeeted from code files. 2020-11-07 15:53:10 -06:00
AlKabir
ee64934c94 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
d195eaf701 Revert "Removed toolCategory"
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +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
4f6aae5459 fmt 2020-11-06 01:08:35 +01:00
Monty Marz
8da2871897 potion buff 2020-11-06 01:08:34 +01:00
Snowram
4c30dadf47 Adresses comment 2020-11-06 01:08:34 +01:00
Snowram
c9b3b5b904 Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Monty Marz
b0a6e8a043 easier to get minor potions
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Snowram
a2671123e5 Addresses some comments 2020-11-06 01:08:31 +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
47c442423e Changed roll movement. 2020-11-05 14:22:30 -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
Marcel Märtens
c3669138d7 switch back to cylindric entity <-> entity collision check.
I still doubt why we do cylindric vs cylindric in entity <-> entity check,  but box vs box in entity <-> terrain check.
Though i did a spheric calculation here.
The cylindric one is alot slower though, 500 entities take 1.9s instead of 1.3s
2020-11-05 08:54:10 +01: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
0988b97da5 Removed most hardcoded ability keys. 2020-11-04 19:22:02 -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
jshipsey
021f7478f5 setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Christof Petig
61384aaf0e implement /home to return to home town 2020-11-04 00:55:15 +01:00
Joshua Barretto
058541d1a3 Implemented Flight 2020-11-03 22:46:07 +00: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
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
ubruntu
40e7fd6c14 Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
ubruntu
d84da01a12 10% of bow hits cause bleed debuff 2020-11-01 18:38:57 +00:00
Sam
9e16f2ee70 Sceptre fix. 2020-10-31 12:57:51 -05:00
Imbris
5660cd6961 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
05e58a17f6 Rename running_tps_average -> running_average_delta 2020-10-29 18:30:19 -04:00
Sam
1315ad68b1 Addressed comments. 2020-10-28 22:04:15 -05:00
Sam
e86b38f3d2 Transitioned forced movement to an enum. 2020-10-28 18:15:27 -05:00
Sam
d4a8320780 Transitioned knockback to an enum. 2020-10-28 18:15:27 -05:00
Sam
0806f3155f Tweaked dash melee some more. 2020-10-28 18:15:26 -05:00
Sam
824a5e0aa7 Transitioned damage and healing from u32/i32s to enums. 2020-10-28 18:15:25 -05:00
Sam
af7d3fd1ef Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3. 2020-10-28 18:15:25 -05:00
Sam
060dd269f3 Leaps now require a non-negative vertical velocity to use. 2020-10-28 18:15:24 -05:00