Commit Graph

2691 Commits

Author SHA1 Message Date
4e4818ca9e Query spatial grid for beam and aura system
fmt
2021-04-29 14:23:02 +02:00
6b52ea89b4 Add more specific masses to objects 2021-04-29 11:46:03 +02:00
b0aca9a348 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
14caae3667 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
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
34660462e9 Glider physics 2021-04-27 14:41:48 +00:00
f845f2bd11 fix glide wield 2021-04-26 23:17:04 -04:00
Sam
1a7779beb3 Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
a0a75b1921 comments 2021-04-25 22:02:32 -04:00
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
c01fd86f44 ori fixes 2021-04-25 22:02:30 -04:00
c6d1963f10 Merge branch 'zesterer/small-fixes' into 'master'
Small fixes

See merge request veloren/veloren!2201
2021-04-25 23:03:23 +00:00
94b6fa6da3 Don't use movement efficiency for orientation 2021-04-25 23:00:30 +01:00
3af4793762 Minor control over velocity when in the air 2021-04-25 22:37:25 +01:00
35584d0344 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
1842b2d6eb remove some unused deps Yuri found 2021-04-25 20:18:20 +02:00
Sam
6848851dc3 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
372eff2a02 Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
d2d8d43410 Addressed testing feedback.
Particles better.
2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2 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
288a6f3a82 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
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Sam
0170a38ebc Removed unwraps in buffs 2021-04-25 12:01:21 -04:00
c16ec43938 Body specific beam offsets 2021-04-25 04:07:12 +02:00
8f54a0bf31 More phoenix AI work
More phoenix AI work
2021-04-25 04:07:12 +02:00
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
71b8426592 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
e59f1e8d28 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
e14f8b9745 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
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
1d25016459 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
51c0f8733c Quick physics perf fix 2021-04-21 14:03:23 -04:00
1af4a04231 Revert "Merge branch 'revert-b10718c5' into 'master'"
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
880236f223 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
37713cb4ad Fix ArrowTurret drag coefficient 2021-04-21 18:26:23 +02:00
68539a751b 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
699a5493ec 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
ed7cc12213 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
a1744182b3 Simplify buoyancy for performance reasons 2021-04-21 16:19:02 +02:00
6e364665cb Prevent drag forces from causing something to come to a complete stop 2021-04-21 16:13:51 +02:00
fd672980c4 Revert "Merge branch 'imbris/agent-opt' into 'master'"
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
308ad4d81e Cleanup errors introduced in rebase. 2021-04-20 23:34:17 -04:00