Marcel Märtens
c2b453f6f1
update toolchain to 2022-09-08
...
This reverts commit 6c9deee491a32b269252
2022-09-24 00:04:40 +02:00
Marcel
3490600ca0
Merge branch 'xMAC94x/update-deps2' into 'master'
...
update_deps_2 - now with more expirmental stuff
See merge request veloren/veloren!3634
2022-09-23 21:44:50 +00:00
Joshua Barretto
963d5a84b5
Merge branch 'zesterer/mini-fixes' into 'master'
...
Improved water shaders
See merge request veloren/veloren!3636
2022-09-23 00:32:52 +00:00
Joshua Barretto
0b0fde5254
Faster wave shader
2022-09-23 00:08:23 +01:00
Joshua Barretto
34522b39bd
Balance caustics with depth better
2022-09-22 23:45:16 +01:00
Joshua Barretto
3b195fbd55
Improved shiny water shader
2022-09-22 23:08:32 +01:00
Joshua Barretto
4bb5660f40
Fixed incorrect specular light in water
2022-09-22 22:40:16 +01:00
Joshua Barretto
b48b3eea02
Improved caustic shaders
2022-09-22 21:12:20 +01:00
Justin Shipsey
1452dee886
Merge branch 'fix_desert_rock_animals' into 'master'
...
fix_desert_rock_animals
See merge request veloren/veloren!3630
2022-09-22 18:42:34 +00:00
flo
cfbadd36ea
fix_desert_rock_animals
2022-09-22 18:42:34 +00:00
Marcel Märtens
049deeca52
cargo update without any windows_gnu msvs crates
2022-09-22 19:17:54 +02:00
Marcel Märtens
fc352a59a0
update forbidden crates
2022-09-22 17:47:07 +02:00
Marcel Märtens
29d0f5b25d
update dependencies
2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9
Merge branch 'seachapel_npc_work' into 'master'
...
seachapel npc work
See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99
seachapel npc work
2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff
Merge branch 'sharp/parallel-ingame' into 'master'
...
Parallelize ingame messages.
See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1
Parallelize ingame messages.
2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90
Remove persistence loading error from SkillSet.
...
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server. It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Marcel
f590e68f7e
Merge branch 'mckol/mute-keybinds' into 'master'
...
Mute audio keybinds (and respective buttons in settings)
See merge request veloren/veloren!3361
2022-09-21 09:22:45 +00:00
Samuel Keiffer
188db01a7b
Merge branch 'sam/hot-agent' into 'master'
...
Agent combat tactics hot reloading
See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c
Merge branch 'Couls/TestBed' into 'master'
...
Extend item pickup UI to group members
Closes #1402
See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55
Extend item pickup UI to group members
2022-09-20 22:13:50 +00:00
Marcel
27a368defd
Merge branch 'MadirexRus/update-ru_RU' into 'master'
...
Update the Russian translation
See merge request veloren/veloren!3631
2022-09-18 19:57:38 +00:00
MadirexRus
0ae7980a2a
Update the Russian translation
2022-09-18 19:57:38 +00:00
Marcel
dee565a325
Merge branch 'koboo/update-de_DE' into 'master'
...
Koboo/update de de
See merge request veloren/veloren!3620
2022-09-18 18:58:34 +00:00
Koboo
bb0382e76c
Koboo/update de de
2022-09-18 18:58:34 +00:00
Sam
c228d9cc3f
Addressed comments
2022-09-17 13:10:01 -04:00
LunarEclipse
2d092635ed
Moved some code around to put it in logical order
2022-09-17 12:48:38 +02:00
Sam
3d6c9a780d
Removed redundant package parameter from init function of hot reloading
2022-09-17 00:55:28 -04:00
Sam
cfeb197f85
Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead.
2022-09-17 00:50:59 -04:00
Sam
23c51af437
Consolidated voxygen and server dynlibs into a common dynlib
2022-09-16 23:43:26 -04:00
Sam
b632dbffdd
Hot reloading attack code in agent now functional
2022-09-16 22:13:18 -04:00
Sam
ddb56bd560
Dynamic library compiles, but still panics
2022-09-16 22:13:18 -04:00
Sam
525630c37a
Moved some agent code into separate crate to facilitate hot reloading of that agent code.
2022-09-16 22:13:18 -04:00
Christof Petig
5d8a708d6b
Merge branch 'juliancoffee/loot_export_fix' into 'master'
...
Make loot export display all modulars
See merge request veloren/veloren!3598
2022-09-16 21:55:59 +00:00
LunarEclipse
6ad02b1fb0
Added i18n stuff for volume muting keybinds for en and pl_PL locales
2022-09-16 22:17:00 +02:00
LunarEclipse
716d4e476e
Updated mute buttons to have less distracting borders (they don't have indexed color)
2022-09-16 21:58:09 +02:00
LunarEclipse
22c99af9d1
Now when master volume is muted other volume icons are grayed out.
2022-09-16 21:30:31 +02:00
Ben Wallis
7aa1feea22
Merge branch 'xvar/better-voxygen-panic-messages' into 'master'
...
Reworked panic dialog to support displaying the likely cause of common panics
See merge request veloren/veloren!3589
2022-09-16 09:59:02 +00:00
Joshua Yanovski
af3f9dcc3e
Merge branch 'revert-b4234523' into 'master'
...
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
See merge request veloren/veloren!3626
2022-09-15 20:28:52 +00:00
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
