2540 Commits

Author SHA1 Message Date
Synis
7bde80e1f3 Query spatial grid for beam and aura system
fmt
2021-04-29 14:23:02 +02:00
Ben Wallis
933de6b023 Merge branch 'xvar/item-serialization' into 'master'
Changed Item serialization to not send ItemDef struct across the network

See merge request veloren/veloren!2215
2021-04-28 20:50:32 +00:00
Ben Wallis
0eb1f62cd2 Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef 2021-04-28 21:00:25 +01:00
DaforLynx
5f8c7e54b5 Town music 2021-04-28 05:07:59 +00:00
Ludvig Böklin
b389806d2e Glider physics 2021-04-27 14:41:48 +00:00
jshipsey
60e31e90d9 fix glide wield 2021-04-26 23:17:04 -04:00
Sam
201fe2a19c Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
jshipsey
aa344baa45 comments 2021-04-25 22:02:32 -04:00
jshipsey
585e468de1 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
jshipsey
4f3c766757 ori fixes 2021-04-25 22:02:30 -04:00
Joshua Barretto
0637816ab0 Merge branch 'zesterer/small-fixes' into 'master'
Small fixes

See merge request veloren/veloren!2201
2021-04-25 23:03:23 +00:00
Joshua Barretto
9bba3acfbe Don't use movement efficiency for orientation 2021-04-25 23:00:30 +01:00
Joshua Barretto
2281c6f189 Minor control over velocity when in the air 2021-04-25 22:37:25 +01:00
Marcel
31098ad75b Merge branch 'xMAC94x/reduce_deps' into 'master'
remove some unused deps Yuri found

See merge request veloren/veloren!2197
2021-04-25 20:22:31 +00:00
Marcel Märtens
fd5d1ffaf3 remove some unused deps Yuri found 2021-04-25 20:18:20 +02:00
Sam
c368883499 Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided. 2021-04-25 13:09:10 -04:00
Sam
6294b3c5ff Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
fdd2b58954 Addressed testing feedback.
Particles better.
2021-04-25 13:09:08 -04:00
Sam
2d3d48e84c Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
Sam
b028b647ca Blocking now works if no weapon is equipped in main hand.
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
Sam
165603aa65 Parrying 2021-04-25 13:08:42 -04:00
Sam
c9e1b1d341 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Sam
e074562735 Removed unwraps in buffs 2021-04-25 12:01:21 -04:00
Snowram
abfb14626a Body specific beam offsets 2021-04-25 04:07:12 +02:00
Snowram
58300592ca More phoenix AI work
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
4249d0ddcc Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
738be81943 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
ff5d267535 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
b0d617d91d Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
e58e56cb07 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
5b8fbe9a23 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
c7d6dde677 Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ygor Souza
9b7c7bc69a Add basic distance check to shockwave hit test
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.

This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
2021-04-24 03:09:45 +02:00
Ygor Souza
72167db397 Skip physics pass for arrows stuck on surfaces
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
2021-04-22 23:03:04 +02:00
Marcel
592e34e6ba Merge branch 'aweinstock/deflate-terrain' into 'master'
Compress terrain chunks with deflate. Includes a benchmark showing that this...

See merge request veloren/veloren!2166
2021-04-22 17:12:53 +00:00
Monty Marz
ccb913a2c0 Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
d47dc7c49e remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Dominik Broński
7589f40eb7 Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
Fix ArrowTurret drag coefficient

See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Imbris
101e6cdce6 Quick physics perf fix 2021-04-21 14:03:23 -04:00
Imbris
fcfb1f325a Revert "Merge branch 'revert-b10718c5' into 'master'"
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
580e99b968 Merge branch 'zesterer/lanterns' into 'master'
Made characters carry lanterns higher when possible

See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Ludvig Böklin
7d73fdc2c5 Fix ArrowTurret drag coefficient 2021-04-21 18:26:23 +02:00
Imbris
9818c7131f Merge branch 'revert-b10718c5' into 'master'
Revert "Merge branch 'imbris/agent-opt' into 'master'"

See merge request veloren/veloren!2172
2021-04-21 15:06:35 +00:00
Imbris
1e3fad1690 Merge branch 'lboklin/simplify-buoyancy' into 'master'
Simplify buoyancy for performance reasons

See merge request veloren/veloren!2171
2021-04-21 15:06:31 +00:00
Joshua Barretto
9e87da7a18 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
Ludvig Böklin
bbcb73c4f6 Simplify buoyancy for performance reasons 2021-04-21 16:19:02 +02:00
Ludvig Böklin
3c82a28d80 Prevent drag forces from causing something to come to a complete stop 2021-04-21 16:13:51 +02:00
Imbris
b90b62fcc1 Revert "Merge branch 'imbris/agent-opt' into 'master'"
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Avi Weinstock
0ae259f359 Cleanup errors introduced in rebase. 2021-04-20 23:34:17 -04:00
Avi Weinstock
c1c7f748ef Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream. 2021-04-20 23:24:24 -04:00