1396 Commits

Author SHA1 Message Date
Avi Weinstock
19ac0b2245 Allow fast stacking into and out of a trade with {ctrl,shift} click.
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel
b6481e759d Merge branch 'james/fix-merchant-wander' into 'master'
Fix merchant wandering

See merge request veloren/veloren!2035
2021-03-30 10:52:42 +00:00
Marcel
5e9bd564da Merge branch 'xMAC94x/terrainoptimisation' into 'master'
if more than 1 player is in the area of a newly created chunk, skip additional copies

See merge request veloren/veloren!2030
2021-03-30 08:27:13 +00:00
James Melkonian
c91a2e0d28 Fixed merchant wandering 2021-03-29 17:27:56 -07:00
Samuel Keiffer
c978386d40 Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
2021-03-29 21:05:49 +00:00
Vincent Foulon
c4eca42fd8 Implement a basic dialogue system 2021-03-29 14:47:42 +00:00
Sam
d17edfcd64 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Marcel Märtens
06951048eb if more than 1 player is in the area of a newly created chunk, skip additional copies 2021-03-29 12:21:07 +02:00
Snowram
a1067a2ddb Merge branch 'snowram/new-scepters-starves' into 'master'
Add new batch of starves and scepter (by Gemu)

See merge request veloren/veloren!2022
2021-03-29 00:08:19 +00:00
Snowram
4b95401f7c Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Marcel Märtens
063d57b60c make msg::terrain parallel via rayon, we parallelize over the number of clients, so this is a change servers with more than 1 player profit from. 2021-03-28 21:08:40 +02:00
Treeco
bf155b1407 Move common code out into function 2021-03-28 18:22:47 +01:00
Treeco
2922b00c11 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Treeco
d47739c0c9 Added command to teleport to sites by name 2021-03-28 17:02:17 +01:00
Treeco
6d9a7e8fb3 Added spawn_town server setting 2021-03-28 17:02:17 +01:00
Joshua Barretto
fa1fee430b Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Treeco
e88f66f92e Temporarily disable humanoid rtsim entities until their pathfinding is fixed 2021-03-28 14:49:40 +01:00
Sam
8c91749cf8 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
Sam
20989428d3 Balance tweaks 2021-03-27 21:05:15 -04:00
Sam
c315278673 Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00
Sam
7e7a6001dc Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
02de4631c1 Improved mindflayer AI. Tweake some abilities. 2021-03-27 21:05:07 -04:00
Sam
17eab079ee Gave mindflayer AI.
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
5ebd2cf1d0 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Sam
90e33cafb5 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Marcel Märtens
f3fd72de23 fix some tracy only and no default features 2021-03-27 18:24:10 +01:00
Marcel Märtens
f42f6da6d8 track state tick in a historgram too 2021-03-27 18:24:10 +01: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
aljazerzen
96449f18d6 move already-logged-in check to register 2021-03-26 11:41:03 +01:00
Marcel Märtens
7f17d6cfd1 network scheduler and rawmsg cleanup 2021-03-26 08:57:42 +01: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
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
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
Avi Weinstock
35e729d919 In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly. 2021-03-23 23:00:05 -04:00
Avi Weinstock
8f42c5a34b Fix expect-panic on failed UID lookups in inventory_manip. 2021-03-23 19:04:21 -04:00
Avi Weinstock
657f6d6185 Remove level from create_ship and CreateShip. 2021-03-23 10:44:42 +01:00
Avi Weinstock
e389c3597f Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships. 2021-03-23 10:44:37 +01:00
Avi Weinstock
503f9c087b Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky). 2021-03-23 10:44:32 +01:00
Avi Weinstock
57cbf8ce90 Enable RtSim airships. 2021-03-23 10:44:22 +01:00
Marcel
68e50132d0 Merge branch 'aweinstock/fix-agenttrade-acceptspam' into 'master'
Make merchants not virtually spamclick accept.

See merge request veloren/veloren!1976
2021-03-23 09:39:40 +00:00