Marcel
10bb78792a
Merge branch 'thanosfisherman/new_music_track_rectifications' into 'master'
...
Thanosfisherman/new music track rectifications
See merge request veloren/veloren!3740
2023-01-02 12:14:39 +00:00
Thanos Psaridis
7bafd5f63c
Thanosfisherman/new music track rectifications
2023-01-02 12:14:39 +00:00
Marcel
9843e2d98d
Merge branch 'vasco-hud-bag-sort_by_tag' into 'master'
...
Added hud-bag-sort_by_tag in italian
See merge request veloren/veloren!3741
2023-01-02 09:57:57 +00:00
Francesco Vasco
a20c563ccd
Added hud-bag-sort_by_tag in italian
2023-01-01 22:42:39 +01:00
Marcel
081f48e73c
Merge branch 'thanosfisherman/add_music_track' into 'master'
...
Thanosfisherman/add music track
See merge request veloren/veloren!3737
2023-01-01 19:36:22 +00:00
Thanos Psaridis
2608e63316
Thanosfisherman/add music track
2023-01-01 19:36:22 +00: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
Matas Minelga
3850d3e86e
Inventory sorting MR fixes and slight improvements
2023-01-01 02:36:03 +02:00
Joshua Barretto
7579b86dc1
Merge branch 'DaforLynx/last-minute-fixes' into 'master'
...
Minor audio code cleanup
See merge request veloren/veloren!3738
2022-12-31 23:50:38 +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
Joshua Barretto
1f2d56c032
Better reflections
2022-12-31 13:04:28 +00:00
Imbris
e6ed8805e4
Merge branch 'yusdacra/nix-update' into 'master'
...
fix: update flake
See merge request veloren/veloren!3728
2022-12-31 07:30:06 +00:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category
2022-12-31 02:32:41 +02:00
Joshua Barretto
313527cf46
Correct material for LoD water
2022-12-30 19:22:07 +00:00
Joshua Barretto
6e344f58e8
Remove unnecessary cloud sampling from shiny water
2022-12-30 17:33:54 +00:00
Joshua Barretto
799bb17d75
Fixed underground sky blend test
2022-12-30 17:24:36 +00:00
Joshua Barretto
4bd7ec26d3
Fixed drop shadows
2022-12-30 17:01:26 +00:00
Joshua Barretto
367ec3e8f4
Added ViewMaterials experimental shader
2022-12-30 16:42:56 +00:00
Joshua Barretto
9098abc3d2
Merge reflections on horizontal border
2022-12-30 16:30:29 +00:00
Joshua Barretto
78fbaa82b3
Fixed ViewNormals
2022-12-30 16:26:32 +00:00
Joshua Barretto
c6fc833acb
Don't blend sky for underwater reflections
2022-12-30 16:23:38 +00:00
Joshua Barretto
d50bda8d09
Better SSR sky blending
2022-12-30 16:01:06 +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
0052af85bc
Merge branch 'zesterer/separate-volumetrics-and-transparents' into 'master'
...
Separated volumetrics and transparents into independent passes to fix UB
See merge request veloren/veloren!3732
2022-12-29 20:09:12 +00:00
Joshua Barretto
e87b5739f0
Separated volumetrics and transparents into independent passes to fix UB
2022-12-29 18:38:25 +00:00
Joshua Barretto
6070bd6538
Merge branch 'master' into 'master'
...
Italian: hud-map-bridge
See merge request veloren/veloren!3717
2022-12-29 13:09:21 +00:00
Christof Petig
0fba3a73e4
Merge branch 'raresgmihalcea/update_flashing_lights_description' into 'master'
...
Update description of the flashing lights setting
See merge request veloren/veloren!3727
2022-12-29 13:01:59 +00:00
Monty Marz
b19d02f7e9
Merge branch 'pfau/bag_icon' into 'master'
...
Bag icon improvement
See merge request veloren/veloren!3731
2022-12-23 15:22:14 +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
Yusuf Bera Ertan
4191b341d0
build(nix): update flake deps
2022-12-19 01:03:50 +03:00
Yusuf Bera Ertan
dd6c33bab7
fix: update flake
2022-12-18 04:25:45 +03:00
Joshua Barretto
1798cdcffe
Merge branch 'zesterer/floofy-clouds' into 'master'
...
Floofy Clouds (improved cloud performance and visuals)
See merge request veloren/veloren!3726
2022-12-17 15:41:08 +00:00
Joshua Barretto
dcc4762106
Fixed moon lighting of clouds
2022-12-17 15:04:57 +00:00
Joshua Barretto
5cf3aefb87
Better storm clouds
2022-12-17 14:57:55 +00:00
Rares
d63f8850a4
Update description of the flashing lights setting
...
The lights are supposed to be enabled when the setting is checked
The new description should better reflect the intended behaviour
Only the English descriptions have been updated.
2022-12-16 21:34:22 +02:00
Joshua Barretto
94c0e3749e
Improved cloud visuals and performance
2022-12-15 23:56:28 +00:00
Marcel
836ae17b51
Merge branch 'fix_spanish' into 'master'
...
fix spanish file movement
See merge request veloren/veloren!3725
2022-12-15 22:20:14 +00:00
Marcel Märtens
b8afaafe69
fix spanish file movement
2022-12-15 21:39:59 +01:00
Imbris
c90be1b56c
Merge branch 'muphblu/item-img-export' into 'master'
...
Items images export for wiki
Closes #1334
See merge request veloren/veloren!3494
2022-12-15 16:19:49 +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
LunarEclipse
719520e296
Merge branch 'jgayfer/fix-macos-controller-input' into 'master'
...
Fix Xbox controller mappings on MacOS
See merge request veloren/veloren!3724
2022-12-15 09:11:13 +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
