2369 Commits

Author SHA1 Message Date
Joshua Barretto
bb88d42295 Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites

See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
Joshua Barretto
5cc6061606 Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements

See merge request veloren/veloren!2032
2021-03-30 00:16:45 +00:00
Joshua Barretto
97e5c26838 Added indicator text to terrain sprites 2021-03-30 01:04:23 +01: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
Joshua Barretto
286f6823b9 Added patch for sticky hitboxes 2021-03-29 21:52:05 +01:00
Joshua Barretto
6ca8cd9bb2 Fixed training dummy hitbox 2021-03-29 21:52:05 +01:00
Joshua Barretto
6f72e53295 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
843f295eef Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
a5c125fdef Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
Snowram
6451caf15b Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Snowram
71fabb1637 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
Snowram
763cf70b70 New tooltip 2021-03-29 18:34:45 +02: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
Treeco
d47739c0c9 Added command to teleport to sites by name 2021-03-28 17:02:17 +01:00
Avi Weinstock
69665c0b0d Reclassify Glowing Remains as Armor for econsim. 2021-03-28 10:29:40 -04:00
Marcel
6ecd0b68f3 Merge branch 'christof/item_price_fix' into 'master'
Fix the price category of the newly added items

See merge request veloren/veloren!2010
2021-03-28 09:25:52 +00:00
Christof Petig
b94013943f Fix the price category of the newly added items 2021-03-28 09:25:51 +00: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
bda64409c5 Removed potential for divide by zero 2021-03-27 21:06:21 -04:00
Sam
d707fbbd83 Repalced stone golems with 10 husks in T5 dungeon miniboss rooms. 2021-03-27 21:06:18 -04:00
jshipsey
094fb4ee95 flayer anims 2021-03-27 21:05:16 -04:00
Sam
c40ad922de Particles for summoned minions 2021-03-27 21:05:15 -04:00
Sam
43290d1dc3 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Sam
75c0e3f4eb Added particles for lifesteal effect 2021-03-27 21:05:12 -04:00
Sam
4358908fda Mindflayer can now lifesteal off of its own minions 2021-03-27 21:05:11 -04:00
Sam
c1db5e230b Mindflayer summons husks instead of dogs now 2021-03-27 21:05:10 -04:00
Snowram
5b83b912f3 Adds husk npc 2021-03-27 21:05:09 -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
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
Sam
c2e66c949c Added necrotic vortex attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
3452857d5c Added cursed flame attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
5a9481549d Switched normalized function to try_normalized 2021-03-27 19:05:48 -04: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
Sam
7a3a5330dd Fixed boost having ridiculous velocity. 2021-03-26 16:11:25 -04:00
Scott Williams
d767c2f21d Added leather scraps recipe 2021-03-26 16:44:38 +00: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
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
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
Christof Petig
88a6dfbaee adapt unit test 2021-03-24 07:37:46 +01:00