b4840ce48d
Merge branch 'swilliams/craft-leather-scraps' into 'master'
...
Added leather scraps recipe
See merge request veloren/veloren!2000
2021-03-26 17:54:43 +00:00
aa9180b20f
Moved rugged armour to cloth_item
2021-03-26 16:51:43 +00:00
d35475eaef
Added leather scraps recipe
2021-03-26 16:44:38 +00:00
73d0d2acb0
Merge branch 'desttinghim-master-patch-55426' into 'master'
...
Remove internal feature from CHANGELOG.md
See merge request veloren/veloren!1999
2021-03-26 12:33:15 +00:00
2b0c71bfca
Remove internal feature from CHANGELOG.md
2021-03-26 06:29:23 -06:00
69b38f872a
Merge branch 'xMAC94x/net-improve' into 'master'
...
network preparation for UDP, Metrics and Bandwidth stats
See merge request veloren/veloren!1994
2021-03-26 12:26:18 +00:00
0c8448517e
move already-logged-in check to register
2021-03-26 11:41:03 +01:00
aea52d8b54
implement Upload Bandwidth prediction.
...
Its available to `api` and `metrics` and can be used to slow down msg send in veloren.
It uses a tokio::watch for now, as i plan to have a watch job in the scheduler that recalculates prio on change.
Also cleaning up participant metrics after a disconnect
2021-03-26 08:58:03 +01:00
034d0f0c5d
fix a bug that some closes could get lost
2021-03-26 08:57:56 +01:00
8dccc21125
preparation for multiple-channel participants.
...
When a stream is opened we are searching for the best (currently) available channel.
The stream will then be keept on that channel.
Adjusted the rest of the algorithms that they now respect this rule.
improved a HashMap for Pids to be based on a Vec. Also using this for Sid -> Cid relation which is more performance critical
WARN: our current send()? error handling allows it for some close_stream messages to get lost.
2021-03-26 08:57:50 +01:00
01c82b70ab
network scheduler and rawmsg cleanup
2021-03-26 08:57:42 +01:00
843850a4b8
Merge branch 'aweinstock/tradepricing' into 'master'
...
Get SitePricing information to clients, and use it to display coin-denominated...
See merge request veloren/veloren!1991
2021-03-26 00:17:39 +00:00
64e4aabd9f
Merge branch 'xMAC94x/server_cli_interactive' into 'master'
...
make server-cli interactive by default. stop interactive mode with ^D
See merge request veloren/veloren!1996
2021-03-25 23:42:22 +00:00
edebe06a10
make interactive OPT-OUT isntead so that it's not forgotten when its important. and its more userfriendly for the average user. scripts prob just add a -n or -b
2021-03-26 00:22:46 +01:00
6a49c1e767
Merge branch 'desttinghim/gen-store' into 'master'
...
Use older version of Store and introduce Depot
See merge request veloren/veloren!1993
2021-03-25 15:33:31 +00:00
0a294bcf56
Use older version of Store and introduce Depot
...
Removal of items in Store can cause get to fail. It has been reverted to
an older version that did not support removal. The newer version is now
called Depot and changed so that None is returned if the item does
not exist instead of crashing.
2021-03-25 07:41:53 -06:00
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
8d90548331
Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.
2021-03-25 02:11:58 -04:00
2bfbdf74e3
Merge branch 'Quibble/seashells-quickfix' into 'master'
...
Add missing seashells to the sprite manifest
Closes #1019
See merge request veloren/veloren!1990
2021-03-25 05:29:55 +00:00
ff2583b3b9
Add missing seashells to the sprite manifest
2021-03-25 04:37:27 +00:00
027aca09c3
Merge branch 'snowram/escape-trades' into 'master'
...
Allow Escape key to cancel trades
See merge request veloren/veloren!1989
2021-03-25 01:39:43 +00:00
0e259294d4
Allow Escape key to cancel trades
2021-03-25 01:42:14 +01:00
28952f6d7b
Merge branch 'aweinstock/agent-retargetting' into 'master'
...
In `agent::Sys`, perform target selection periodically to avoid agents going...
See merge request veloren/veloren!1985
2021-03-24 22:22:04 +00:00
5b234a3d08
Merge branch 'christof/de_unwrap2' into 'master'
...
Replace unwrap in the economy code
See merge request veloren/veloren!1988
2021-03-24 22:22:02 +00:00
71b91d589b
fix the test
2021-03-24 22:37:01 +01:00
5abdd0be8d
Merge branch 'synis/primitives' into 'master'
...
Primitives
See merge request veloren/veloren!1937
2021-03-24 21:06:33 +00:00
34e51ae00b
Merge branch 'aweinstock/airshipmovement-20210324' into 'master'
...
Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs.
See merge request veloren/veloren!1987
2021-03-24 21:06:30 +00:00
a897a5aa68
remove the remaining unwraps
2021-03-24 21:59:47 +01:00
43dec7c103
replace another group of unwraps
2021-03-24 21:43:30 +01:00
650d1709d0
Address MR 1987 review comments.
2021-03-24 16:09:12 -04:00
c4a6875133
Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs.
2021-03-24 15:42:37 -04:00
3773b23836
remove I/O unwraps (code inactive by default)
2021-03-24 20:31:17 +01:00
d7aea52a8f
Rotation uses matrix and some fixes for plane primitive
2021-03-24 18:21:01 +01:00
35ef2082e2
Rotation primitive and some minor fixes
2021-03-24 18:21:01 +01:00
187d7d4fe7
Added a bunch of primitives
2021-03-24 18:21:01 +01:00
97912d2d0f
Merge branch 'christof/de_unwrap1' into 'master'
...
replace an unwrap by returning an Option
See merge request veloren/veloren!1983
2021-03-24 08:18:53 +00:00
aa6a75808f
adapt unit test
2021-03-24 07:37:46 +01:00
acba98366a
loop over slots_mut instead of using an index
2021-03-24 07:37:46 +01:00
a83a74d216
replace an unwrap by returning an Option
2021-03-24 07:37:45 +01:00
ebc8e945d4
In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly.
2021-03-23 23:00:05 -04:00
6021a746b0
Merge branch 'aweinstock/wallstairs' into 'master'
...
Add an additional kind of stairs to dungeons.
See merge request veloren/veloren!1982
2021-03-24 00:58:03 +00:00
cffb7ea677
Merge branch 'aweinstock/cameraclamp' into 'master'
...
Add a vertical camera clamp option and toggle to voxygen.
See merge request veloren/veloren!1962
2021-03-24 00:58:01 +00:00
074092025a
Merge branch 'aweinstock/fix-inventorymanip-expects' into 'master'
...
Fix expect-panic on failed UID lookups in `inventory_manip`.
See merge request veloren/veloren!1984
2021-03-23 23:34:55 +00:00
19ea0c3f21
Fix expect-panic on failed UID lookups in inventory_manip.
2021-03-23 19:04:21 -04:00
6b343c2af9
Address MR 1962 review comments.
2021-03-23 18:41:13 -04:00
4ec6b43693
Add a vertical camera clamp option and toggle to voxygen.
2021-03-23 18:22:32 -04:00
cfb55b4881
Add an additional kind of stairs to dungeons.
2021-03-23 18:17:00 -04:00
6b826ff7d3
Merge branch 'yusdacra/feat/switch-to-naersk' into 'master'
...
build(nix): switch to naersk
See merge request veloren/veloren!1674
2021-03-23 19:31:45 +00:00
8ed7da7c49
Merge branch 'master' into 'master'
...
Update short_1.ron to make eligible for cloth scrap recipe
See merge request veloren/veloren!1981
2021-03-23 19:29:56 +00:00
818aaed32a
Update short_1.ron to make eligible for cloth scrap recipe
2021-03-23 18:16:30 +00:00
