Joshua Barretto
1e9eb3089e
Worldgen colour tweaks, better buildings, better warping
2019-09-26 00:15:07 +01:00
Joshua Barretto
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
Shane Handley
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
Shane Handley
8cf6546dec
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
d33671f9c1
Merge branch 'xacrimon/sgrbf' into 'master'
...
Faster sgrb saturation
See merge request veloren/veloren!508
2019-09-24 10:27:46 +00:00
Acrimon
9ce9251a17
Formatted code.
2019-09-24 11:56:19 +02:00
Acrimon
3db0b2946d
Added some tests.
2019-09-24 11:36:35 +02:00
Acrimon
7e768b84e4
Fast powf for sgrb.
2019-09-24 11:05:01 +02:00
Joshua Barretto
1936224901
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
8a2dc836d8
Fixed cut-off cliff, optimised structure generation
2019-09-23 16:20:28 +01:00
Joshua Barretto
e77f165da6
Improved SmallCache
2019-09-23 15:17:06 +01:00
Imbris
f182733074
Small cache experiments
2019-09-22 22:19:07 -04:00
Imbris
debcb11e18
Simplify lerping and use smoothstep interpolation instead of cosine
2019-09-21 19:46:27 -04:00
Imbris
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
Imbris
cceb21240b
Fix feature names
2019-09-21 13:41:02 -04:00
Imbris
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
Acrimon
7647e54858
Drastically faster diffuse
2019-09-21 17:40:27 +00:00
Monty Marz
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
Monty Marz
11244bc182
Delete char window visuals, small scrolling fix for char creation background
2019-09-20 12:59:23 +00:00
Marcel
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
Joshua Barretto
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
Imbris
dd8500071e
Stop cpu spinning in metrics server
2019-09-20 00:41:44 -04:00
Joshua Barretto
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
Monty Marz
3a0131306f
Character assets Part 1
2019-09-18 16:46:12 +00:00
Acrimon
7463db0dd9
Formatted code.
2019-09-17 20:35:53 +02:00
Acrimon
2786e28577
Fixed rng stuff.
2019-09-17 16:56:23 +02:00
Acrimon
5487c8b7bc
Update lockfile.
2019-09-17 16:12:26 +02:00
Acrimon
85e6e54dc2
Fixed compile errors.
2019-09-17 16:12:17 +02:00
Acrimon
37d71cee26
Added some reasoning.
2019-09-17 16:07:24 +02:00
Acrimon
1dfbe40731
Made the worldgen noise generators seed from the RNG and got rid of zerocopy.
2019-09-17 16:05:08 +02:00
Joshua Barretto
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
Joshua Yanovski
9ba64ca57f
Addressing code review.
2019-09-16 15:11:47 +02:00
Imbris
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
Joshua Yanovski
20f57cf7f3
Continue instead of breaking.
2019-09-16 04:18:40 +02:00
Joshua Yanovski
2abf7cd016
Fixing more rustfmt errors.
2019-09-16 04:05:36 +02:00
Joshua Yanovski
95b02912b6
Fixing rustfmt.
2019-09-16 04:01:05 +02:00
Joshua Yanovski
b9f545f97c
Fixing previous commit.
2019-09-16 03:54:32 +02:00
Joshua Yanovski
9a4e5e06f2
Fixing previous commit.
2019-09-16 03:51:08 +02:00
Joshua Yanovski
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
Imbris
2ad816449c
Make some voxygen dependencies optional
2019-09-15 17:03:33 -04:00
Imbris
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
Imbris
28250c9f14
Fix always returning the default settings
2019-09-12 23:37:28 -04:00
Arash Outadi
b986603215
Run cargo fmt
2019-09-12 22:47:51 -04:00
Arash Outadi
57eb3b2de4
Add code path for invalid settings file
2019-09-12 22:47:50 -04:00
Forest Anderson
c423cabbc6
Merge branch 'angelonfira/fix-readme-arch-formatting' into 'master'
...
Fixed AUR formatting
See merge request veloren/veloren!496
2019-09-11 21:14:22 +00:00
Forest Anderson
3f2c783638
Fixed AUR formatting
2019-09-11 17:08:52 -04:00
Forest Anderson
70988f0832
Merge branch 'tim74/veloren-packaging-status' into 'master'
...
Add Fedora installation info
See merge request veloren/veloren!493
2019-09-11 19:29:54 +00:00
Forest Anderson
93bfde51c3
Added Mckol's arch info
2019-09-11 14:59:51 -04:00
Artem
1f35efab0f
Add Fedora installation info
2019-09-11 14:59:51 -04:00
Imbris
e4c3a07b6a
Merge branch 'haslersn/bugfix/default-pos-iterator' into 'master'
...
Bugfix: DefaultPosIterator now starts at lower_bound
See merge request veloren/veloren!492
2019-09-11 02:47:02 +00:00
