Commit Graph

14745 Commits

Author SHA1 Message Date
DaforLynx
fd28f10dff Address comment by zesterer 2023-10-20 10:12:22 -07:00
Imbris
15c5e53b12 Merge branch 'imbris/small-improvements' into 'master'
Small asset code improvements

See merge request veloren/veloren!4151
2023-10-20 14:51:15 +00:00
Imbris
306be0f9ba Merge branch 'crabman/reload-chunks-fix' into 'master'
Fix panic in /reload_chunks if the terrain persistence feature was enabled but disabled in the server settings

See merge request veloren/veloren!4150
2023-10-19 22:45:25 +00:00
maxicarlos08
ff5b485dbc
fix panic in /reload_chunks if the terrain persistence feature was enabled but disabled in the settings 2023-10-20 00:04:16 +02:00
Joshua Barretto
7c4ac6492e Merge branch 'zesterer/tweaks' into 'master'
Stop dullahan spawning in the overworld

See merge request veloren/veloren!4148
2023-10-19 19:25:20 +00:00
Joshua Barretto
eddbd86f1f Moved dullahan to stone ring 2023-10-19 19:26:25 +01:00
Joshua Barretto
922759a83e Make dullahan a rare spawn in dusty caves 2023-10-19 18:26:31 +01:00
Joshua Barretto
cfc5a5c0f0 Stop dullahan spawning in the overworld 2023-10-19 18:24:54 +01:00
Imbris
0413a3e111 Small asset code improvements
* Replace manual Clone impl with derive
* Take advantage of hashbrown's Equivalent trait to simplify using a
  non-allocating key
2023-10-19 12:02:49 -04:00
jshipsey
1b8265803e comments addressed 2023-10-19 11:23:55 -04:00
jshipsey
d27c73ddb1 fmt 2023-10-19 00:17:50 -04:00
DaforLynx
350257c572 Fix lava sounds not playing, some adjustments to frequency 2023-10-19 00:14:14 -04:00
jshipsey
cf425a09c8 setup 2023-10-19 00:14:12 -04:00
Joshua Barretto
8babe65353 Merge branch 'zesterer/better-lod' into 'master'
Reverted bad shader changes

See merge request veloren/veloren!4145
2023-10-18 22:44:44 +00:00
Christof Petig
1950ee9e9b Merge branch 'christof/plugin_hotfix' into 'master'
replace read_at with the more portable workaround

See merge request veloren/veloren!4146
2023-10-18 21:06:19 +00:00
Joshua Barretto
e81516a154 Log shader warnings 2023-10-18 21:50:40 +01:00
Christof Petig
252771c411 replace read_at with the more portable workaround 2023-10-18 22:31:25 +02:00
Joshua Barretto
cea7636e29 Reverted bad shader changes 2023-10-18 21:20:15 +01:00
Joshua Barretto
d1158abd6f Merge branch 'zesterer/better-lod' into 'master'
Testing better LoD voxelisation techniques

See merge request veloren/veloren!4144
2023-10-18 19:47:02 +00:00
Joshua Barretto
cb2de226a2 Fixed tracing span ordering issue 2023-10-18 19:56:19 +01:00
Marcel
c7383c662f Merge branch 'xMAC94x/better_moderation' into 'master'
Improve chat moderation

See merge request veloren/veloren!4138
2023-10-18 12:03:13 +00:00
Joshua Barretto
e344277b08 Updated changelog 2023-10-18 12:54:22 +01:00
Marcel Märtens
9e5bd1e463 add a log for each person accessing the chat api 2023-10-18 13:05:22 +02:00
Joshua Barretto
321cc030ad Better LoD giant trees 2023-10-18 09:58:00 +01:00
Joshua Barretto
ba763f2da5 Make no terrain pop the default 2023-10-18 09:58:00 +01:00
Joshua Barretto
6a82fcf703 Added block noise to LoD objects 2023-10-18 09:58:00 +01:00
Joshua Barretto
8036ffa374 Removed unnecessary shader code 2023-10-18 09:58:00 +01:00
Joshua Barretto
bf92d0287b Skip animating figures outside of the frustum 2023-10-18 09:58:00 +01:00
Joshua Barretto
c07d7a212b Better LoD effects, performance improvements 2023-10-18 09:58:00 +01:00
Joshua Barretto
4d6c3a00f3 Testing better LoD voxelisation techniques 2023-10-18 09:57:59 +01:00
Marcel Märtens
0baab58928 imbris though the Cow would get Cloned anyway, so we go directly for String for now. OnceCell might be a thing in the future, but not now.
Also logging errors in case metrics cannot be build
2023-10-18 10:50:58 +02:00
Marcel Märtens
360cc4a4b7 Move most of the locking work to a seperate tokio spawn thread 2023-10-18 10:08:48 +02:00
Marcel Märtens
adeab73876 move whole webserver to server-cli 2023-10-18 09:35:40 +02:00
Marcel Märtens
38f4b8b644 There is no way to moderate ChatMessages not send in global chat. For this way we might investigate in a different approach.
The Gameserver returning the latest chat messages via a REST api (protected by a password in settings).
A central service can then scrape this endpoint and make it accessable to moderators.

We need to make sure to log which moderator sees which messages, especially when whispered. to be sure we might also limit the holding period to a week
2023-10-18 09:35:40 +02:00
Christof Petig
bbed1d85e8 Merge branch 'christof/items_in_plugins' into 'master'
Load voxel, item description and body specs from plugin archives

See merge request veloren/veloren!3658
2023-10-17 22:11:01 +00:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
22f8433d22 address imbris suggestions in this new version 2023-10-17 21:07:24 +02:00
Christof Petig
621334d69b clippy fix and tar_source simplification 2023-10-17 21:07:24 +02:00
Christof Petig
64dec7efe2 fix compilation without plugins feature, fixes unit tests 2023-10-17 21:07:24 +02:00
Christof Petig
73ebe8ab98 add changelog entry 2023-10-17 21:07:24 +02:00
Christof Petig
60336a1c56 improve duplicate error message 2023-10-17 21:07:24 +02:00
Christof Petig
61b7a1ff17 report errors other than not found when combining assets 2023-10-17 21:07:24 +02:00
Christof Petig
8dce52221b separate combined cache and fs cache 2023-10-17 21:07:23 +02:00
Christof Petig
baccdeb22f move plugin list into source 2023-10-17 21:07:23 +02:00
Christof Petig
3a6d94bd3c register_tar with the cache object 2023-10-17 21:07:23 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Justin Shipsey
0d5017932d Merge branch 'zesterer/backpack-fixes' into 'master'
Added wielding for wallrunning

See merge request veloren/veloren!4133
2023-10-16 20:00:06 +00:00
Joshua Barretto
2842d6fef8 Merge branch 'crabman/airship-fix2' into 'master'
Airship fix attempt #5

See merge request veloren/veloren!4142
2023-10-16 17:52:57 +00:00
Maxicarlos08
0da10c1dfc
Run terrain persistence before /reload_chunks 2023-10-16 18:39:41 +02:00
Maxicarlos08
3605e49a00
changelog entry 2023-10-16 16:54:53 +02:00