Commit Graph

2887 Commits

Author SHA1 Message Date
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
943336cc59 Merge branch 'zesterer/more-movement' into 'master'
More Movement

See merge request veloren/veloren!471
2019-09-09 19:11:40 +00:00
e6d8b4b8d8 Exponential interpolation for linear damping
With an additional approximation to allow for the same size jumps given different framerates.
2019-09-09 19:11:40 +00:00
f81a654bc1 Merge branch 'prometheus' into 'master'
Prometheus

See merge request veloren/veloren!486
2019-09-09 09:04:03 +00:00
b0ff977297 adjust metrics to rebased Chunks 2019-09-09 10:47:40 +02:00
bdea219d82 switch from hyper http to rouille for http server 2019-09-09 10:07:25 +02:00
ae51f9f9dd update version, revert from static prometheus back to normal because static doesnt supprot registries, and implement most of the metrics except for entity count 2019-09-09 09:54:30 +02:00
2b344e9d94 first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count 2019-09-09 09:48:44 +02:00
89b637e94e Merge branch 'fix-jump-height' into 'master'
Fix jump height

See merge request veloren/veloren!485
2019-09-08 15:50:08 +00:00
5986d4e76b Merge branch 'telastrus/vol-fix' into 'master'
Footstep volume fix

See merge request veloren/veloren!489
2019-09-08 15:47:52 +00:00
58ad2e4d82 Footstep volume fix 2019-09-08 15:47:52 +00:00
132020af23 Merge branch 'angelonfira/bump-gfx-device-gl-to-allow-new-nightly' into 'master'
Bumped version

See merge request veloren/veloren!490
2019-09-08 15:34:17 +00:00
ed88db8213 Updated cargo lock 2019-09-08 11:28:56 -04:00
a519727548 Bumped version 2019-09-08 11:15:46 -04:00
3eed74986a Merge branch 'scott-c/fix-performance-regression' into 'master'
Fix performance regression; simplify FigureKey

See merge request veloren/veloren!483
2019-09-08 12:01:45 +00:00
5edd544f69 Fix performance regression; simplify FigureKey 2019-09-08 19:52:57 +08:00
d867bce9c5 Merge branch 'angelonfira/parallelize-ci-better' into 'master'
Changed stages

See merge request veloren/veloren!488
2019-09-07 16:35:10 +00:00
95b16c32ab Changed stages 2019-09-07 16:35:10 +00:00
32a8ceab94 Merge branch 'fix-jump-height' into 'fix-jump-height'
Fix jump height

See merge request veloren/veloren!477
2019-09-07 12:48:49 +00:00
f241bc6b82 Merge branch 'timo-attack' into 'master'
Fix wolfs not attacking and adjust movement while attacking

See merge request veloren/veloren!484
2019-09-07 10:25:57 +00:00
e5e29b490b Make npcs attack in a smarter way 2019-09-07 12:16:55 +02:00
57111af0a7 Fix audio 2019-09-07 11:46:21 +02:00
5dbc0b830e Merge branch 'haslersn/block-groups' into 'master'
common: Rework `Chunk` and `Chonk` implementation

See merge request veloren/veloren!475
2019-09-07 09:14:54 +00:00
b68a663386 Merge branch 'revert-d71f2ebf' into 'master'
Revert "Merge branch 'angelonfira/bump-toolchain-sept' into 'master'"

See merge request veloren/veloren!482
2019-09-06 20:19:14 +00:00
b7c2d8bdec Revert "Merge branch 'angelonfira/bump-toolchain-sept' into 'master'"
This reverts merge request !481
2019-09-06 20:17:57 +00:00
0ddc12699c Merge branch 'angelonfira/bump-toolchain-sept' into 'master'
Bump toolchain

See merge request veloren/veloren!481
2019-09-06 19:05:51 +00:00