Avi Weinstock
56137aff92
Address MR 2062 comments: avoid an expect-equivalent pattern.
2021-04-05 11:29:10 -04: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
Christof Petig
d3bdaaec1a
output stats per value for all categories in the trade pricing test
2021-04-03 23:22:34 +02:00
Sam
18eed650f4
Changed touch_entities from a vec to a hashset.
2021-04-03 15:13:04 -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
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
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
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
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
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
85237c7a32
Fixed training dummy hitbox
2021-03-29 21:52:05 +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
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
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
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
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
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
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
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
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
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
fb3980e273
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00: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
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
Vincent Foulon
d0aa68a9d2
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Snowram
e5afb2fcf7
Various visual fixes
2021-03-18 22:53:06 +01:00
DaforLynx
fbf4defa04
Adds sfx for Sceptre aura
2021-03-17 23:54:49 +00:00
Monty Marz
e9cbac387e
new loading bg, staff models
...
item images
fix paths
loot tables, adjustments
Update main.ron
2021-03-16 23:23:24 +00:00
Avi Weinstock
4d6fb0584a
Fix mounting by making deferred {pos,vel} writes optional in physics.
2021-03-16 14:04:28 -04:00
Imbris
f2ff5c9655
Instrument all par joins, defer ubiquitous pos/vel writes with a component instead of using vecs
2021-03-16 03:50:45 -04:00
James Melkonian
6ea43cfd75
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Avi Weinstock
9304ecab3d
Address Imbris's MR 1888 comments, and add changelog entry.
...
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
2021-03-14 23:21:46 -04:00
Avi Weinstock
546ee48073
Fix interpolation for possession, and make the mount point of airships above their deck.
2021-03-14 23:21:45 -04:00
Joshua Barretto
f6c6319952
Made entities rotate smoothly with airships, fixed rotation speeds
2021-03-14 23:20:47 -04:00
Avi Weinstock
a32be4ac5a
Address MR 1888 review comments.
...
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
2021-03-14 23:17:28 -04:00
Avi Weinstock
aa56166c80
Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.
2021-03-14 23:17:26 -04:00
Avi Weinstock
5ff72a4a2e
/airship angle command and RtSim airships.
2021-03-14 23:14:26 -04:00
Joshua Barretto
afd99788b2
Made animations and friction ground-relative
2021-03-14 23:09:52 -04:00
Avi Weinstock
e9aab63a04
Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.
2021-03-14 23:09:52 -04:00
James Melkonian
6ff054099f
Allow spawned airships to move
2021-03-14 23:09:52 -04:00
Avi Weinstock
5d85775dcf
Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).
2021-03-14 23:09:51 -04:00
Avi Weinstock
8b9e84972a
Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).
2021-03-14 23:09:49 -04:00
Marcel
5570b57282
Merge branch 'sam/yeet-inputs' into 'master'
...
Reworked Controller Inputs to use Control Actions
See merge request veloren/veloren!1900
2021-03-15 01:32:02 +00:00
Sam
ecff675cc4
Wielding now works again
...
Rolling now resumes combo states correctly again
Cleanup
2021-03-14 17:26:55 -04:00
Sam
ac6e192db4
Completely purged old method of inputs
2021-03-14 17:26:55 -04:00
Sam
be27289a7f
Inputs remain in queue while active, allowing interrupts and queued inputs to be more cleanly handled
2021-03-14 17:26:54 -04:00
Sam
b5d501199d
Secondary input now fully functional
2021-03-14 17:26:53 -04:00
Sam
21e6f4797c
Primary ability fully functional.
2021-03-14 17:26:53 -04:00
Sam
19c81f1528
Support for canceling an input. Boost state hooked up to system.
2021-03-14 17:26:52 -04:00
Sam
c6d8daaae3
Primary input now activated from control actions.
...
Moved a lot of key_state to a HashSet so that it is handled automatically.
2021-03-14 17:26:51 -04:00
