Samuel Keiffer
8febcf6b3d
Merge branch 'sam/buffs' into 'master'
...
Auras and buffs no longer need to tick every tick
See merge request veloren/veloren!3814
2023-03-12 22:06:48 +00:00
Sam
42388976d7
Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.
2023-03-12 16:37:02 -04:00
flo
704af5ef7b
bird_medium_scale
2023-03-12 18:08:21 +00:00
Imbris
6b8e22d6cc
Improvements and fixes for interacting/collecting
...
* Inert entities like arrows no longer block interactions like picking
up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
since we were using this enum for two different things.
2023-03-11 21:17:27 -05:00
Sam
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
Sam
663db06844
Made auras no longer need to be mutably accessed every tick.
2023-03-11 16:45:12 -05:00
Sam
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
Monty Marz
277a402781
Initial quest window work, spot fixes
2023-03-10 22:16:26 +00:00
Marcel
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Cat Stevens
83e4cdfe76
Allow locking camera zoom
...
Allow the camera's zoom to be locked by a keybind
or a Gameplay setting. The zoom lock
behavior can be changed between Toggle
and Auto, where Auto only locks the camera
zoom while specific movement/combat inputs
are being pressed. (closes !1528 )
A temporary fading notification is shown at the
top of the screen, informing the player of
the setting change (when the keybind is
used) or that the zoom is locked (when
the player might have forgotten the zoom
is locked, and is trying to zoom).
i18n strings are added for English and German,
but no other languages.
To implement the simplistic fading text, the
behavior was extracted into an impl
called `ChangeNotification`, where
reasons are quantified by `NotificationReason`.
2023-03-05 11:30:27 -05:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
Joshua Barretto
175ae0da7b
Cleaned up implementation, addressed review comments
2023-03-01 12:54:43 +00:00
Joshua Barretto
81ec1f726c
Reduced light volume bounds according to underground depth
2023-03-01 12:09:41 +00:00
Joshua Barretto
fc05638490
Fix rain in caves
2023-03-01 12:09:41 +00:00
Joshua Barretto
4699569eae
Made directed shadows take advantage of culling
2023-03-01 12:09:41 +00:00
Joshua Barretto
0d0b7a8889
Got rid of the worst of the cull popping
2023-03-01 12:09:41 +00:00
Joshua Barretto
7fa654ae4c
Clippy fixes
2023-03-01 12:09:40 +00:00
Joshua Barretto
124c7e1496
Switch to camera position for culling
2023-03-01 12:09:40 +00:00
Joshua Barretto
661b587c9f
Added basic culling of underground terrain and sprites
2023-03-01 12:09:40 +00:00
flo
98e93d1a1c
spawn and loot tweaks, tursus and werewolf anims
2023-02-22 01:32:05 +00:00
flo
bf81ffc029
frost_gigas
2023-02-15 00:10:37 +00:00
flo
0531b40fae
bird_medium_2
2023-02-14 23:17:20 +00:00
Imbris
b9a6742ee6
Fix cursor not hiding when closing bag while both the bag and crafting window are displayed by delaying the want_grab calculation to after the crafting window is hidden
2023-02-03 00:26:49 -05:00
flo666
9c09000256
- change bristlemane to bristleback
...
- axebeak tweaks
2023-01-31 20:34:41 +01:00
flo666
e109f5c377
axebeak, tursus
2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3
bristlemane
2023-01-31 20:34:40 +01:00
flo666
271b80b832
seal
2023-01-31 20:34:40 +01:00
João Capucho
277528355b
Fix depth textures being bound as float textures
...
Webgpu defines that a texture depth format can only be sampled as a
depth texture or as an "unfilterable-float", however both the clouds and
postprocess pipeline were declaring in their bind group that the depth
source was a texture with a sample type of float (filterable).
This is forbidden by the webgpu specification and should be caught by
validation, but the version of wgpu we are using doesn't have that check
(older versions have the check), so we can only assume that this is
undefined behavior.
Relevant sources:
- [Bind Group Creation](https://gpuweb.github.io/gpuweb/#bind-group-creation )
includes the rules that explicitly forbid this situation
- [Depth-stencil formats](https://gpuweb.github.io/gpuweb/#depth-formats )
defines which sample types we are allowed to use with depth textures
2023-01-31 16:46:24 +00:00
Marcel
c165d28e7d
Merge branch 'wyvern_wings' into 'master'
...
wyverns
See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095
wyverns
2023-01-28 21:25:17 +00:00
Isse
aefead4a31
fmt
2023-01-28 03:10:43 +01:00
Isse
d949348661
Moderator badge
2023-01-28 03:10:24 +01:00
Ellen Sun
d774319cf0
cleanup and fixes + added change to CHANGELOG.md
2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094
move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command
2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3
added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help
2023-01-27 20:31:56 -05:00
poggly
75ccd65ec6
initial commit, todo comment and realphabetized ServerChatCommand enum
2023-01-27 20:31:56 -05:00
Corvella
dcd3fb2077
Correctly apply LoD distance setting and improve documentation on projectile fixes
2023-01-26 14:27:59 +00:00
Joshua Barretto
88ac238121
Merge branch 'joedonofry/dropped_lantern_glow' into 'master'
...
Add glow to dropped lanterns
See merge request veloren/veloren!3772
2023-01-23 16:13:43 +00:00
Joseph Donofry
74ee861dde
Add glow to dropped lanterns
2023-01-23 16:13:43 +00:00
Isse
05dd34e1e8
Merge branch 'isse/update-dot-vox-dependency' into 'master'
...
Update dot_vox dependency
See merge request veloren/veloren!3776
2023-01-22 22:22:02 +00:00
Isse
4fdcbeeb71
Update dot_vox dependency
2023-01-22 18:00:39 +01:00
Isse
709b6a9aae
Fixed armor stat diff display
2023-01-21 02:40:32 +01:00
Joshua Barretto
75e07c04f0
Merge branch 'zesterer/glowing-sprites' into 'master'
...
Added support for glowing sprites
See merge request veloren/veloren!3771
2023-01-19 22:31:30 +00:00
Joshua Barretto
d9552f7ff4
Added support for glowing sprites
2023-01-19 21:59:02 +00:00
Avi Weinstock
1cf74cecdb
Allocate the correct number of widget ids for multiplicity icons.
2023-01-19 15:06:14 -05:00
Avi Weinstock
aba6f6654e
Add a new particle mode for potion sickness.
2023-01-19 15:06:14 -05:00
Avi Weinstock
adaf8ef6f4
Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs.
2023-01-19 15:06:13 -05:00
Avi Weinstock
1b00b18a7b
Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness.
2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73
Implement potion sickness, which causes diminishing returns on healing from potions.
2023-01-19 15:06:12 -05:00
Francesco Vasco
4e19b9cdfa
Fix label size of "set as exp bar" checkbox
2023-01-17 19:45:04 +01:00
James Melkonian
9d31baf500
Make bats easier to combat and fix hitbox scaling bug
2023-01-15 16:25:43 -08:00
Joshua Barretto
295e3c4109
Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master'
...
autodelete of summoned sprites
See merge request veloren/veloren!3735
2023-01-15 18:28:38 +00:00
flo
650ef9a5e2
autodelete of summoned sprites
2023-01-15 18:28:38 +00:00
Marcel
beb934a677
Merge branch 'floppy_dark_guitar&icy_talharpa' into 'master'
...
dark_guitar & icy_talharpa
See merge request veloren/veloren!3753
2023-01-13 13:37:45 +00:00
flo
0eba37ce6a
dark_guitar & icy_talharpa
2023-01-13 13:37:45 +00:00
Joshua Barretto
b127cff26c
Merge branch 'zesterer/gbuffers-ssr' into 'master'
...
Use normal and material gbuffer to improve quality of SSR
See merge request veloren/veloren!3734
2023-01-12 20:26:41 +00:00
Joshua Barretto
4d7526b920
Made point shadows with shadow mapping an experimental shader
2023-01-12 15:39:11 +00:00
Isse
5adaad956b
Experimental shader command
2023-01-10 01:57:44 +00:00
Marcel Märtens
25906e05df
Change the version number to 0.14
2023-01-06 18:41:03 +01:00
Marcel Märtens
d271c40592
cargo fmt
2023-01-03 08:58:08 +01:00
Imbris
d254e14771
Remove custom keylayout init code since we are back on matching winit version with the keylayout crate.
2023-01-02 22:43:32 +00:00
Marcel
edb34116b4
Merge branch 'xMAC94x/fix_crash' into 'master'
...
fix crash when clamp mode is used by using min().max() rather than clamp
See merge request veloren/veloren!3742
2023-01-02 16:33:16 +00:00
Marcel Märtens
3c502579db
fix crash when clamp mode is used by rearanging the parameters
2023-01-02 15:51:24 +01:00
Marcel
2ff24259be
Merge branch 'zesterer/lod-models' into 'master'
...
New LoD model, wind sway pays attention to wind velocity
See merge request veloren/veloren!3739
2023-01-02 14:51:00 +00:00
Marcel
54176068cf
Merge branch 'blinc/voxygen-wayland-fix' into 'master'
...
Fix wayland permission problem by updating keyboard-keynames
See merge request veloren/veloren!3733
2023-01-02 14:07:06 +00:00
Marcel Märtens
0c10b8ca08
fix Cargo.lock and fmt
2023-01-02 15:06:42 +01:00
Imbris
a123c7ad7f
Merge branch 'ashirviskas/advanced_inventory_sorting' into 'master'
...
Inventory: Improved inventory sorting
See merge request veloren/veloren!3736
2023-01-01 01:14:47 +00:00
DaforLynx
221d6a67ad
Minor audio code cleanup
2022-12-31 23:50:38 +00:00
Joshua Barretto
0067825187
Reflection smearing
2022-12-31 19:19:52 +00:00
Joshua Barretto
f48e1ca951
Make wind sway change according to weather wind velocity
2022-12-31 17:40:40 +00:00
Joshua Barretto
873d3fb7a4
Added dead trees to LoD
2022-12-31 15:32:56 +00:00
Blinc
57b2f3c11c
Wayland permission fix - update keyboard-keynames
2022-12-31 17:08:32 +03:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category
2022-12-31 02:32:41 +02:00
Joshua Barretto
367ec3e8f4
Added ViewMaterials experimental shader
2022-12-30 16:42:56 +00:00
Joshua Barretto
26a98a3d9b
Use normal and material gbuffer to improve quality of SSR
2022-12-30 15:33:23 +00:00
Joshua Barretto
e87b5739f0
Separated volumetrics and transparents into independent passes to fix UB
2022-12-29 18:38:25 +00:00
Monty Marz
6b74437c8c
Bag icon improvement
2022-12-23 15:22:13 +00:00
Marcel
5f4f285523
Merge branch 'christmas-2022' into 'master'
...
Christmas 2022 changes
See merge request veloren/veloren!3721
2022-12-22 21:06:51 +00:00
DaforLynx
5e282340ba
Christmas 2022 changes
2022-12-22 21:06:51 +00:00
Aidar Shaikhiev
cccc796d31
Items images export for wiki
2022-12-15 16:19:49 +00:00
Marcel
b328377979
Merge branch 'assets_manager-0.9' into 'master'
...
Update to `assets_manager 0.9
See merge request veloren/veloren!3723
2022-12-15 11:34:46 +00:00
James Gayfer
0badaaa4ba
Fix Xbox controller mappings on MacOS
...
After downloading the game onto my M1 Macbook, I wasn't able to get my
Xbox Series X controller to work properly. The mappings seems all over
the place in ways that didn't make sense, like the right analog stick
bound to primary and secondary attack.
I looked deeper into how controller binds work, and saw that they're
mostly all mapped to sane defaults via gilrs. I setup a test project
that mirrored gilrs's "hello world" example for controller inputs, and
noted that the inputs were logged as expected. This is when I noted the
version mismatch, as Veleron was using 0.9, while my project was using
0.10. After rolling back to 0.9 in my test project, I was able to
reproduce the incorrect mappings.
With the bump to 0.10, controller mappings respect our configured
defaults for my Xbox Series X controller on MacOS.
2022-12-13 21:42:32 -08:00
Benoît du Garreau
4fbb0b9a0b
Update to `assets_manager 0.9
2022-12-14 00:54:34 +01:00
IsseW
54bad4b205
Creature viewpoint
2022-11-30 16:51:02 +01:00
Marcel
44bca9a1b0
Merge branch 'floppy_dagon_kit' into 'master'
...
dagon_kit
See merge request veloren/veloren!3696
2022-11-30 15:27:21 +00:00
flo
466ed2c382
dagon_kit
2022-11-30 15:27:21 +00:00
IsseW
7296843923
simple bridges
2022-11-30 15:13:52 +01:00
Marcel Märtens
225cbf472f
update tag and fix empty maps, other bugs introduced by auto fix
2022-11-29 09:19:10 +01:00
Marcel Märtens
2812729b78
cargo clippy lifetimes
2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3
fix clamp clippy errors
2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e
fix clippy errors
2022-11-28 14:08:11 +01:00
Marcel Märtens
ba3747a3f0
update toolchain
2022-11-28 14:08:11 +01:00
DaforLynx
d338906b19
More music and artist links
2022-11-25 18:48:56 +00:00
Monty Marz
3abfa4d2cc
Add Exp-Bar
2022-11-22 11:52:39 +00:00
Justin Shipsey
a75b1bc21c
Merge branch 'mossdrake_and_wood_fix' into 'master'
...
reduce mossdrake, fix woodgolem loottable
See merge request veloren/veloren!3700
2022-11-21 14:22:16 +00:00
flo
e7b802712d
reduce mossdrake, fix woodgolem loottable
2022-11-21 14:22:15 +00:00
Joshua Barretto
5638934a0d
Fixed TimeOfDay interpolation
2022-11-18 11:27:37 +00:00
Samuel Keiffer
5709427e63
Merge branch 'sam/small-fixes' into 'master'
...
Small fixes for sword
See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Sam
b2b8ea1772
Made calculation of prim count more accurate
2022-11-15 19:54:08 -05:00