Joshua Yanovski
5813861ab2
Fix Cargo lock
2022-09-15 12:16:32 -07:00
Joshua Yanovski
e9a463d459
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
...
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Ben Wallis
1b8ad88106
Merge branch 'sharp/fix-shaderc' into 'master'
...
Unrevert fix to shaderc.
See merge request veloren/veloren!3622
2022-09-15 17:07:04 +00:00
Joshua Yanovski
f481e8cd4f
Unrevert fix to shaderc.
2022-09-15 17:24:47 +01:00
Ben Wallis
699493b656
Merge branch 'xvar/update-ci-docker-image' into 'master'
...
Updated docker CI image to include cmake
See merge request veloren/veloren!3625
2022-09-15 16:23:36 +00:00
Ben Wallis
693e3be066
Temporarily disabled coverage build step due to issues building docker cache image
2022-09-15 17:08:08 +01:00
Ben Wallis
ec2d1b0388
Updated docker CI image to include cmake
2022-09-15 16:40:50 +01:00
Isse
705c72e5c5
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translation
See merge request veloren/veloren!3623
2022-09-15 13:32:26 +00:00
Jonathan Berglin
a724c014c8
Update swedish translation
2022-09-15 13:32:26 +00:00
Joshua Yanovski
cafdcad8ce
Merge branch 'sharp/improve-msg' into 'master'
...
Improve some server system performance
See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56
Reduce overhead of messaging systems.
2022-09-14 21:04:53 -07:00
Ben Wallis
23a8ac906a
Merge branch 'james/fix-pet-aggro' into 'master'
...
Fix pet aggro
See merge request veloren/veloren!3619
2022-09-14 19:48:34 +00:00
James Melkonian
5d5cb28b59
Fix pet aggro
2022-09-14 19:48:34 +00:00
Marcel
725fd09ed7
Merge branch 'yusdacra/nix' into 'master'
...
!2951 with fixed runtime panic
See merge request veloren/veloren!3605
2022-09-14 10:12:07 +00:00
Marcel
5249995ea0
Merge branch 'koboo/update-de_DE' into 'master'
...
Koboo/update de de
See merge request veloren/veloren!3618
2022-09-14 07:48:20 +00:00
Koboo
54e3b3e9f5
Koboo/update de de
2022-09-14 07:48:19 +00:00
Joshua Yanovski
0d09d1f88e
Merge branch 'fix_salamander_and_elbst' into 'master'
...
fix_salamander_and_elbst
See merge request veloren/veloren!3609
2022-09-13 17:32:53 +00:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Isse
6ec7bc5427
Merge branch 'koboo/update-de_DE' into 'master'
...
Update the German translation (hud-skill-dodge resolve error)
See merge request veloren/veloren!3616
2022-09-13 16:09:58 +00:00
Ben Wallis
f1a2031f22
Reworked panic dialog to support displaying the likely cause of common panics
2022-09-12 21:03:30 +01:00
juliancoffee
be1638e2e7
Remove csv_import of loot table
2022-09-12 18:30:17 +03:00
juliancoffee
97900b109f
Make loot export display all modulars
2022-09-12 18:30:17 +03:00
Koboo
71c2d99aef
Update the German translation (hud-skill-dodge resolve error)
2022-09-12 16:58:39 +02:00
Joshua Yanovski
aea4aca057
Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
...
Xmac94x/steal sharps clippy improvements
See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
Marcel Märtens
6c9deee491
revert wgpu/shaderc changes
2022-09-11 16:38:08 +02:00
Marcel Märtens
a32b269252
steal sharps clippy improvements to the old nightly
2022-09-11 16:10:56 +02:00
Samuel Keiffer
513b135d58
Merge branch 'floppy_instrument_sample_edits' into 'master'
...
add guitar & instrument sample edits
See merge request veloren/veloren!3574
2022-09-10 17:23:38 +00:00
flo
e43608ce80
add guitar & instrument sample edits
2022-09-10 17:23:38 +00:00
Joshua Barretto
afc33bb22e
Merge branch 'zesterer/better_aa' into 'master'
...
HQX upscaling for lower internal resolutions, fixed FXAA at lower internal resolutions
See merge request veloren/veloren!3611
2022-09-10 14:48:05 +00:00
Joshua Barretto
33b807c237
Updated changelog
2022-09-10 13:36:43 +01:00
Joshua Barretto
b3b2f404e5
Fixed FXAA at non-1.0x scales
2022-09-10 13:33:38 +01:00
Joshua Barretto
85a1c06be6
Better depth-aware HQX
2022-09-10 13:16:47 +01:00
Joshua Barretto
80fa0baf09
Added HQX anti-aliasing
2022-09-10 10:56:22 +01:00
Ben Wallis
4939d5c126
Merge branch 'xvar/update-docker-compose-to-weekly' into 'master'
...
Updated docker-compose.yml to use weekly image instead of nightly
See merge request veloren/veloren!3610
2022-09-09 14:15:57 +00:00
Ben Wallis
943cfe2d89
Updated docker-compose.yml to use weekly image instead of nightly
2022-09-09 13:25:27 +01:00
Joshua Barretto
03e8eb42ad
Added experimental BetterAA shader
2022-09-09 11:59:40 +01:00
LunarEclipse
796a5f2f90
Added the possibility to toggle muting of any volume category via a keybind
2022-09-09 11:39:27 +02:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
Marcel
b4234523cb
Merge branch 'xMAC94x/update-deps' into 'master'
...
xmac94x/update deps
See merge request veloren/veloren!3608
2022-09-08 22:41:00 +00:00
Marcel Märtens
f653c4f36f
run cargo update
2022-09-08 23:43:11 +02:00
Marcel Märtens
d9e6f10688
update dependencies
2022-09-08 23:29:08 +02:00
Joshua Yanovski
fbb7d888fe
Merge branch 'sharp/fix-mismatched-server-info' into 'master'
...
Fix swallowed network error messages.
See merge request veloren/veloren!3606
2022-09-08 11:58:10 +00:00
Joshua Yanovski
5bb27d9292
Fix swallowed network error messages.
2022-09-08 04:00:46 -07:00
Yusuf Bera Ertan
812298cb63
fix: default to build detected git version / tag if we can't get runtime variables
2022-09-08 12:29:17 +03:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
...
This reverts commit f170da4da6aa7569061b
2022-09-08 12:28:56 +03:00
Marcel
f170da4da6
Merge branch 'revert-441acd3e' into 'master'
...
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
See merge request veloren/veloren!3603
2022-09-08 09:05:53 +00:00
Joshua Yanovski
e55b541bcc
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
...
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Samuel Keiffer
aa7569061b
Merge branch 'juliancoffee/more-buffs' into 'master'
...
Add Golden Cheese debug potion
See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
Joshua Yanovski
c95c08ee54
Merge branch 'sharp/fix-full-server' into 'master'
...
Allow mods/admins to log in when server is full.
See merge request veloren/veloren!3600
2022-09-07 05:21:08 +00:00
Joshua Yanovski
f5aee1d2a7
Allow mods/admins to log in when server is full.
...
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).
Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen. This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
