Samuel Keiffer
29dea2c99e
Merge branch 'aweinstock/diamond-prices' into 'master'
...
Improve econsim's handling of diamond prices by lowering the implied homicide rate.
See merge request veloren/veloren!2005
2021-03-27 15:29:19 +00:00
Imbris
dac55e364c
Merge branch 'desttinghim/build-areas' into 'master'
...
Build Areas
See merge request veloren/veloren!1978
2021-03-27 15:26:35 +00:00
Avi Weinstock
6c5697915f
Improve econsim's handling of diamond prices by lowering the implied homicide rate.
2021-03-27 10:50:16 -04:00
Louis Pearson
f4a181bbc5
Use made_valid instead of min/max
2021-03-27 08:17:26 -06:00
Louis Pearson
340f0437fb
Add build_area_list command
...
* Reworks CanBuild to use HashSet
* Removes player argument from build permission, use sudo instead
2021-03-27 07:54:02 -06:00
Louis Pearson
f90fc97026
Use Depot instead of Store for BuildArea
2021-03-27 07:54:02 -06:00
Louis Pearson
bd96e9020a
Add commands to manage build areas
2021-03-27 07:54:02 -06:00
Louis Pearson
4d1b486e3f
Store build areas outside of CanBuild component
2021-03-27 07:54:02 -06:00
Louis Pearson
584a9c3aeb
Limit build mode to bounding box
2021-03-27 07:54:02 -06:00
Louis Pearson
dbb034da9b
Add permit_build command
...
This commit separates permission to build from building mode, allowing
build to become a NoAdmin command (since players will first need
permission from an Admin to enter build mode)
2021-03-27 07:54:02 -06:00
Marcel
757692edb6
Merge branch 'refactor-login' into 'master'
...
refactor handling of duplicate login #1015
Closes #1015
See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
aljazerzen
8263d47f19
cleanup login provider
2021-03-27 13:29:17 +01:00
Marcel
94b6b1929f
Merge branch 'sam/rework-boost' into 'master'
...
Better Boost
See merge request veloren/veloren!2002
2021-03-27 12:28:51 +00:00
Marcel
4bfee00db2
Merge branch 'yusdacra/docs/nix' into 'master'
...
docs(nix): update nix commands to match latest nix changes
See merge request veloren/veloren!2003
2021-03-27 12:00:51 +00:00
Yusuf Bera Ertan
a89ac2d898
docs(nix): update nix commands to match latest nix changes
2021-03-27 12:41:35 +03:00
Sam
7a3a5330dd
Fixed boost having ridiculous velocity.
2021-03-26 16:11:25 -04:00
Samuel Keiffer
b2e45d8dbf
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
Scott Williams
fd501b68df
Moved rugged armour to cloth_item
2021-03-26 16:51:43 +00:00
Scott Williams
d767c2f21d
Added leather scraps recipe
2021-03-26 16:44:38 +00:00
Marcel
d11afce9ae
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
Louis Pearson
46055f3df9
Remove internal feature from CHANGELOG.md
2021-03-26 06:29:23 -06:00
Marcel
cc82cb34fd
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
aljazerzen
96449f18d6
move already-logged-in check to register
2021-03-26 11:41:03 +01:00
Marcel Märtens
f3b6bb1dd1
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
Marcel Märtens
3ac7120f39
fix a bug that some closes could get lost
2021-03-26 08:57:56 +01:00
Marcel Märtens
8502311972
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
Marcel Märtens
7f17d6cfd1
network scheduler and rawmsg cleanup
2021-03-26 08:57:42 +01:00
Marcel
e532597674
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
Marcel
931c8301e6
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
Marcel Märtens
2198fece98
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
Joshua Barretto
3e14842c7c
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
Louis Pearson
6c756c336f
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
aljazerzen
06f860e2a0
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Avi Weinstock
6d30f17add
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
Justin Shipsey
2edeabae4a
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
Lippy13
41f3bcee97
Add missing seashells to the sprite manifest
2021-03-25 04:37:27 +00:00
Snowram
5034b0340c
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
Snowram
6e4c897d82
Allow Escape key to cancel trades
2021-03-25 01:42:14 +01:00
Marcel
f01114f47a
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
Joshua Barretto
3ba439994e
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
Christof Petig
11aaf90845
fix the test
2021-03-24 22:37:01 +01:00
Joshua Barretto
76d40981db
Merge branch 'synis/primitives' into 'master'
...
Primitives
See merge request veloren/veloren!1937
2021-03-24 21:06:33 +00:00
Samuel Keiffer
ef2affb458
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
Christof Petig
76fa685b9a
remove the remaining unwraps
2021-03-24 21:59:47 +01:00
Christof Petig
3049c6daf5
replace another group of unwraps
2021-03-24 21:43:30 +01:00
Avi Weinstock
7aaa22cc8b
Address MR 1987 review comments.
2021-03-24 16:09:12 -04:00
Avi Weinstock
67dedf409a
Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs.
2021-03-24 15:42:37 -04:00
Christof Petig
5bc6dca0d7
remove I/O unwraps (code inactive by default)
2021-03-24 20:31:17 +01:00
Synis
5b9b5c5101
Rotation uses matrix and some fixes for plane primitive
2021-03-24 18:21:01 +01:00
Synis
b91ee0476d
Rotation primitive and some minor fixes
2021-03-24 18:21:01 +01:00
