flo
0657df80a1
quadruped_low anim fix
2023-06-03 14:03:48 +00:00
flo
16d58c6b4e
plant creatures
2023-06-03 13:59:52 +00:00
Joshua Barretto
e71eee0cd2
Merge branch 'zesterer/damage-fixes' into 'master'
...
Make items vanish after 5 minutes
See merge request veloren/veloren!3963
2023-06-01 14:49:00 +00:00
Joshua Barretto
ec3a7d1898
Make items vanish after 5 minutes
2023-06-01 14:51:19 +01:00
Isse
174dac9206
Remove print
2023-06-01 13:12:03 +00:00
Joshua Barretto
2064ad5d80
Added color dither
2023-05-31 19:10:09 +01:00
Joshua Barretto
2a9e43b847
Draw distinction between bilinear filtering and nearest neighbour
2023-05-31 18:26:53 +01:00
Joshua Barretto
b2051767ff
More experimental shaders
2023-05-31 17:07:22 +01:00
Joshua Barretto
4fa799e7c7
Fixed volume mount orientation
2023-05-25 03:16:27 +01:00
Joshua Barretto
465a62a072
Correct for orientation movement on voxel entities
2023-05-25 00:25:28 +01:00
Joshua Barretto
96bf86dae0
Rebalanced masses, dimensions, swim thrusts, and made various improvements to water movement that help with gameplay and pathfinding. Also fixed swimming animations for many creatures.
2023-05-25 00:25:25 +01:00
flo
a55276ea73
seachapel_rework
2023-05-24 18:13:29 +00:00
Joshua Barretto
2219797142
Merge branch 'zesterer/shader-block-kinds' into 'master'
...
Added support for block kinds in shaders
See merge request veloren/veloren!3932
2023-05-21 17:19:51 +00:00
Joshua Barretto
2d9e800422
Fixed doc comment
2023-05-21 17:51:17 +01:00
Joshua Barretto
f5b24a5953
Removed redundant hit code
2023-05-19 16:54:14 +01:00
Joshua Barretto
c73848b932
Fixed minor issues with walls, better particles
2023-05-19 14:25:49 +01:00
Joshua Barretto
c94d6c502a
Added one-way wall sprites
2023-05-19 13:24:45 +01:00
Tao In Way
f18297ec75
taoist/charms
2023-05-19 03:07:44 +00:00
Joshua Barretto
a634da2d07
Addressed review comments
2023-05-17 22:22:54 +01:00
Joshua Barretto
8e03f87881
Addressed review comments
2023-05-16 10:08:25 +01:00
Joshua Barretto
aeb72bcf22
Added support for block kinds in shaders
2023-05-15 17:31:21 +01:00
Joshua Barretto
0ec5ea87d7
Reduce default audio volume
2023-05-14 22:12:49 +01:00
Joshua Barretto
391c9ecba5
Default to fullscreen
2023-05-14 22:11:37 +01:00
flo666
0ba58d8785
map icon fix & set difficulty indicator to 2
2023-05-13 09:32:28 -04:00
flo666
c7831a8ca9
loot_tables yeti&elder ,
...
change drum to wildskin_drum,
add map icons,
yeti attacks buff
2023-05-13 09:32:27 -04:00
flo666
7739aaff78
add more loot
2023-05-13 09:32:24 -04:00
flo666
9a6ab28c3d
adlet elder tweaks
2023-05-13 09:32:24 -04:00
flo666
17e4af3c48
BlockKind::ArtSnow
...
replace BlockKind::Snow with BlockKind::Misc
2023-05-13 09:32:19 -04:00
flo666
6668df9f08
add adlet elder
2023-05-13 09:30:56 -04:00
flo666
c46ea4ae91
-add quadruped_medium/combomelee
...
-frostfang ability_set
2023-05-13 09:30:55 -04:00
Sam
5a83f85779
Initial ice drake AI
2023-05-13 09:30:55 -04:00
flo666
86803c43bf
adlet tracker tweaks
2023-05-13 09:30:54 -04:00
flo666
c8bb0050ad
adlet npc work
2023-05-13 09:30:53 -04:00
flo666
ef5fe63bc2
tursus npc - add 2 abilities
2023-05-13 09:30:52 -04:00
flo666
715a0b7b20
rebase
2023-05-13 09:30:50 -04:00
jshipsey
da3c2369e5
initial setup
2023-05-13 09:30:13 -04:00
Joshua Barretto
eb7d712093
Merge branch 'zesterer/in-soviet-russia-pet-mount-you' into 'master'
...
Allow pet birds to sit on the player's shoulder
See merge request veloren/veloren!3930
2023-05-13 12:14:21 +00:00
Joshua Barretto
2aca9db4ac
Prevent mounted pets stealing targetting, allowed sitting on chairs with a pet on your shoulder
2023-05-12 21:18:32 +01:00
Joshua Barretto
9e9889eed6
Allowed bird pets to mount their owners when nearby
2023-05-12 21:03:44 +01:00
Joshua Barretto
4253833aaf
Add photorealistic experimental shader
2023-05-12 14:02:23 +01:00
Joshua Barretto
1924c67033
Adjusted night ambience
2023-05-12 13:47:01 +01:00
Isse
1617c180ef
small changes
2023-05-09 19:55:52 +02:00
Isse
6219b52f87
rename Vox trait to FilledVox, and change is_empty to is_filled
2023-05-09 19:43:10 +02:00
Isse
1d60d72c01
format line
2023-05-09 19:43:10 +02:00
Isse
87b2f0fd26
don't apply move state velocity if volume riding, don't mount sprites on interact
2023-05-09 19:43:10 +02:00
Isse
a0ed18c3db
add doc comments
2023-05-09 19:43:10 +02:00
Isse
61ecd2c178
various small fixes
2023-05-09 19:43:10 +02:00
Isse
f6f332af6a
send full matrix to shader
2023-05-09 19:43:10 +02:00
Isse
b4c3868dd4
different translation key for mounting Helm
2023-05-09 19:43:10 +02:00
Isse
a6665ed988
some comments
2023-05-09 19:43:10 +02:00
Isse
2e2e5680bc
use spacial grid for interactables
2023-05-09 19:43:10 +02:00
Isse
78dc394c48
use sitting animation by default when sprite mounted
2023-05-09 19:43:10 +02:00
Isse
192356f6c5
use interpolated pos and ori
2023-05-09 19:43:09 +02:00
Isse
facea64a58
remove todo!
2023-05-09 19:43:09 +02:00
Isse
57551c479c
force of mount in teleporting commands
2023-05-09 19:43:09 +02:00
Isse
e39790e9e4
make sprites work on multiple ships at once
2023-05-09 19:43:09 +02:00
Isse
134d0f0c04
varius fixes
2023-05-09 19:43:09 +02:00
Isse
b3a70627e5
fix volumes
2023-05-09 19:43:09 +02:00
Isse
a35a1a34c4
more sprites on airships
2023-05-09 19:43:09 +02:00
Isse
6674cce2cc
intercat with sprites on ships
2023-05-09 19:43:09 +02:00
Isse
7fbe2cd5ec
particles on volume
2023-05-09 19:43:09 +02:00
Isse
d292234c47
lod for sprites on volumes
2023-05-09 19:43:09 +02:00
Isse
fcb7011cde
sprites on volumes
2023-05-09 19:43:09 +02:00
Isse
6ddfd631d6
don't sit through walls
2023-05-09 19:43:09 +02:00
Isse
7eba16a2d7
use mount key
2023-05-09 19:43:08 +02:00
Isse
2928eb8d15
sit on sprites
2023-05-09 19:43:08 +02:00
Joshua Barretto
1cc221f653
Merge branch 'zesterer/rtsim-tweaks' into 'master'
...
Started adding wandering rtsim monsters
See merge request veloren/veloren!3908
2023-05-09 14:51:15 +00:00
Marcel Märtens
95bca5418a
update toolchain to nightly-2023-04-20
2023-05-08 18:58:54 +02:00
Sam
d5fc65ce83
Fix ci test
2023-05-07 21:50:59 -04:00
Sam
a38f336c9e
Added dual wielding sword contextual abilities.
2023-05-07 20:43:51 -04:00
Sam
0ecf4fbe87
Dual wielding weapons of the same kind added as a context
2023-05-07 20:43:51 -04:00
Sam
9cedf854de
Abilities can now be activated from multiple contexts
2023-05-07 20:43:50 -04:00
Joshua Barretto
ee971e4056
Added item merging
2023-05-04 22:12:25 +01:00
Joshua Barretto
a5b1e41d8b
Make NPC interaction go via rtsim
2023-05-04 11:23:46 +01:00
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
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
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
Imbris
efd932c71e
Progress on GPU premultiplication.
...
* General progress in setting up code paths to support GPU
premultiplication.
* Created `PremultiplyUpload` type to represent an initiated image
upload where the premultiply pass needs to be ran to complete it.
* Converted from compute pass to render pass since current limitations
make it difficult to write directly to a srgb image from a compute
shader.
* Replace `CachedDetails::Immutable` with keeping track of the
parameters used to create the texture (i.e. the border color).
* Create `TextureRequirements`, `TextureParamters`, and `CacheKey` types
to encode parameters that go into texture creation and image caching
and to determine when the space in texture memory should be reused
when replacing a graphic.
* Add custom texture creation logic for the UI textures since those need
certain usage combinations.
2023-04-08 00:28:31 -04:00
Imbris
1d51aae3b2
Start attempt to premultiply alpha on the GPU.
2023-04-08 00:28:31 -04:00
Imbris
7538b04348
Operate on 4 pixels at a time when premultiplying alpha to speed things up a little.
2023-04-08 00:28:31 -04:00
Imbris
f62c2cde70
Use fast-srgb8 crate to efficiently convert between non-linear srgb u8 and
...
linear f32 values for performing alpha premultiplication on the CPU.
2023-04-08 00:28:31 -04:00
Imbris
eb6d16b02c
Rename draw_graphic -> prepare_graphic since it is no longer always
...
specifically rendering an image at the provided dimensions. Start
working on alpha premultipication which is necessary for being able to
properly sample colors on the GPU with bilinear filtering. Various
tweaks to comments and misc changes.
2023-04-08 00:28:31 -04:00
Imbris
69a1a661b6
fixes and tweaks (various minor changes related to UI image scaling on
...
GPU)
2023-04-08 00:28:31 -04:00
Imbris
d62bf8a790
init (scaling UI images during sampling on the GPU instead of on the CPU)
2023-04-08 00:28:28 -04:00
Imbris
e20cf5f14f
Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs
2023-04-07 01:59:41 -04:00
Samuel Keiffer
162509e1c9
Merge branch 'sam/durability' into 'master'
...
Durability
See merge request veloren/veloren!3509
2023-04-06 22:42:52 +00:00
Hudson
e03406b103
fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one
2023-04-06 13:43:11 -05:00
Hudson
4881d2fd8b
fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one
2023-04-06 12:40:08 -05:00
Monty Marz
29a7520a48
adjusted death message, fixed repair bench text
2023-04-06 10:57:17 -04:00
Sam
132f26dbc0
Addressed review
2023-04-06 10:57:16 -04:00
Sam
00710a4eb0
Fixed csv tools
2023-04-06 10:57:13 -04:00
Sam
e4ebd17363
Addressed feedback
2023-04-06 10:57:12 -04:00
Sam
ca879173be
Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist.
2023-04-06 10:56:55 -04:00
Sam
658de93c59
Repairing UI
2023-04-06 10:56:53 -04:00
Sam
536d88a2c7
Repair costs scale based on how damaged the item is.
2023-04-06 10:54:50 -04:00
Sam
0966753699
Added repair recipes
2023-04-06 10:54:48 -04:00
Sam
c3f5bc13f1
Equipment can now be repaired at sprites in town.
2023-04-06 10:54:48 -04:00
Sam
a555e08d0b
Added durability to item tooltips
2023-04-06 10:54:47 -04:00
Sam
df13741be9
Durability system in place
2023-04-06 10:54:46 -04:00
Christof Petig
e60aace448
realize zesterers proposal
2023-04-05 00:11:26 +02:00
Christof Petig
f4a87e9f0b
cargo fmt
2023-04-04 23:47:31 +02:00
Christof Petig
8d2b9b9a9c
single file orichalcum armor
2023-04-04 23:46:20 +02:00
Christof Petig
5cb974f770
cargo fmt
2023-04-04 23:46:20 +02:00
Christof Petig
76baf491ec
support model indices for humanoids
2023-04-04 23:46:20 +02:00
Christof Petig
0b8bc507ac
fix clippy
2023-04-04 23:46:20 +02:00
