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
