Commit Graph

11651 Commits

Author SHA1 Message Date
Marcel Märtens
8e47d02f8d add metrics and trigger slowjobs in chunks of 25 2022-05-11 20:22:23 +02:00
Marcel Märtens
9b53693783 switch to a system where chunk_serialize will start a SlowJow that is then consumed by chunk_send 2022-05-11 20:22:21 +02:00
Marcel Märtens
6c756c2440 first implementation of defering serialisation 2022-05-11 20:22:19 +02:00
Marcel
07239c3056 Merge branch 'zesterer/lod-test-world-fix' into 'master'
Fixed LoD on test worlds

See merge request veloren/veloren!3371
2022-05-11 18:21:33 +00:00
Joshua Barretto
d530c29d98 Fixed LoD on test worlds 2022-05-11 19:06:41 +01:00
Joshua Barretto
e02f8aee65 Merge branch 'zesterer/lod-objects' into 'master'
LoD Objects (inc. Trees)

See merge request veloren/veloren!3367
2022-05-11 14:56:12 +00:00
Joshua Barretto
b42ee3fce2 Avoid expense when LoD voxels are disabled 2022-05-11 15:20:19 +01:00
Joshua Barretto
01e1cb34b0 Fixed minor LoD issues 2022-05-11 15:00:44 +01:00
Joshua Barretto
f21a64e898 Better oak model 2022-05-11 14:47:11 +01:00
Joshua Barretto
894e94bb2c Made 0 LoD distance not load anything 2022-05-11 13:07:57 +01:00
Joshua Barretto
9ac84c0a3a Improved LoD models 2022-05-11 12:20:42 +01:00
Joshua Barretto
2f7678582b Merge branch 'zesterer-master-patch-11561' into 'master'
Fixed bad entity spawns

See merge request veloren/veloren!3370
2022-05-10 23:48:33 +00:00
Joshua Barretto
515abc2b89 Fixed bad entity spawns 2022-05-10 23:25:22 +00:00
Joshua Barretto
5e1f16fb7a Better tree colours 2022-05-11 00:15:05 +01:00
Joshua Barretto
907ba3dcbc Added giant trees to LoD 2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e Added LoD houses 2022-05-10 19:19:46 +01:00
Joshua Barretto
7382aab13a Upped default LoD distance 2022-05-10 17:12:12 +01:00
Joshua Barretto
c7e51a6c59 Added frustum culling for LoD objects 2022-05-10 16:21:14 +01:00
Joshua Barretto
19d19df63c Flush LoD distance on login 2022-05-10 15:43:53 +01:00
Joshua Barretto
06300bc75f Updated changelog 2022-05-10 12:56:24 +01:00
Samuel Keiffer
1bd33bb997 Merge branch 'holychowders/streamline_stealth_coefficient' into 'master'
Distinguish armor and sneaking stealth; Show stealth as percentage in Stats UI.

Closes #1525

See merge request veloren/veloren!3352
2022-05-10 11:41:49 +00:00
Joshua Barretto
f35c98d1a1 Added LoD distance setting 2022-05-10 12:40:06 +01:00
Joshua Barretto
add9e5f9fe Better snow cover 2022-05-10 12:40:06 +01:00
Joshua Barretto
c199d17deb Better snow cover 2022-05-10 12:40:06 +01:00
Joshua Barretto
63c8ea58b9 Unbork normals 2022-05-10 12:40:06 +01:00
Joshua Barretto
2d7aa1aaa3 Added no terrain pop experimental shader 2022-05-10 12:40:06 +01:00
Joshua Barretto
596ae73117 Added NoLodVoxels option 2022-05-10 12:40:06 +01:00
Joshua Barretto
39e8b5d468 Hacky normals 2022-05-10 12:40:06 +01:00
Joshua Barretto
c3f30b2188 Offset for side/top texture 2022-05-10 12:40:06 +01:00
Joshua Barretto
3693a439ac Better reflections 2022-05-10 12:40:06 +01:00
Joshua Barretto
e4e50cb50e Better pulldown 2022-05-10 12:40:06 +01:00
Joshua Barretto
a9b2018383 Better snow cover 2022-05-10 12:40:06 +01:00
Joshua Barretto
79ce90a2e4 convert LoD assets to Git LFS 2022-05-10 12:39:50 +01:00
Joshua Barretto
2df01385d2 Voxelise trees 2022-05-10 12:38:37 +01:00
Joshua Barretto
3881d2ea38 Fixed i16 underflow 2022-05-10 12:38:36 +01:00
Joshua Barretto
1db7cc7fde LoD trees in snow are white 2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1 Different kinds of tree 2022-05-10 12:38:36 +01:00
Joshua Barretto
7cce892cff Varying normals 2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724 Use dedicated fragment shader 2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
Marcel
3a984d24a5 Merge branch 'imbris/opt-biome-floodfill' into 'master'
Optimize biome naming floodfill by replacing hashmaps

See merge request veloren/veloren!3366
2022-05-10 08:47:49 +00:00
IsseW
9a9302a0b6 Use a seperate rng for peak and biome name gen 2022-05-10 10:24:25 +02:00
Imbris
bed8ae68fe Optimize biome naming floodfill by replacing hashmaps 2022-05-10 03:30:09 -04:00
Isse
e33e6354a7 Merge branch 'isse/clamp-gen-bool' into 'master'
Clamp chances for gen bool in agent.rs

See merge request veloren/veloren!3365
2022-05-10 07:17:14 +00:00
IsseW
022fa3d556 Clamp chances for gen bool in agent.rs 2022-05-10 08:44:26 +02:00
Isse
b930724b45 Merge branch 'isse/naming-features' into 'master'
naming behind feature and fix addition overflow

See merge request veloren/veloren!3364
2022-05-10 06:30:03 +00:00
IsseW
9abbb0e928 naming behind feature and fix addition overflow 2022-05-10 08:03:40 +02:00
holychowders
fc2095803d Use inline conditional to simplify assignment. 2022-05-09 22:23:08 -05:00
Marcel
4ce05099a6 Merge branch 'angel/change-outcomes-to-eventbus' into 'master'
Change outcomes to eventbus

See merge request veloren/veloren!3360
2022-05-09 19:58:13 +00:00
Forest Anderson
cea55143ce Change outcomes to eventbus 2022-05-09 19:58:13 +00:00