Commit Graph

2323 Commits

Author SHA1 Message Date
34221a0f1d Disable AO 2019-09-26 00:15:07 +01:00
d745acc948 Floodfill shadows, smooth shadow lighting 2019-09-26 00:15:07 +01:00
a432cef263 Better colour correction 2019-09-26 00:15:07 +01:00
22af0ab016 Prevented bounds mis-prediction 2019-09-26 00:15:07 +01:00
ba7fa8b55d Prevented towns in oceans 2019-09-26 00:15:07 +01:00
5933ae608a Applied water layer after structures layer 2019-09-26 00:15:07 +01:00
b6e72b0075 Better warp noise 2019-09-26 00:15:07 +01:00
a9d7cfac0b Added wells 2019-09-26 00:15:07 +01:00
1e9eb3089e Worldgen colour tweaks, better buildings, better warping 2019-09-26 00:15:07 +01:00
6717e5551b Merge branch 'shandley/veloren-seperate-sfx-vol-control' into 'master'
Seperate sfx vol control

Closes #252, #251, and #248

See merge request veloren/veloren!510
2019-09-25 08:19:55 +00:00
ef3ad3519b Update previous references to 'volume' to prevent ambiguity. Update label for audio device selection in settings dialog. I don't think it is displayed, but maybe useful for documentation. 2019-09-25 01:25:24 +09:00
8cf6546dec Add an additional SFX Volume control to the in-game settings dialog and supporting events. 2019-09-25 01:18:09 +09:00
d33671f9c1 Merge branch 'xacrimon/sgrbf' into 'master'
Faster sgrb saturation

See merge request veloren/veloren!508
2019-09-24 10:27:46 +00:00
9ce9251a17 Formatted code. 2019-09-24 11:56:19 +02:00
3db0b2946d Added some tests. 2019-09-24 11:36:35 +02:00
7e768b84e4 Fast powf for sgrb. 2019-09-24 11:05:01 +02:00
1936224901 Merge branch 'imbris/worldgen-speedup' into 'master'
Worldgen Speedup

See merge request veloren/veloren!507
2019-09-23 15:29:20 +00:00
8a2dc836d8 Fixed cut-off cliff, optimised structure generation 2019-09-23 16:20:28 +01:00
e77f165da6 Improved SmallCache 2019-09-23 15:17:06 +01:00
f182733074 Small cache experiments 2019-09-22 22:19:07 -04:00
debcb11e18 Simplify lerping and use smoothstep interpolation instead of cosine 2019-09-21 19:46:27 -04:00
f78ab5e86d Merge branch 'imbris/fix-optional-names' into 'master'
Fix optional feature names

See merge request veloren/veloren!505
2019-09-21 17:59:26 +00:00
cceb21240b Fix feature names 2019-09-21 13:41:02 -04:00
10e27b01e3 Merge branch 'xacrimon/diffuse-speed' into 'master'
Drastically faster diffuse

See merge request veloren/veloren!504
2019-09-21 17:40:28 +00:00
7647e54858 Drastically faster diffuse 2019-09-21 17:40:27 +00:00
abae438bbc Merge branch 'pfauenauge/delete-char-window' into 'master'
Delete char window visuals, small scrolling fix for char creation background

See merge request veloren/veloren!503
2019-09-20 12:59:24 +00:00
11244bc182 Delete char window visuals, small scrolling fix for char creation background 2019-09-20 12:59:23 +00:00
c1e5f58d55 Merge branch 'imbris/metrics-fix' into 'master'
Stop cpu spinning in metrics server

See merge request veloren/veloren!502
2019-09-20 08:28:43 +00:00
542ac41e7a Merge branch 'xacrimon/rng-init-noise' into 'master'
Update some deps, fix hashbrown not compiling and rework the ad-hoc PRNG for RandomField.

See merge request veloren/veloren!500
2019-09-20 06:13:48 +00:00
dd8500071e Stop cpu spinning in metrics server 2019-09-20 00:41:44 -04:00
169c08e226 Merge branch 'pfauenauge/character-assets' into 'master'
Character assets Part 1

See merge request veloren/veloren!501
2019-09-18 16:46:12 +00:00
3a0131306f Character assets Part 1 2019-09-18 16:46:12 +00:00
7463db0dd9 Formatted code. 2019-09-17 20:35:53 +02:00
2786e28577 Fixed rng stuff. 2019-09-17 16:56:23 +02:00
5487c8b7bc Update lockfile. 2019-09-17 16:12:26 +02:00
85e6e54dc2 Fixed compile errors. 2019-09-17 16:12:17 +02:00
37d71cee26 Added some reasoning. 2019-09-17 16:07:24 +02:00
1dfbe40731 Made the worldgen noise generators seed from the RNG and got rid of zerocopy. 2019-09-17 16:05:08 +02:00
7e6fbda34a Merge branch 'sharp/cancel-chunk-gen' into 'master'
Allow canceling chunk generation.

See merge request veloren/veloren!499
2019-09-16 19:15:47 +00:00
9ba64ca57f Addressing code review. 2019-09-16 15:11:47 +02:00
4153089973 Merge branch 'imbris/optional-deps' into 'master'
Make some voxygen dependencies optional

See merge request veloren/veloren!498
2019-09-16 03:57:57 +00:00
20f57cf7f3 Continue instead of breaking. 2019-09-16 04:18:40 +02:00
2abf7cd016 Fixing more rustfmt errors. 2019-09-16 04:05:36 +02:00
95b02912b6 Fixing rustfmt. 2019-09-16 04:01:05 +02:00
b9f545f97c Fixing previous commit. 2019-09-16 03:54:32 +02:00
9a4e5e06f2 Fixing previous commit. 2019-09-16 03:51:08 +02:00
b4ad76372b Allow canceling chunk generation.
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
2019-09-16 03:41:33 +02:00
2ad816449c Make some voxygen dependencies optional 2019-09-15 17:03:33 -04:00
c5dc2fe765 Merge branch 'arashout/213-settings-crash' into 'master'
Add code path for invalid settings file

See merge request veloren/veloren!428
2019-09-13 03:45:23 +00:00
28250c9f14 Fix always returning the default settings 2019-09-12 23:37:28 -04:00