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
Joshua Yanovski
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
Imbris
75859c89ef
Make some voxygen dependencies optional
2019-09-15 17:03:33 -04:00
Imbris
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
Imbris
34577a7b86
Fix always returning the default settings
2019-09-12 23:37:28 -04:00
Arash Outadi
1451889365
Run cargo fmt
2019-09-12 22:47:51 -04:00
Arash Outadi
8ddac925a6
Add code path for invalid settings file
2019-09-12 22:47:50 -04:00
Forest Anderson
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
Forest Anderson
71e22e8a12
Fixed AUR formatting
2019-09-11 17:08:52 -04:00
Forest Anderson
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
Forest Anderson
b4dbf05659
Added Mckol's arch info
2019-09-11 14:59:51 -04:00
Artem
b7805e3ab7
Add Fedora installation info
2019-09-11 14:59:51 -04:00
Imbris
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
haslersn
c7a1bbc00f
Bugfix: DefaultPosIterator now starts at lower_bound
...
Previosly the first iteration was skipped.
2019-09-11 01:48:28 +02:00
Marcel
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
Marcel Märtens
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
Joshua Barretto
943336cc59
Merge branch 'zesterer/more-movement' into 'master'
...
More Movement
See merge request veloren/veloren!471
2019-09-09 19:11:40 +00:00
Joshua Barretto
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
Marcel
f81a654bc1
Merge branch 'prometheus' into 'master'
...
Prometheus
See merge request veloren/veloren!486
2019-09-09 09:04:03 +00:00
Marcel Märtens
b0ff977297
adjust metrics to rebased Chunks
2019-09-09 10:47:40 +02:00
Marcel Märtens
bdea219d82
switch from hyper http to rouille for http server
2019-09-09 10:07:25 +02:00
Marcel Märtens
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
Marcel Märtens
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
Joshua Barretto
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
Joshua Barretto
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
