AlKabir
77f3c7e3c5
Minor combat fixes (see issue 785)
2020-11-07 18:00:07 +00:00
Samuel Keiffer
2370100e83
Merge branch 'tbg/#785' into 'master'
...
Removed ToolCategory, changed in_fluid to in_liquid
See merge request veloren/veloren!1475
2020-11-06 15:33:20 +00:00
TheBoredProgrammer64
b2ec207979
Revert "Removed toolCategory"
...
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Marcel
d0ed0d5773
Merge branch 'xMAC94x/small-ci' into 'master'
...
ci cleanup, dependency update
See merge request veloren/veloren!1485
2020-11-06 14:23:52 +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
Samuel Keiffer
45e6fd5ad9
Merge branch 'snowram/consumables-buffs' into 'master'
...
Allows for consumables to have an optional array of buffs and effects
See merge request veloren/veloren!1472
2020-11-06 02:42:34 +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
262ceac060
fmt
2020-11-06 01:08:35 +01:00
Monty Marz
642ad805a1
potion buff
2020-11-06 01:08:34 +01:00
Snowram
4b439e9b58
Adresses comment
2020-11-06 01:08:34 +01:00
Snowram
0d92f02deb
Buff stonegolem, nerf giants, add missing sfxs
2020-11-06 01:08:33 +01:00
Monty Marz
ca932f6c15
easier to get minor potions
...
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Monty Marz
eb79820c25
tweaks consumables buffs values
2020-11-06 01:08:32 +01:00
Snowram
a52f83e92c
Addresses some comments
2020-11-06 01:08:31 +01:00
Snowram
ce96af4363
Allow for an arbitrary array of effects and buffs for consumables
2020-11-06 01:08:30 +01:00
Sam
66850a5878
Fixed audio tests. Added changelog line.
2020-11-05 18:01:46 -06:00
Sam
4a1a3f3ecc
Roll now gives i-frames.
2020-11-05 16:48:04 -06:00
jshipsey
fae3ef6e59
roll anim speedup
2020-11-05 16:40:30 -05:00
Sam
860c766d62
Changed roll movement.
2020-11-05 14:22:30 -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
Marcel Märtens
a7ce3e5a2e
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
Samuel Keiffer
ee7d4d57c7
Merge branch 'sam/smol-fixes' into 'master'
...
Small Fixes 2
See merge request veloren/veloren!1471
2020-11-05 05:19:12 +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
b8f722af8d
Removed most hardcoded ability keys.
2020-11-04 19:22:02 -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
Marcel
7517991d73
Merge branch 'TR_translations' into 'master'
...
Updated translations
See merge request veloren/veloren!1473
2020-11-04 16:13:53 +00:00
TheBoredProgrammer64
3f7b007227
Updated translations
2020-11-04 16:13:53 +00: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
602da59b79
Merge branch 'xMAC94x/netfixE' into 'master'
...
keep Presence when possesing
See merge request veloren/veloren!1482
2020-11-04 11:28:12 +00: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
Samuel Keiffer
e07dc51d2d
Merge branch 'snowram/newstyle-keyframes' into 'master'
...
animation small fixes part 1
See merge request veloren/veloren!1445
2020-11-04 04:32:53 +00:00
Snowram
a6d5d87bbc
Fix animations regressions for biped_large
2020-11-04 02:12:43 +01:00
jshipsey
fb1aae22dd
manifests
2020-11-04 01:48:06 +01:00
jshipsey
3bb839da85
convert humanoid anims, warnings
2020-11-04 01:48:06 +01:00
Snowram
b47f42bad5
More biped_large work
2020-11-04 01:48:05 +01:00
jshipsey
f009492319
cleanup 4
2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f
starting to wire in new wield setup for bipedlarge
2020-11-04 01:48:05 +01:00
jshipsey
e6eeef4524
setup for axe/bow wield
2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb
setup for staff, more anim conversions
2020-11-04 01:48:05 +01:00
