Commit Graph

8338 Commits

Author SHA1 Message Date
471488508a Merge branch 'sharp/fix-meshing' into 'master'
Chunk meshing fixes and speedups.

See merge request veloren/veloren!2320
2021-05-20 00:02:38 +00:00
2fcf5c2b24 Various improvements to chunk load latency.
Firstly, most importantly, improves the heuristic used for deciding
which chunks to mesh (which matters more even at low view distances
with meshing being so expensive now, but has an even more obvious
improvement at large view distances).  Essentially, instead of always
prioritizing whatever chunk was fetched earliest from the server,
instead we prioritize chunks *closest* to the player first, then chunk
order.

This greatly improves the apparent latency for things like
picking up a sprite, as well as cases where the player moves out of the
loaded range but (due to slow loading from the server or a large VD
range) there are many remaining chunks left to be meshed still within
the VD but nowhere near the player.  By properly priotizing chunks near
the player, we minimize the time / likelihood of a player being on or
very near an unmeshed chunk, and make high VDs and faster travel
speeds more viable.

We make a few other minor improvements as well:

Avoid duplicate meshing of neighbors when first inserting chunks, if
they are already in the todo list and the chunk being inserted was not
directly modified.

Also avoid remeshing neighbors if only a solid block's color changed,
which could sometimes be useful for non-sprite modifications (for
example flame-induced changes to non-destructible terrain color).
2021-05-18 17:10:29 -07:00
b4479fe793 Make meshing work properly for rapid changes.
The previous fix accidentally caused meshing to not perform an update if
a chunk was already actively meshing; this change fixes this behavior to
go back to the old behavior.  It also fixes a subtle bug where sprites
would be using old lighting if a chunk was being actively meshed on the
same tick that a sprite change happened (this should only affect things
in a handful of circumstances and could be avoided if, e.g., only color
was changing, but this can be addressed better at another time).
2021-05-18 12:43:38 -07:00
fcb0b00575 Merge branch 'james/fix-cockatrice' into 'master'
Small cockatrice AI fixes

See merge request veloren/veloren!2319
2021-05-17 22:46:50 +00:00
8e9e550ce0 Small cockatrice AI fixes 2021-05-17 22:46:50 +00:00
Sam
dc2c26bba5 Removed commented code 2021-05-17 16:48:56 -05:00
84eca4a7b8 Added swap_equipped_weapons icon and resized inactive weapons 2021-05-17 15:35:27 -04:00
88250771c2 Merge branch 'update_pt_BR_20210517' into 'master'
Update pt br 20210517

See merge request veloren/veloren!2317
2021-05-17 18:12:20 +00:00
9150c05ac1 Update pt br 20210517 2021-05-17 18:12:20 +00:00
1f7a6aa566 Merge branch 'sharp/revert-quinn' into 'master'
Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"

See merge request veloren/veloren!2315
2021-05-17 16:40:49 +00:00
20eccf597b Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
This reverts commit 04d8ddf25e, reversing
changes made to 9dcf7a9d26.
2021-05-17 08:32:12 -07:00
48208b711d Merge branch 'xMAC94x/quic_enablement' into 'master'
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2268
2021-05-17 12:02:55 +00:00
Sam
daafde048f Fixed comments and some functionality. 2021-05-16 21:35:17 -05:00
951b006e1c main/offhand weapon swap check refactor 2021-05-16 21:07:36 -05:00
b83ba9c10f Add offhand weapons to bag ui 2021-05-16 20:43:19 -04:00
d10dbdf352 Merge branch 'juliancoffee/small_fixes' into 'master'
Set poise_resilience to sane values

See merge request veloren/veloren!2311
2021-05-16 17:35:39 +00:00
12da9a80db Merge branch 'xMAC94x/czech' into 'master'
add czech language. fixed #1044

Closes #1044

See merge request veloren/veloren!2297
2021-05-16 16:39:51 +00:00
06a69fa335 Set poise_resilience to sane values
- Druid Shoulders to 1.0
- Rugged Chest to 1.0
- Cultist Gloves to 1.0
2021-05-16 01:07:55 +03:00
Sam
f5b3872bd4 Removed special case for equipping a weapon that is no longer needed. 2021-05-15 15:16:39 -05:00
Sam
b41f668de2 Unequipping a mainhand weapon now moves offhand weapon into mainhand. 2021-05-15 15:16:39 -05:00
Sam
1b3e619115 Swapping weapon sets is now functional. (Though very hacky?) 2021-05-15 15:16:39 -05:00
Sam
3e33a612f8 Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?) 2021-05-15 15:16:38 -05:00
Sam
f81afa7fc9 Enforced certain invariants in how an item was equipped into the loadout:
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
 - a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
 - 2h weapons can never be equipped in an offhand slot

Fixed some tests
2021-05-15 15:16:38 -05:00
Sam
6f00d556ad Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
5a992e59f6 Merge branch 'holychowders/make_npcs_aware_of_sound' into 'master'
Make NPCs Aware of Sound - See Issue #913

See merge request veloren/veloren!2138
2021-05-15 19:36:41 +00:00
21867f8a85 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
2ee38bda68 Merge branch 'sam/small-fix' into 'master'
Combat Fix

See merge request veloren/veloren!2309
2021-05-15 16:13:44 +00:00
Sam
a2d8496b3d Shifted poise damage of sword dash 2021-05-15 10:30:39 -05:00
4ea398dfd9 Merge branch 'juliancoffee/update-it_IT' into 'master'
update Italian translation by 'Чингис Хан'

See merge request veloren/veloren!2305
2021-05-14 15:35:05 +00:00
0fa437f1cb update Italian translation by 'Чингис Хан' 2021-05-14 17:31:01 +03:00
7e774bf1f1 Merge branch 'revert-7fe0db22' into 'master'
Revert "Merge branch 'snowram/hacky-mount' into 'master'"

See merge request veloren/veloren!2302
2021-05-14 14:22:13 +00:00
8218fdd329 Revert "Merge branch 'snowram/hacky-mount' into 'master'"
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
f377c9c8a8 Merge branch 'snowram/hacky-mount' into 'master'
Allow for collars to make QuadMed npcs mountable

See merge request veloren/veloren!2219
2021-05-14 12:27:19 +00:00
d6b2a09c60 Merge branch 'hqurve/chat-ui' into 'master'
Added chat tabs

See merge request veloren/veloren!2300
2021-05-14 12:27:16 +00:00
9425f212ca Added chat tabs 2021-05-14 12:27:15 +00:00
b38c9e593b Use Body to determine mountee offsets 2021-05-14 00:11:54 +02:00
c594e500e0 Clean unused mount offset 2021-05-14 00:11:46 +02:00
6fb06af1c5 Anims export a transform for mounts 2021-05-14 00:11:37 +02:00
d3b171f608 Expose the mounting bone to the mounter anims 2021-05-14 00:11:28 +02:00
a01add2e2c Collar can make QuadMeds mountable, state + offsets 2021-05-14 00:11:15 +02:00
c181204556 Merge branch 'james/stop-drop-and-roll' into 'master'
Campfires can set things on fire and water puts it out

See merge request veloren/veloren!2299
2021-05-13 05:34:51 +00:00
cdbf023645 Campfires can set things on fire and water puts it out 2021-05-13 05:34:51 +00:00
791ab093b3 add czech language. fixed #1044 2021-05-12 22:36:11 +02:00
b044253d52 Merge branch 'alphyr/guess_image_format' into 'master'
Guess image format from file extension

See merge request veloren/veloren!2260
2021-05-12 18:41:22 +00:00
fe095c769a Merge branch 'tui/newline_in_trace' into 'master'
enable TUI to actually handle newline character.

See merge request veloren/veloren!2282
2021-05-12 18:05:50 +00:00
fa2b181628 use split_inclusive instead 2021-05-12 18:40:12 +02:00
0f3717d047 enable TUI to actually handle newline character.
but we are not sure if NEWLINEs are wanted in logs as it could cause problems with automated parsing.
2021-05-12 18:40:08 +02:00
1ca67b3d2b Merge branch 'xMAC94x/mirror_collab' into 'master'
dont run CI on master on mirror

See merge request veloren/veloren!2291
2021-05-12 13:05:28 +00:00
ed7656c890 Merge branch 'sharp/skip-sprite-mesh' into 'master'
Don't remesh chunk vertex data on sprite update.

See merge request veloren/veloren!2294
2021-05-11 20:39:04 +00:00
e457c3547d Don't remesh chunk vertex data on sprite update.
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
2021-05-11 12:58:15 -07:00