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
haslersn
51718c32a6
Bugfix: DefaultPosIterator now starts at lower_bound
...
Previosly the first iteration was skipped.
2019-09-11 01:48:28 +02:00
Marcel
a5962da2b2
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
02fe9adfb7
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
bb93585499
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
3f2e22f039
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
980bbbb711
Merge branch 'prometheus' into 'master'
...
Prometheus
See merge request veloren/veloren!486
2019-09-09 09:04:03 +00:00
Marcel Märtens
58b0b49dfe
adjust metrics to rebased Chunks
2019-09-09 10:47:40 +02:00
Marcel Märtens
49b08b55c7
switch from hyper http to rouille for http server
2019-09-09 10:07:25 +02:00
Marcel Märtens
b05e51152f
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
8d3fb40419
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
933e48ac3b
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
242ac332e3
Merge branch 'telastrus/vol-fix' into 'master'
...
Footstep volume fix
See merge request veloren/veloren!489
2019-09-08 15:47:52 +00:00
Geno
247f0818c1
Footstep volume fix
2019-09-08 15:47:52 +00:00
Forest Anderson
8b654df81e
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
Forest
000efebfd1
Updated cargo lock
2019-09-08 11:28:56 -04:00
Forest
c31b01b051
Bumped version
2019-09-08 11:15:46 -04:00
Joshua Barretto
26a027745e
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
scott-c
2b3749d2f4
Fix performance regression; simplify FigureKey
2019-09-08 19:52:57 +08:00
Forest Anderson
9ea06c08cf
Merge branch 'angelonfira/parallelize-ci-better' into 'master'
...
Changed stages
See merge request veloren/veloren!488
2019-09-07 16:35:10 +00:00
Forest Anderson
2c3c758cbf
Changed stages
2019-09-07 16:35:10 +00:00
Andrew Pritchard
2e63152d90
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
Timo Koesters
92c0edcb98
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
timokoesters
f3593371ea
Make npcs attack in a smarter way
2019-09-07 12:16:55 +02:00
timokoesters
9f83130466
Fix audio
2019-09-07 11:46:21 +02:00
Joshua Barretto
a9f06b1c65
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
Forest Anderson
d41d020e06
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
Forest Anderson
c81363e02b
Revert "Merge branch 'angelonfira/bump-toolchain-sept' into 'master'"
...
This reverts merge request !481
2019-09-06 20:17:57 +00:00
Forest Anderson
d71f2ebf9c
Merge branch 'angelonfira/bump-toolchain-sept' into 'master'
...
Bump toolchain
See merge request veloren/veloren!481
2019-09-06 19:05:51 +00:00
