James Melkonian
8ee1fc4a0f
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
bacda06dba
Added map layers
2021-04-06 08:42:07 -07:00
James Melkonian
70ede7f34d
Topographic map
2021-04-06 08:42:06 -07:00
Avi Weinstock
2c4612bff1
Fix loadout_builder panic.
2021-04-06 10:34:13 -04:00
Marcel
f0cabf1add
Merge branch 'aweinstock/stackable-merchants' into 'master'
...
Make merchants spawn with stacks of stackable items.
See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
Samuel Keiffer
3c50321a80
Merge branch 'sam/consolidate-roll' into 'master'
...
Flattened roll progression.
See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Sam
ba0b6c309b
Flattened roll progression.
2021-04-05 17:50:53 -04:00
Sam
a7e39bc8c9
Nerfs
2021-04-05 17:38:52 -04:00
Avi Weinstock
56137aff92
Address MR 2062 comments: avoid an expect-equivalent pattern.
2021-04-05 11:29:10 -04:00
Louis Pearson
91a647e35f
Return none from depot get if stale id used
2021-04-05 06:16:23 -06:00
Marcel
69891f0b70
Merge branch 'login-trim-username' into 'master'
...
login trim username, improve validation, social ordering #1040
Closes #1040
See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Marcel
958c75642c
Merge branch 'christof/stats_per_price' into 'master'
...
output stats per value for all categories in the trade pricing test
See merge request veloren/veloren!2057
2021-04-04 18:35:39 +00:00
Avi Weinstock
a1cfd9ea3c
Make merchants spawn with stacks of stackable items.
2021-04-04 13:47:05 -04:00
Monty Marz
06bbb7f0ff
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
DaforLynx
6734198104
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
Joshua Yanovski
4be0f1b02e
Merge branch 'sam/hashset-touch-entities' into 'master'
...
Changed touch_entities from a vec to a hashset.
See merge request veloren/veloren!2056
2021-04-03 22:06:05 +00:00
Christof Petig
d3bdaaec1a
output stats per value for all categories in the trade pricing test
2021-04-03 23:22:34 +02:00
Joshua Yanovski
143fe3876d
Merge branch 'sam/use-lottery-result' into 'master'
...
Handled error in setting stack size for item quantity in lottery.
See merge request veloren/veloren!2055
2021-04-03 20:11:12 +00:00
Sam
18eed650f4
Changed touch_entities from a vec to a hashset.
2021-04-03 15:13:04 -04:00
Samuel Keiffer
8d9f63404e
Merge branch 'sam/combat-ratings' into 'master'
...
Tweaks to Combat Rating Calculation
See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
fd61b94b5d
Handled error in setting stack size for item quantity in lottery.
2021-04-03 11:37:57 -04:00
Sam
ca1a93ba21
Actually committed bone staff fix.
2021-04-03 10:26:32 -04:00
Samuel Keiffer
69b64e26c7
Merge branch 'sam/loot-table-features' into 'master'
...
Loot Table Rework
See merge request veloren/veloren!2046
2021-04-03 08:45:53 +00:00
Justin Shipsey
d99627e1dd
Merge branch 'refactor-cell' into 'master'
...
refactor Cell back to 4 byte size #993
Closes #993
See merge request veloren/veloren!1997
2021-04-03 07:56:06 +00:00
Snowram
9a3f6d8261
Substitutes DPS for CR in item tooltip
2021-04-03 00:10:31 -04:00
Sam
be5d47a512
Factored out weapons into their own rating.
2021-04-03 00:08:40 -04:00
Sam
27f178286d
Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.
2021-04-02 23:24:55 -04:00
Sam
9ad5b0f6b7
Changelog. Fixed a few qualities.
2021-04-02 23:04:36 -04:00
Sam
7c8242b5b1
Added unit test to validate contents of loot tables.
2021-04-02 23:04:35 -04:00
Sam
c8b8cd436e
Made item prices sane.
2021-04-02 23:04:34 -04:00
Sam
7eb1eefa13
Re-created item_price_calculation with new loot tables.
2021-04-02 23:04:34 -04:00
Sam
a2906168a6
Moved materials into their own loot tables.
2021-04-02 23:04:33 -04:00
Sam
cb638180f8
Moved food items into their own loot tables.
2021-04-02 23:04:32 -04:00
Sam
31e69021cb
Switched loot tables from declaring each weapon individually to just referencing a different loot table.
2021-04-02 23:04:31 -04:00
Sam
2e37cefce5
Created weapon loot tables.
2021-04-02 23:04:29 -04:00
Sam
833f1f3309
Converted all armor in loot tables to reference armor set loot tables.
2021-04-02 23:04:28 -04:00
Sam
96b354c178
Consolidated loot tables by switching to CreatureMaterial where possible
2021-04-02 23:04:27 -04:00
Sam
ab2fca21cf
Fixed trading
2021-04-02 23:04:26 -04:00
Sam
bdbe6134f2
Fixed csv tools
2021-04-02 23:04:26 -04:00
Sam
cbca2a66b6
Support for creature specific materails and materials having a quantity.
2021-04-02 23:04:25 -04:00
Sam
247004d180
Loot tables can now recursively specify loot tables. Mercahnts broken.
2021-04-02 23:04:25 -04:00
aljazerzen
9b3f080838
refactor Cell back to 4 byte size
2021-04-01 17:38:10 +02:00
aljazerzen
08146f6a3a
login trim username, improve validation, social ordering
2021-04-01 16:43:27 +02:00
aljazerzen
8ac879e4c1
after leaving group, issue warning instead of changing chat mode
2021-04-01 15:43:50 +02:00
Avi Weinstock
0122dca3c3
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 Märtens
ccb78eeb5c
move tracing code to own crate
2021-03-30 16:35:36 +02:00
Joshua Barretto
3c19713e63
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
92afdaf423
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
bed863c50c
Added indicator text to terrain sprites
2021-03-30 01:04:23 +01:00
Samuel Keiffer
12ec46c572
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
ead861e509
Added patch for sticky hitboxes
2021-03-29 21:52:05 +01:00
Joshua Barretto
85237c7a32
Fixed training dummy hitbox
2021-03-29 21:52:05 +01:00
Joshua Barretto
b0acbda236
Improved archery with feedback sfx and particles
2021-03-29 21:52:04 +01:00
Snowram
6adaac8106
Addresses comments
2021-03-29 18:35:12 +02:00
Snowram
d1e734b9b1
Tooltip now use ItemDesc instead of Item
2021-03-29 18:34:45 +02:00
Snowram
2c09180189
Set the item tooltip for every bag slots
2021-03-29 18:34:45 +02:00
Snowram
aa71dcb9c7
Make the new tooltip item specific
2021-03-29 18:34:45 +02:00
Snowram
4786f84afd
New tooltip
2021-03-29 18:34:45 +02:00
Vincent Foulon
a35fa19409
Implement a basic dialogue system
2021-03-29 14:47:42 +00:00
Sam
71ba9b6a54
Mindflayer balance tweaks.
2021-03-29 10:44:46 -04:00
Treeco
12cf8847c8
Added command to teleport to sites by name
2021-03-28 17:02:17 +01:00
Avi Weinstock
40f2c59401
Reclassify Glowing Remains as Armor for econsim.
2021-03-28 10:29:40 -04:00
Marcel
519c01a888
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
66d0948d06
Fix the price category of the newly added items
2021-03-28 09:25:51 +00:00
Sam
f117a57083
Switched to using ForceUpdate to forcefully update the client position after a blink
2021-03-27 21:33:45 -04:00
Sam
ade466a12b
Removed potential for divide by zero
2021-03-27 21:06:21 -04:00
Sam
0e3b0a9ee7
Repalced stone golems with 10 husks in T5 dungeon miniboss rooms.
2021-03-27 21:06:18 -04:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Sam
91ddcaa155
Particles for summoned minions
2021-03-27 21:05:15 -04:00
Sam
1edf79d109
Moved all legendaries to mindflayer loot table.
2021-03-27 21:05:12 -04:00
Sam
4ec387af82
Added particles for lifesteal effect
2021-03-27 21:05:12 -04:00
Sam
5966b1541d
Mindflayer can now lifesteal off of its own minions
2021-03-27 21:05:11 -04:00
Sam
50e832b6d0
Mindflayer summons husks instead of dogs now
2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f
Adds husk npc
2021-03-27 21:05:09 -04:00
Sam
f9835e78da
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
720482d994
Gave mindflayer AI.
...
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
a5b7477e96
Added summon minions ability to mindflayer
2021-03-27 21:05:05 -04:00
Sam
30da614e89
Added dimensional door ability for mindflayer
2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5
Added necrotic vortex attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
0d3795112c
Added cursed flame attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
46799daed2
Switched normalized function to try_normalized
2021-03-27 19:05:48 -04: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
Sam
6c2de7d70e
Fixed boost having ridiculous velocity.
2021-03-26 16:11:25 -04:00
Scott Williams
d35475eaef
Added leather scraps recipe
2021-03-26 16:44:38 +00: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
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
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
Christof Petig
aa6a75808f
adapt unit test
2021-03-24 07:37:46 +01:00
Christof Petig
acba98366a
loop over slots_mut instead of using an index
2021-03-24 07:37:46 +01:00
Christof Petig
a83a74d216
replace an unwrap by returning an Option
2021-03-24 07:37:45 +01:00
Avi Weinstock
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
Joshua Barretto
21b20ea75e
Merge branch 'aweinstock/enable-rtsim-airships' into 'master'
...
Enable RtSim Airships.
See merge request veloren/veloren!1973
2021-03-23 14:29:43 +00:00
Marcel
f2c01409a2
Merge branch 'sam/continuous-roll' into 'master'
...
Roll Tweaks
See merge request veloren/veloren!1975
2021-03-23 09:46:21 +00:00
Avi Weinstock
75f1b0f5e0
Remove level from create_ship and CreateShip.
2021-03-23 10:44:42 +01:00
Avi Weinstock
deb9358c3a
Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.
2021-03-23 10:44:37 +01:00
Avi Weinstock
49f39fb752
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
Joshua Barretto
456ceab6d0
Remove eye height check for beam
2021-03-23 10:43:22 +01:00
Joshua Barretto
695f6c52fe
Added raycast check to beams
2021-03-23 10:43:18 +01:00
heydabop
0e3f7625a9
Fix #962 - kick old client and add new client on duplicate login
2021-03-22 19:15:24 -05:00
Sam
356bb5baee
If roll input remains held, allows you to keep rolling and stay in roll state.
...
You can now jump to interrupt the recovery portion of roll.
Jumping out of roll slightly increases jump strength.
2021-03-22 18:47:13 -04:00
Marcel Märtens
6b23101fac
update toolchain to nightly-2021-03-22
2021-03-22 16:41:04 +01:00
Marcel Märtens
3d45262ebb
warn when a single system takes longer than 500ms
2021-03-22 14:26:05 +01:00
Samuel Keiffer
4356f67bed
Merge branch 'loot-tables' into 'master'
...
Loot tables
See merge request veloren/veloren!1968
2021-03-22 09:39:35 +00:00
Samuel Keiffer
f65cd1e771
Loot tables
2021-03-22 09:39:35 +00:00
Justin Shipsey
f57af6f776
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Samuel Keiffer
1374900928
Merge branch 'sam/combat-fixes' into 'master'
...
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
jshipsey
31747d8ff1
airship movement bits
2021-03-21 21:43:49 -04:00
Joshua Barretto
7ae4230dc8
Merge branch 'zesterer/pick' into 'master'
...
Pickaxe
See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b
Faster pick, less vibrant block selection
2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00:00
Joshua Barretto
003e76113f
Fetch InputAttr from controller
2021-03-21 19:11:44 +00:00
Marcel
983523c463
Merge branch 'vfoulon80/climbing-skill' into 'master'
...
Add climbing speed and cost
See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Marcel
e64258afcf
Merge branch 'xMAC94x/tracing_slowjob' into 'master'
...
harden slowjob code
See merge request veloren/veloren!1961
2021-03-21 18:34:21 +00:00
Marcel Märtens
a77578a25b
harden slowjob code
2021-03-21 18:45:23 +01:00
Joshua Barretto
b45df7fe10
Switched to BasicMelee
2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f
Add skill for swimming speed
2021-03-21 15:58:38 +01:00
Vincent Foulon
9e11a574d2
remove CharacterAbility::Climb
2021-03-21 00:35:34 +01:00
Vincent Foulon
d0df01fe51
move climbing skill adjustment into climb module
2021-03-21 00:22:04 +01:00
Avi Weinstock
1351b9515c
Update fall damage calculations.
2021-03-20 18:46:34 -04:00
Vincent Foulon
8b01abde67
address comments
2021-03-20 22:56:54 +01:00
Sam
d7090315ff
Increased combo duration by 50%
2021-03-20 16:44:18 -04:00
Sam
92c9e8c477
Fixed gaining combo by shooting loot bags
2021-03-20 16:26:10 -04:00
Vincent Foulon
d0aa68a9d2
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Marcel Märtens
2733ba2e27
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Samuel Keiffer
d489ade082
Parallelized beam
2021-03-19 20:18:36 +00:00
Imbris
9fb44e5674
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
2021-03-18 21:20:22 -04:00
Snowram
e5afb2fcf7
Various visual fixes
2021-03-18 22:53:06 +01:00
Marcel Märtens
e6e56f19f9
cleanup faster physics calc
2021-03-18 15:22:28 +01:00
Imbris
bf383d9562
Combine 5 things into 1
2021-03-18 14:26:32 +01:00
Imbris
99805f9a8d
Merge branch 'imbris/voxel-collider-broadphase' into 'master'
...
Spatial grid for voxel colliders as well as a basic bounding sphere test
See merge request veloren/veloren!1927
2021-03-18 07:03:04 +00:00
Marcel
a6cae66a54
Merge branch 'sam/fix-dash' into 'master'
...
Fixed dash
See merge request veloren/veloren!1933
2021-03-18 03:09:46 +00:00
Joshua Barretto
6c939b35b8
Merge branch 'zesterer/network-tweaks' into 'master'
...
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
See merge request veloren/veloren!1935
2021-03-18 01:47:29 +00:00
Joshua Barretto
64c8f75a4f
Merge branch 'sam/remove-combat-last-pos' into 'master'
...
Shockwaves and beams no longer use last position in calculating if they hit.
See merge request veloren/veloren!1934
2021-03-18 01:07:18 +00:00
Sam
5384e5a01e
Fixed dash
2021-03-17 20:13:12 -04:00
DaforLynx
fbf4defa04
Adds sfx for Sceptre aura
2021-03-17 23:54:49 +00:00
Joshua Barretto
e8b053a09f
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
2021-03-17 21:31:07 +00:00
Sam
2bceb2d3a6
Shockwaves and beams no longer use last position in calculating if they hit.
2021-03-17 17:24:39 -04:00
Marcel Märtens
49e5fe96df
add a check that at least 1 thread works for slowJobPool and for every configuration
2021-03-17 14:36:58 +01:00
Marcel Märtens
529eae2e9d
slowjob: allow at least 1 job of every type
2021-03-17 08:26:43 +01:00
Imbris
198cc7e75a
Remove extra instrumentation and the old voxel collider loop
2021-03-16 23:42:13 -04:00
Imbris
e70f097738
Spatial grid for voxel colliders as well as a basic bounding sphere test
...
before doing any actual expensive voxel collision checking
2021-03-16 23:32:03 -04:00
