Christof Petig
0937761f21
handle numerical rounding problem more gracefully
2021-03-27 23:46:35 +01:00
Marcel
79cc3af058
Merge branch 'swilliams/character-randomization-fix' into 'master'
...
Character Creation Randomization Fix
See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
9ca0388561
Character Creation Randomization Fix
2021-03-27 15:58:34 +00:00
Samuel Keiffer
7879466f32
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
973a2af753
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
4b62a99ed9
Improve econsim's handling of diamond prices by lowering the implied homicide rate.
2021-03-27 10:50:16 -04:00
Louis Pearson
ad0396d9f4
Use made_valid instead of min/max
2021-03-27 08:17:26 -06:00
Louis Pearson
165065725e
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
21f794f84c
Use Depot instead of Store for BuildArea
2021-03-27 07:54:02 -06:00
Louis Pearson
f08c4e6585
Add commands to manage build areas
2021-03-27 07:54:02 -06:00
Louis Pearson
77d48657c6
Store build areas outside of CanBuild component
2021-03-27 07:54:02 -06:00
Louis Pearson
120a0cd9a7
Limit build mode to bounding box
2021-03-27 07:54:02 -06:00
Louis Pearson
eade0540b2
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
da5c73c84b
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
0e71af92f1
cleanup login provider
2021-03-27 13:29:17 +01:00
Marcel
6eb25cffbb
Merge branch 'sam/rework-boost' into 'master'
...
Better Boost
See merge request veloren/veloren!2002
2021-03-27 12:28:51 +00:00
Marcel
59c8d0e002
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
6c13cf930e
docs(nix): update nix commands to match latest nix changes
2021-03-27 12:41:35 +03:00
Sam
6c2de7d70e
Fixed boost having ridiculous velocity.
2021-03-26 16:11:25 -04:00
Samuel Keiffer
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
Scott Williams
aa9180b20f
Moved rugged armour to cloth_item
2021-03-26 16:51:43 +00:00
Scott Williams
d35475eaef
Added leather scraps recipe
2021-03-26 16:44:38 +00:00
Marcel
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
Louis Pearson
2b0c71bfca
Remove internal feature from CHANGELOG.md
2021-03-26 06:29:23 -06:00
Marcel
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
aljazerzen
0c8448517e
move already-logged-in check to register
2021-03-26 11:41:03 +01:00
Marcel Märtens
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
Marcel Märtens
034d0f0c5d
fix a bug that some closes could get lost
2021-03-26 08:57:56 +01:00
Marcel Märtens
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
Marcel Märtens
01c82b70ab
network scheduler and rawmsg cleanup
2021-03-26 08:57:42 +01:00
Marcel
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
Marcel
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
Marcel Märtens
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
Joshua Barretto
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
Louis Pearson
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
aljazerzen
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Avi Weinstock
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
Justin Shipsey
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
Lippy13
ff2583b3b9
Add missing seashells to the sprite manifest
2021-03-25 04:37:27 +00:00
Snowram
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
Snowram
0e259294d4
Allow Escape key to cancel trades
2021-03-25 01:42:14 +01:00
Marcel
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
Joshua Barretto
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
Christof Petig
71b91d589b
fix the test
2021-03-24 22:37:01 +01:00
Joshua Barretto
5abdd0be8d
Merge branch 'synis/primitives' into 'master'
...
Primitives
See merge request veloren/veloren!1937
2021-03-24 21:06:33 +00:00
Samuel Keiffer
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
Christof Petig
a897a5aa68
remove the remaining unwraps
2021-03-24 21:59:47 +01:00
Christof Petig
43dec7c103
replace another group of unwraps
2021-03-24 21:43:30 +01:00
Avi Weinstock
650d1709d0
Address MR 1987 review comments.
2021-03-24 16:09:12 -04:00
Avi Weinstock
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
