Marcel Märtens
054f4f9453
update veloren deps
2023-05-04 11:58:43 +02:00
Isse
44bf8f19f1
combine into one filter_map
2023-05-03 16:29:56 +02:00
Isse
922ba9ed5c
add note about using threshold for subtitle duration
2023-05-03 16:15:28 +02:00
Isse
77b7d1a49e
localize after distance filter
2023-05-03 16:10:14 +02:00
Isse
54a7367cb2
Maintain all subtitles, limit calls to state.update
2023-05-03 13:07:36 +02:00
Isse
f60c44d812
nicer ui
2023-05-03 13:07:36 +02:00
Isse
99463a37f8
subtitles
2023-05-03 13:07:35 +02:00
Isse
1c9b502f69
move flashing lights to accessability settings tab
2023-05-03 13:07:35 +02:00
Isse
ab4076518f
Add multiloot
2023-04-23 19:17:39 +00:00
ubruntu
b53bfd4246
Hide display name of mount while mounted (at full hp)
2023-04-22 18:13:13 +00:00
Sam
e819cd2309
Updated hashbrown, removed some to_owned calls in handling recently unequipped items
2023-04-19 18:43:40 -04:00
Sam
7fdfc0e71b
Addressed review
2023-04-19 18:34:17 -04:00
Sam
c1a64e1d69
Recently unequipped items are now tracked and durability loss on death is applied to them
2023-04-19 18:34:16 -04:00
Imbris
f525be9b3b
Update tracy-client to 0.15.2, also use tracy_client through the
...
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
2023-04-18 21:28:15 -04:00
Christof Petig
4c1c84030f
introduce optional model indices for drop items as well (fixing orichalcum armor drops)
2023-04-16 22:56:04 +02:00
Sam
9d503d1e1f
Debug items no longer have durability
2023-04-14 18:25:24 -04:00
Joshua Barretto
504ea158d2
Merge branch 'zesterer/towns' into 'master'
...
Improvements to towns and NPCs
See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
a835ce7e26
Better starting site choices
2023-04-13 18:32:21 +01:00
Samuel Keiffer
7aa43e9e8a
Merge branch 'taoist/better-dullahan' into 'master'
...
taoist&floppy/cyclops&dullahan
See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee
taoist&floppy/cyclops&dullahan
2023-04-12 22:53:38 +00:00
Joshua Barretto
9e17042bf6
Merge branch 'rtsim2' into 'master'
...
Initial implementation of rtsim2
Closes #1476
See merge request veloren/veloren!3517
2023-04-12 16:17:52 +00:00
Joshua Barretto
16e3227f78
Correct localisation of numeric values, use coordinate conversions in rtsim
2023-04-12 10:36:11 +01:00
Joshua Barretto
3582d86c70
Simplified localisation logic
2023-04-11 23:51:07 +01:00
Joshua Barretto
3484e156d1
Allowed localisation content to be recursive
2023-04-11 23:18:34 +01:00
Joshua Barretto
edcc2f1870
Overhauled chat message representation to allow for more exhaustive localisation
2023-04-11 15:46:36 +01:00
Joshua Barretto
81b52298f0
Addressed review feedback
2023-04-11 10:34:06 +01:00
Imbris
4ea635cc8d
Merge branch 'imbris/random-tweaks-35902u8' into 'master'
...
Some misc tweaks
See merge request veloren/veloren!3861
2023-04-11 02:07:35 +00:00
Joshua Barretto
70538dae66
Choose random plaza tile
2023-04-09 19:25:58 +01:00
Joshua Barretto
3e0f5295c0
Added CharacterActivity, made NPCs look at the player when speaking to them
2023-04-09 19:25:57 +01:00
Joshua Barretto
5aaee96cb1
Removed special-casing of merchants
2023-04-09 19:25:56 +01:00
Joshua Barretto
364255c7fe
Allowed rtsim NPCs to greet nearby actors
2023-04-09 19:25:55 +01:00
Isse
57efd24573
fix bench
2023-04-09 19:25:55 +01:00
Isse
d53b344c23
make merchants use tell, and general cleanup
2023-04-09 19:25:55 +01:00
Joshua Barretto
b022076a5c
Fallback for non-trades
2023-04-09 19:25:55 +01:00
Joshua Barretto
ea007ff702
Cleaning up
2023-04-09 19:25:55 +01:00
Joshua Barretto
acecc62d40
sync
2023-04-09 19:25:53 +01:00
Joshua Barretto
0b4d3c9e20
Fixed scaling of airships
2023-04-09 19:25:53 +01:00
Joshua Barretto
e8b489a71a
sync
2023-04-09 19:25:53 +01:00
Joshua Barretto
8ff438bb5b
Smol animals
2023-04-09 19:25:51 +01:00
Joshua Barretto
c856f2625c
Added rtsim sites
2023-04-09 19:25:51 +01:00
Joshua Barretto
f349e99cfb
Better camera at smaller scales
2023-04-09 19:25:51 +01:00
Joshua Barretto
87a6143375
Began adding rtsim2 NPCs, scale command
2023-04-09 19:25:51 +01:00
Joshua Barretto
d5e324bded
Fixed bad comment
2023-04-09 19:25:51 +01:00
Imbris
54c39c03f7
Merge branch 'imbris/pixel-perfection-v2' into 'master'
...
Move image scaling into the UI shaders rather than precomputing it on the CPU
Closes #257
See merge request veloren/veloren!3573
2023-04-08 07:06:19 +00:00
Imbris
5881e44e61
Address review on 3573
2023-04-08 02:19:14 -04:00
Imbris
2a9a63a60e
Clippy fixes
2023-04-08 00:51:50 -04:00
Imbris
132ce72246
Fix some comments that were mis-formatted by rustfmt
...
and remove TODO that is now documented as a review comment
2023-04-08 00:51:50 -04:00
Imbris
9cdfb6a4aa
Resolve some remaining TODOs for ui image processing changes
...
* Explicitly assert that neither of the requested dimensions for an
image are 0. (I think this used to fail later on anyway)
* Don't show the UI alpha premultiply pass in GPU timings in the HUD
debug info display since it only very transiently appears (since this
doesn't run every frame).
2023-04-08 00:29:29 -04:00
Imbris
7205d4c275
Remove extra performance debugging code
2023-04-08 00:28:32 -04:00
Imbris
63096b2042
Complete GPU based alpha premultiplication impl and make the CPU version
...
even faster.
* GPU based version started in previous commit, but this fixes errors
and bugs and gets it actually compiling and running.
* Add a way to batch together images to use the same render pass for GPU
premultiplication if they all target the same texture.
* Pending premultiplication uploads are automatically done when calling
`Drawer::third_pass`.
* `fast-srgb8` dep removed, we no longer convert to `f32`s to do the
premultiplication. Two `[u16; 256]` tables are combined to compute the
alpa premultiplied color within the same error bounds used by the
`fast-srgb8` crate. We also no longer use explicit simd.
* Remove explicit lifetimes from `PlayState::render` since `&self` and
`Drawer<'_>` don't need to have the same lifetime.
* Fix existing bug where invalidated cache entries were never set to
valid when reusing them.
* `prepare_graphic` now runs some heuristics to determine whether
premultiplication should be executed CPU side or GPU side and then
returns a bool indicating if GPU premultiplication is needed.
2023-04-08 00:28:31 -04:00
