2227 Commits

Author SHA1 Message Date
Joshua Barretto
89bd405f5e Faster meshing, better AO, colour correction 2019-09-26 00:15:07 +01:00
Joshua Barretto
bd79fdc90d Prevented extreme blending 2019-09-26 00:15:07 +01:00
Joshua Barretto
c76ffa9c4c Added colour smoothing 2019-09-26 00:15:07 +01:00
Joshua Barretto
d8d00d1c56 Fixed floodfill algorithm 2019-09-26 00:15:07 +01:00
Imbris
5ea55b9636 Disable AO 2019-09-26 00:15:07 +01:00
Joshua Barretto
f536a5f13c Floodfill shadows, smooth shadow lighting 2019-09-26 00:15:07 +01:00
Joshua Barretto
82708799a3 Better colour correction 2019-09-26 00:15:07 +01:00
Joshua Barretto
61903f80e1 Prevented bounds mis-prediction 2019-09-26 00:15:07 +01:00
Joshua Barretto
38e59c41ad Prevented towns in oceans 2019-09-26 00:15:07 +01:00
Joshua Barretto
e543531a94 Applied water layer after structures layer 2019-09-26 00:15:07 +01:00
Joshua Barretto
6cbc45ebd3 Better warp noise 2019-09-26 00:15:07 +01:00
Joshua Barretto
648b716921 Added wells 2019-09-26 00:15:07 +01:00
Joshua Barretto
39ef2572a5 Worldgen colour tweaks, better buildings, better warping 2019-09-26 00:15:07 +01:00
Joshua Barretto
75ba16fdae 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
Shane Handley
77123e4d0e 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
Shane Handley
f07510ada7 Add an additional SFX Volume control to the in-game settings dialog and supporting events. 2019-09-25 01:18:09 +09:00
Joshua Barretto
16ad78f46f Merge branch 'xacrimon/sgrbf' into 'master'
Faster sgrb saturation

See merge request veloren/veloren!508
2019-09-24 10:27:46 +00:00
Acrimon
0ee4e1505b Formatted code. 2019-09-24 11:56:19 +02:00
Acrimon
698e70366d Added some tests. 2019-09-24 11:36:35 +02:00
Acrimon
d12e7a6337 Fast powf for sgrb. 2019-09-24 11:05:01 +02:00
Joshua Barretto
fc89bac8df Merge branch 'imbris/worldgen-speedup' into 'master'
Worldgen Speedup

See merge request veloren/veloren!507
2019-09-23 15:29:20 +00:00
Joshua Barretto
800d9b5eea Fixed cut-off cliff, optimised structure generation 2019-09-23 16:20:28 +01:00
Joshua Barretto
04911cba05 Improved SmallCache 2019-09-23 15:17:06 +01:00
Imbris
1e7d4468c5 Small cache experiments 2019-09-22 22:19:07 -04:00
Imbris
2d325c36a3 Simplify lerping and use smoothstep interpolation instead of cosine 2019-09-21 19:46:27 -04:00
Imbris
e7888adbab 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
Imbris
eb13195909 Fix feature names 2019-09-21 13:41:02 -04:00
Imbris
b427d4315e Merge branch 'xacrimon/diffuse-speed' into 'master'
Drastically faster diffuse

See merge request veloren/veloren!504
2019-09-21 17:40:28 +00:00
Acrimon
0dba741373 Drastically faster diffuse 2019-09-21 17:40:27 +00:00
Monty Marz
e099cbae69 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
Monty Marz
de70d04e06 Delete char window visuals, small scrolling fix for char creation background 2019-09-20 12:59:23 +00:00
Marcel
486b40bac5 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
Joshua Barretto
e2365b4c32 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
Imbris
7431d1f4e5 Stop cpu spinning in metrics server 2019-09-20 00:41:44 -04:00
Joshua Barretto
c4cbe26438 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
Monty Marz
1cab8f638a Character assets Part 1 2019-09-18 16:46:12 +00:00
Acrimon
5e5a0ecfbc Formatted code. 2019-09-17 20:35:53 +02:00
Acrimon
b4191ca407 Fixed rng stuff. 2019-09-17 16:56:23 +02:00
Acrimon
f426a12631 Update lockfile. 2019-09-17 16:12:26 +02:00
Acrimon
da6bb2dc9c Fixed compile errors. 2019-09-17 16:12:17 +02:00
Acrimon
6bed77456f Added some reasoning. 2019-09-17 16:07:24 +02:00
Acrimon
46bf09662b Made the worldgen noise generators seed from the RNG and got rid of zerocopy. 2019-09-17 16:05:08 +02:00
Joshua Barretto
4b8d9e08b9 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
Joshua Yanovski
743e48110f Addressing code review. 2019-09-16 15:11:47 +02:00
Imbris
0ceb49d4fc 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
Joshua Yanovski
4fb851263c Continue instead of breaking. 2019-09-16 04:18:40 +02:00
Joshua Yanovski
c4eae2e1b1 Fixing more rustfmt errors. 2019-09-16 04:05:36 +02:00
Joshua Yanovski
661b9aee72 Fixing rustfmt. 2019-09-16 04:01:05 +02:00
Joshua Yanovski
00b3f4e4f4 Fixing previous commit. 2019-09-16 03:54:32 +02:00
Joshua Yanovski
d5c441767f Fixing previous commit. 2019-09-16 03:51:08 +02:00