Commit Graph

13161 Commits

Author SHA1 Message Date
Sam
7d42c45fdd Site2 code is now hot-reloadable with 'hot-site2' feature. 2023-01-09 20:06:35 -05:00
Nico
dcd1a45a22 Issue 1773 - nix build: tests are failing with Assets directory not found 2023-01-07 22:11:32 +01:00
Marcel
185dccc1cc Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.14

See merge request veloren/veloren!3748
2023-01-06 18:27:46 +00:00
Marcel Märtens
25906e05df Change the version number to 0.14 2023-01-06 18:41:03 +01:00
Marcel
d1e9e89676 Merge branch 'Update-swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3746
2023-01-05 14:25:24 +00:00
tygyh
3fb7674e6a Update swedish translations 2023-01-05 10:30:11 +01:00
Marcel
dbe1f92f00 Merge branch 'DaforLynx/soundtrack-fix' into 'master'
Soundtrack fix...

See merge request veloren/veloren!3744
2023-01-03 22:27:19 +00:00
DaforLynx
b493a89b7f Soundtrack fix... 2023-01-03 22:27:19 +00:00
Marcel
84f0980dac Merge branch 'imbris/macos-fix' into 'master'
Fix macos compilation

See merge request veloren/veloren!3743
2023-01-03 09:02:28 +00: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
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