Commit Graph

2262 Commits

Author SHA1 Message Date
f07510ada7 Add an additional SFX Volume control to the in-game settings dialog and supporting events. 2019-09-25 01:18:09 +09:00
16ad78f46f Merge branch 'xacrimon/sgrbf' into 'master'
Faster sgrb saturation

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

See merge request veloren/veloren!507
2019-09-23 15:29:20 +00:00
800d9b5eea Fixed cut-off cliff, optimised structure generation 2019-09-23 16:20:28 +01:00
04911cba05 Improved SmallCache 2019-09-23 15:17:06 +01:00
1e7d4468c5 Small cache experiments 2019-09-22 22:19:07 -04:00
2d325c36a3 Simplify lerping and use smoothstep interpolation instead of cosine 2019-09-21 19:46:27 -04:00
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
eb13195909 Fix feature names 2019-09-21 13:41:02 -04:00
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
0dba741373 Drastically faster diffuse 2019-09-21 17:40:27 +00:00
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
de70d04e06 Delete char window visuals, small scrolling fix for char creation background 2019-09-20 12:59:23 +00:00
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
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
7431d1f4e5 Stop cpu spinning in metrics server 2019-09-20 00:41:44 -04:00
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
1cab8f638a Character assets Part 1 2019-09-18 16:46:12 +00:00
5e5a0ecfbc Formatted code. 2019-09-17 20:35:53 +02:00
b4191ca407 Fixed rng stuff. 2019-09-17 16:56:23 +02:00
f426a12631 Update lockfile. 2019-09-17 16:12:26 +02:00
da6bb2dc9c Fixed compile errors. 2019-09-17 16:12:17 +02:00
6bed77456f Added some reasoning. 2019-09-17 16:07:24 +02:00
46bf09662b Made the worldgen noise generators seed from the RNG and got rid of zerocopy. 2019-09-17 16:05:08 +02:00
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
743e48110f Addressing code review. 2019-09-16 15:11:47 +02:00
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
4fb851263c Continue instead of breaking. 2019-09-16 04:18:40 +02:00
c4eae2e1b1 Fixing more rustfmt errors. 2019-09-16 04:05:36 +02:00
661b9aee72 Fixing rustfmt. 2019-09-16 04:01:05 +02:00
00b3f4e4f4 Fixing previous commit. 2019-09-16 03:54:32 +02:00
d5c441767f Fixing previous commit. 2019-09-16 03:51:08 +02:00
f5c4000b1b 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
75859c89ef Make some voxygen dependencies optional 2019-09-15 17:03:33 -04:00
edc252592e 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
34577a7b86 Fix always returning the default settings 2019-09-12 23:37:28 -04:00
1451889365 Run cargo fmt 2019-09-12 22:47:51 -04:00
8ddac925a6 Add code path for invalid settings file 2019-09-12 22:47:50 -04:00
f3635dbfe0 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
71e22e8a12 Fixed AUR formatting 2019-09-11 17:08:52 -04:00
19b9890dc6 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
b4dbf05659 Added Mckol's arch info 2019-09-11 14:59:51 -04:00
b7805e3ab7 Add Fedora installation info 2019-09-11 14:59:51 -04:00
598409d9c9 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
c7a1bbc00f Bugfix: DefaultPosIterator now starts at lower_bound
Previosly the first iteration was skipped.
2019-09-11 01:48:28 +02:00
d3357646c5 Merge branch 'prometheus' into 'master'
Fix panic if starting singleplayer twice without closing the game

See merge request veloren/veloren!491
2019-09-10 13:33:42 +00:00
a2914c17f5 Fix panic if starting singleplayer twice without closing the game
reduce costs for metrics by checking chunks only every 100th tick
add metrics for "server start time" and ingame "time of day"
2019-09-10 15:22:34 +02:00