Commit Graph

14569 Commits

Author SHA1 Message Date
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Christof Petig
d690f25615 Merge branch 'christof/no_plugin_hotfix' into 'master'
fix compilation of voxygen without plugins

See merge request veloren/veloren!4156
2023-10-24 21:59:25 +00:00
Dominik Broński
8ff825e8d9 Merge branch 'crabman/remove-halloween-dullahans' into 'master'
Remove halloween dullahans

See merge request veloren/veloren!4157
2023-10-24 17:12:19 +00:00
Maxicarlos08
5f547d62d3
Remove halloween dullahans 2023-10-24 18:34:02 +02:00
Isse
1562de246c Merge branch 'isse/fix-lod-reflections' into 'master'
Fix LoD reflections for nvidea + vulkan

See merge request veloren/veloren!4155
2023-10-23 19:48:30 +00:00
Isse
f98e4331a1 Fix LoD reflections for nvidea + vulkan 2023-10-23 19:48:30 +00:00
Christof Petig
fc81d6ecd5 fix compilation of voxygen without plugins 2023-10-23 21:47:26 +02:00
Joshua Barretto
dfd63bf23b Merge branch 'zesterer/tethering' into 'master'
Allow entities to be tethered to one-another

See merge request veloren/veloren!3953
2023-10-21 14:35:15 +00:00
Joshua Barretto
22b537a4e5 Fixed CI and incorrect vel 2023-10-21 14:58:13 +01:00
Joshua Barretto
4adfb95c9b Fixed tether dimension 2023-10-21 13:51:42 +01:00
Joshua Barretto
ac7f6872db Fixed typo 2023-10-21 13:51:42 +01:00
Joshua Barretto
3057d67a1c Factored out friction_factor code 2023-10-21 13:51:42 +01:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
879a28fbb6 Fixed warnings 2023-10-21 13:51:41 +01:00
Joshua Barretto
a5ec81a2ab Better tether pattern, account for mass 2023-10-21 13:51:41 +01:00
Joshua Barretto
deca7ae258 Finished adding tether graphics 2023-10-21 13:51:40 +01:00
Joshua Barretto
9a72d52c48 Began adding tether visuals 2023-10-21 13:49:04 +01:00
Joshua Barretto
1ac1c900c9 Improved commands, fixed tether orientation 2023-10-21 13:49:04 +01:00
Joshua Barretto
2d4278e94a Made carriage lighter 2023-10-21 13:49:04 +01:00
Joshua Barretto
a2253b7a33 Fix crash 2023-10-21 13:49:04 +01:00
Joshua Barretto
a01739af20 Better tethering physics 2023-10-21 13:49:04 +01:00
Joshua Barretto
5a41d7e33e Added cart, notion of rolling resistance (hacky) 2023-10-21 13:49:04 +01:00
Joshua Barretto
9aa757cd09 Added basic tethering 2023-10-21 13:49:04 +01:00
Justin Shipsey
c422616f70 Merge branch 'slipped/lavanoise' into 'master'
lava noise

See merge request veloren/veloren!4147
2023-10-20 18:11:24 +00:00
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