Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,932 Commits 151 Branches 18 Tags 2.1 GiB
0151e5aeed
Commit Graph

2895 Commits

Author SHA1 Message Date
Sam
23cc3d671b Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?) 2021-05-15 15:16:38 -05:00
Sam
6b153bcf47 Enforced certain invariants in how an item was equipped into the loadout: 
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
 - a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
 - 2h weapons can never be equipped in an offhand slot

Fixed some tests
 2021-05-15 15:16:38 -05:00
Sam
9173dca03f Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
holychowders
d5f3ba77d4 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
Marcel
7d5ca0e7bf Revert "Merge branch 'snowram/hacky-mount' into 'master'" 
This reverts merge request !2219
 2021-05-14 13:43:20 +00:00
Snowram
8745fb803a Use Body to determine mountee offsets 2021-05-14 00:11:54 +02:00
Snowram
b063ec5a8f Clean unused mount offset 2021-05-14 00:11:46 +02:00
Snowram
486fbf940e Anims export a transform for mounts 2021-05-14 00:11:37 +02:00
Snowram
026ba616ff Expose the mounting bone to the mounter anims 2021-05-14 00:11:28 +02:00
Snowram
e4f3064b8a Collar can make QuadMeds mountable, state + offsets 2021-05-14 00:11:15 +02:00
James Melkonian
4d4bc132f4 Campfires can set things on fire and water puts it out 2021-05-13 05:34:51 +00:00
Marcel
607f8b289b Merge branch 'alphyr/guess_image_format' into 'master' 
Guess image format from file extension

See merge request veloren/veloren!2260
 2021-05-12 18:41:22 +00:00
Joshua Yanovski
3869cdf1d2 Don't remesh chunk vertex data on sprite update. 
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
 2021-05-11 12:58:15 -07:00
James Melkonian
f76b61ac17 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00
Sam
7f6c6c5603 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
Sam
0d53e790fd Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
fca56be4c0 Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
d14fd59711 Increased exp of clay golems. 2021-05-10 18:53:51 -05:00
Sam
9bbdc26089 Added haniwa sentries to level 3 dungeons. 2021-05-10 18:53:50 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Sam
5fa4358e74 Clay golem attacks done. 2021-05-10 18:53:01 -05:00
Marcel Märtens
2ea5fd876b cleanup error codes 2021-05-10 12:59:44 +02:00
Joshua Yanovski
0cf0f59fa7 Merge branch 'sharp/modtools' into 'master' 
Added non-admin moderators and timed bans.

See merge request veloren/veloren!2276
 2021-05-10 04:54:06 +00:00
Joshua Yanovski
e7587c4d9d Added non-admin moderators and timed bans. 
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
 2021-05-09 21:19:16 -07:00
Samuel Keiffer
a86c3af42b Merge branch 'aweinstock/mindflayerfixes-202105' into 'master' 
Mindflayer AI improvments

See merge request veloren/veloren!2285
 2021-05-10 02:54:21 +00:00
Samuel Keiffer
6c9a2663ba Merge branch 'aws107/roll-to-remove-burning' into 'master' 
Implement #1105: Rolling removes burning debuff

Closes #1105

See merge request veloren/veloren!2271
 2021-05-10 02:40:08 +00:00
Avi Weinstock
1ae105125d Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field. 2021-05-09 18:09:53 -04:00
Avi Weinstock
1dfcdce1c0 Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
juliancoffee
d3be89f5eb Add species to /spawn auto-complete 2021-05-09 20:43:13 +03:00
Benoît du Garreau
2718fdb1ca Only load images as PNG 2021-05-09 19:02:48 +02:00
juliancoffee
3d011098b8 style convention 2021-05-09 19:05:01 +03:00
juliancoffee
2035c041f9 add authors 2021-05-09 13:12:26 +03:00
juliancoffee
359a46d6f2 Fix tests 
1) Use more correct way to look for `assets` dir
2) Rename veloren_common::assets to veloren_common_assets in doc-tests
 2021-05-09 13:12:26 +03:00
juliancoffee
9af0b6dd12 Search for assets in workspace root 2021-05-09 13:12:26 +03:00
juliancoffee
735e8ab4ec Extract common/src/assets.rs to own crate 
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
 2021-05-09 13:12:26 +03:00
Marcel
2ea69a6180 Merge branch 'aweinstock/fix-bow-20210507' into 'master' 
Make projectiles function properly if they hit a wall in the same tick as an entity.

See merge request veloren/veloren!2275
 2021-05-08 15:47:12 +00:00
Illia Denysenko
1c22a2b3fd /skill_preset command 2021-05-08 15:47:09 +00:00
Avi Weinstock
7ec7540be4 Make projectiles function properly if they hit a wall in the same tick as an entity. 2021-05-07 23:20:57 -04:00
Adam Strauss
a5b7e34bf8 Fix #1105: Move server event so it does not emit constantly during build up 2021-05-07 15:40:11 -07:00
Adam Strauss
3d17fde537 Implement #1105: Rolling removes burning debuff 2021-05-07 15:38:41 -07:00
Snowram
831bfd0be9 Snowram/craft mats 2021-05-07 17:03:45 +00:00
Samuel Keiffer
a2999ce96f Merge branch 'aweinstock/damage-types' into 'master' 
Add `DamageKind`, and make piercing damage partially ignore damage resistence.

See merge request veloren/veloren!2262
 2021-05-06 22:22:49 +00:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
James Melkonian
346eb48a27 Move weapon tactics to functions and take target body into attack radius consideration 2021-05-06 21:17:05 +00:00
Benoît du Garreau
77b086c242 Guess image format from file extension 2021-05-06 17:49:25 +02:00
Marcel
91f76d3b00 Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' 
instead of manually trying to sync disconnect metrics we now pass a Reason to...

See merge request veloren/veloren!2259
 2021-05-06 11:32:37 +00:00
Marcel Märtens
8196fd8b35 instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect. 
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
 2021-05-06 11:43:10 +02:00
Marcel
efed14ccf9 Merge branch 'duelsik/wiring-on-death' into 'master' 
(Wiring) OnDeath

See merge request veloren/veloren!2256
 2021-05-06 09:00:50 +00:00
Sam
dc7e45c8bd Rebalancing 2021-05-05 14:43:56 -04:00
Daniel Mizerski
b34704ea3f (Wiring) OnDeath 2021-05-05 19:08:18 +02:00
Marcel Märtens
4cfdbdd069 use a constant for recommended_threads 2021-05-05 14:35:06 +02:00
Marcel Märtens
0142cf37f0 limit tokio threads to 1/4 of num_cpus 
make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
 2021-05-04 21:06:11 +02:00
Marcel Märtens
6e3a74b476 rayon::join creates a global threadpool, which is only used in /world 
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
 2021-05-04 21:06:07 +02:00
Samuel Keiffer
fb940ad27a Merge branch 'sam/minotaur' into 'master' 
Overhauled Minotaur

See merge request veloren/veloren!2193
 2021-05-04 16:26:08 +00:00
Imbris
217502d516 Merge branch 'duelsik/wiring-sticky-trigger' into 'master' 
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)

See merge request veloren/veloren!2241
 2021-05-04 16:15:19 +00:00
Daniel Mizerski
f1681f465f (Wiring) Change Sticky to be handled by physics (but with disabled force on it) 2021-05-04 17:33:42 +02:00
Sam
062c290e49 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
2652660a58 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f Balancing. 2021-05-04 08:45:11 -04:00
Sam
7ac1488181 Added kit for testing tier 4 dungeons. 2021-05-04 08:45:11 -04:00
Sam
164fd0de04 Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
Sam
811f1fadb2 Replaced action_timer with action_state so there are additional fields. 2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1 anims 2021-05-04 08:45:08 -04:00
Sam
d1139c3b7c Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
160bd3ef0c Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
juliancoffee
b81981f805 Draft implementation 2021-05-03 22:07:09 +03:00
Samuel Keiffer
771a8db2a8 Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
Samuel Keiffer
610c529c42 Merge branch 'sam/ability-sets' into 'master' 
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
 2021-05-03 17:50:11 +00:00
Avi Weinstock
efa4f9fe0a Experiment with const fn lanczos lookup tables, enable weighted average interpolation for now. 2021-05-03 00:09:44 -04:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
Avi Weinstock
b15913560b Optimize CompressedData with Vec::with_capacity, and move obsolete formats from common_net into the compression benchmark. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c199d12f2d Address MR 2207 review comments. 
- Add metrics for which branch of the compression heuristic was taken.
- Reduce the threshold for the heuristic.
- Deduplicate code for dealing with lazy messages.
- Make jpeg dependency only scoped to the compression benchmark.
- Remove commented code.
 2021-05-03 00:09:24 -04:00
Avi Weinstock
30cae40b82 Add a bandwidth-based heuristic for chunk compression. 2021-05-03 00:09:24 -04:00
Avi Weinstock
cdc2eccda8 Improve quadpng by adding WidePacking, which makes a wider image, which is faster due to PNG compressing by row. Heuristically switch between quadpng and deflate based on chunk height to reduce variance. 2021-05-03 00:09:24 -04:00
Avi Weinstock
dffc7db8f5 Add matplotlib graph generation to the compression benchmarks. 2021-05-03 00:09:24 -04:00
Avi Weinstock
0f4315c98b Remove a use of inline_tweak and use TallPacking instead of GridLtrPacking in common_net::msg::server. 2021-05-03 00:09:24 -04:00
Mckol
c913b9b858 Added Lanczos interpolation for QuadPng 
Should support arbitrary scales (N).
Does support arbitrary Lanczos a parameters (currently 2)
and sample sizes (currently 5x5).
 2021-05-03 00:09:24 -04:00
Avi Weinstock
fe0f331a19 Add 5x5 manhattan blur effect to quadpng, and omit interpolation at chunk borders. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c2fd5e807d Experiment with 256-color palette "tripng" encoding, and Lanczos interpolation for "quadpng". 2021-05-03 00:09:24 -04:00
Avi Weinstock
a220cc569e Add resolution downscaling to QuadPng's color channel, and use half-resolution QuadPng ingame. 2021-05-03 00:09:24 -04:00
Avi Weinstock
f81539cb00 Get PngPngPngJpeg terrain working in the actual game. 2021-05-03 00:09:24 -04:00
Avi Weinstock
a9a943c19a Move compression helpers to common_net::msg::compression and experiment with more image formats at more site kinds. 2021-05-03 00:09:24 -04:00
jshipsey
63fdc4f590 animal adjustments 2021-05-02 23:17:58 -04:00
James Melkonian
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Daniel Mizerski
7faa0d3cd9 Add fundamentals for wiring system. 2021-05-02 22:38:44 +02:00
jshipsey
769e21104e higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Ludvig Böklin
d7ef414f59 Fix glider pitching down when trying to take off 2021-05-01 15:35:26 +02:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
708cb12086 Fixed tests. 2021-05-01 09:25:55 -04:00
Sam
d3d4ee8bb0 Formatting stuffs. 2021-05-01 09:25:53 -04:00
Sam
3cb0ee98c8 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Ludvig Böklin
cc7f0f3ac2 Fix ori 2021-04-30 17:37:51 +02:00
DaforLynx
7334cce426 Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
Samuel Keiffer
e177aebd9e Merge branch 'lboklin/lower-zero-lift-drag' into 'master' 
Lower zero-lift drag

See merge request veloren/veloren!2223
 2021-04-29 19:11:12 +00:00
Justin Shipsey
baf749c03e Merge branch 'lboklin/object-masses' into 'master' 
Define more accurate masses for objects

See merge request veloren/veloren!2220
 2021-04-29 19:04:48 +00:00
Ludvig Böklin
c4444a908a Lower zero-lift drag 2021-04-29 19:22:09 +02:00
Synis
4e4818ca9e Query spatial grid for beam and aura system 
fmt
 2021-04-29 14:23:02 +02:00
Ludvig Böklin
6b52ea89b4 Add more specific masses to objects 2021-04-29 11:46:03 +02:00
Ben Wallis
b0aca9a348 Merge branch 'xvar/item-serialization' into 'master' 
Changed Item serialization to not send ItemDef struct across the network

See merge request veloren/veloren!2215
 2021-04-28 20:50:32 +00:00
Ben Wallis
14caae3667 Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef 2021-04-28 21:00:25 +01:00
DaforLynx
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
Ludvig Böklin
34660462e9 Glider physics 2021-04-27 14:41:48 +00:00
jshipsey
f845f2bd11 fix glide wield 2021-04-26 23:17:04 -04:00
Sam
1a7779beb3 Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
jshipsey
a0a75b1921 comments 2021-04-25 22:02:32 -04:00
jshipsey
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
jshipsey
c01fd86f44 ori fixes 2021-04-25 22:02:30 -04:00
Joshua Barretto
c6d1963f10 Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes

See merge request veloren/veloren!2201
 2021-04-25 23:03:23 +00:00
Joshua Barretto
94b6fa6da3 Don't use movement efficiency for orientation 2021-04-25 23:00:30 +01:00
Joshua Barretto
3af4793762 Minor control over velocity when in the air 2021-04-25 22:37:25 +01:00
Marcel
35584d0344 Merge branch 'xMAC94x/reduce_deps' into 'master' 
remove some unused deps Yuri found

See merge request veloren/veloren!2197
 2021-04-25 20:22:31 +00:00
Marcel Märtens
1842b2d6eb remove some unused deps Yuri found 2021-04-25 20:18:20 +02:00
Sam
6848851dc3 Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided. 2021-04-25 13:09:10 -04:00
Sam
372eff2a02 Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
d2d8d43410 Addressed testing feedback. 
Particles better.
 2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2 Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
Sam
288a6f3a82 Blocking now works if no weapon is equipped in main hand. 
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
 2021-04-25 13:09:02 -04:00
Sam
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Sam
0170a38ebc Removed unwraps in buffs 2021-04-25 12:01:21 -04:00
Snowram
c16ec43938 Body specific beam offsets 2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31 More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ygor Souza
71b8426592 Add basic distance check to shockwave hit test 
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.

This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
 2021-04-24 03:09:45 +02:00
Ygor Souza
e59f1e8d28 Skip physics pass for arrows stuck on surfaces 
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
 2021-04-22 23:03:04 +02:00
Marcel
e14f8b9745 Merge branch 'aweinstock/deflate-terrain' into 'master' 
Compress terrain chunks with deflate. Includes a benchmark showing that this...

See merge request veloren/veloren!2166
 2021-04-22 17:12:53 +00:00
Monty Marz
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Dominik Broński
1d25016459 Merge branch 'lboklin/arrow-turret-drag-fix' into 'master' 
Fix ArrowTurret drag coefficient

See merge request veloren/veloren!2175
 2021-04-21 20:17:44 +00:00
Imbris
51c0f8733c Quick physics perf fix 2021-04-21 14:03:23 -04:00
Imbris
1af4a04231 Revert "Merge branch 'revert-b10718c5' into 'master'" 
This reverts merge request !2172
 2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223 Merge branch 'zesterer/lanterns' into 'master' 
Made characters carry lanterns higher when possible

See merge request veloren/veloren!2169
 2021-04-21 16:40:20 +00:00
Ludvig Böklin
37713cb4ad Fix ArrowTurret drag coefficient 2021-04-21 18:26:23 +02:00
Imbris
68539a751b Merge branch 'revert-b10718c5' into 'master' 
Revert "Merge branch 'imbris/agent-opt' into 'master'"

See merge request veloren/veloren!2172
 2021-04-21 15:06:35 +00:00
Imbris
699a5493ec Merge branch 'lboklin/simplify-buoyancy' into 'master' 
Simplify buoyancy for performance reasons

See merge request veloren/veloren!2171
 2021-04-21 15:06:31 +00:00
Joshua Barretto
ed7cc12213 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
Ludvig Böklin
a1744182b3 Simplify buoyancy for performance reasons 2021-04-21 16:19:02 +02:00
Ludvig Böklin
6e364665cb Prevent drag forces from causing something to come to a complete stop 2021-04-21 16:13:51 +02:00
Imbris
fd672980c4 Revert "Merge branch 'imbris/agent-opt' into 'master'" 
This reverts merge request !2024
 2021-04-21 14:10:06 +00:00
Avi Weinstock
308ad4d81e Cleanup errors introduced in rebase. 2021-04-20 23:34:17 -04:00
Avi Weinstock
15e32e5655 Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream. 2021-04-20 23:24:24 -04:00
Avi Weinstock
6d9de520f3 Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4. 2021-04-20 23:23:53 -04:00
Imbris
76ff00757f Appease clippy, add CHANGELOG entry 2021-04-20 15:29:20 -04:00
Imbris
e17477979f Remove extra chunk cloning and parallelize serialization in the server terrain sys 2021-04-20 15:25:05 -04:00
Imbris
e750c9d570 Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle 2021-04-20 15:25:04 -04:00
Imbris
a76fdbc325 Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode 2021-04-20 15:25:04 -04:00
Imbris
26222a0a2d Rename common-sys to common-systems and rearrange common-state slightly 2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
bcf9a8089f Merge branch 'better-crafting' into 'master' 
Crafting station sprites in towns

See merge request veloren/veloren!2160
 2021-04-20 15:08:36 +00:00
Joshua Barretto
68004bc39c Made cooking pots glow 2021-04-20 15:39:46 +01:00
Joshua Barretto
a19212daf7 Fix block-snapping at low framerates 2021-04-20 14:59:59 +01:00
Joshua Barretto
9ff7db9b1c Account for FP imprecision in block-hopping 2021-04-20 14:54:21 +01:00
Joshua Barretto
36e95e0c03 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Monty
86445af09c change cauldron spawning 
cooking pot height
fmt
fmt, changelog
 2021-04-20 02:48:13 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update 
fix item images
fix CR display
 2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
Marcel Märtens
7348e399e0 only have 1 Fn passed to tick fn 2021-04-20 01:49:45 +02:00
Marcel Märtens
485a477503 include origin into system name 2021-04-20 01:30:27 +02:00
Marcel Märtens
425063e24e remove authc from common::net 2021-04-20 01:30:23 +02:00
Marcel Märtens
5862920f32 seperate sys/state 2021-04-20 01:30:17 +02:00
Joshua Barretto
4ad5257e40 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
ed20a66b20 Fixed block-snapping 2021-04-19 21:46:51 +01:00
Joshua Barretto
b700d9a641 Merge branch 'zesterer/econ-tweaks' into 'master' 
Limit trading currency to sane amounts

See merge request veloren/veloren!2154
 2021-04-19 10:46:17 +00:00
Joshua Barretto
324148d9a3 Limit trading currency to sane amounts 2021-04-19 10:04:28 +01:00
Sam
ce7581037c Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313 Merge branch 'zesterer/econ-tweaks' into 'master' 
Rebalanced economy somewhat

See merge request veloren/veloren!2148
 2021-04-18 21:20:49 +00:00
Samuel Keiffer
60d38cc03b Merge branch 'aweinstock/dodgesplosion' into 'master' 
Unlock dodge roll iframes and staff explosion by default.

See merge request veloren/veloren!2146
 2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Joshua Barretto
352fce239e Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807 Trading stock limits 2021-04-18 18:58:26 +01:00
Samuel Keiffer
1892ec571d Merge branch 'sam/permanent-spawn-safezone' into 'master' 
Safezone is now permanently in existence at spawn.

See merge request veloren/veloren!2144
 2021-04-17 23:44:10 +00:00
Sam
416fe5c2af Safezone is now permanently in existence at spawn. 2021-04-17 17:33:54 -04:00
Ben Wallis
0e83de205b Changed plugin load errors to debug and reworded plugin init/load error messages 2021-04-17 22:04:14 +01:00
Ben Wallis
a4cdb89987 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Avi Weinstock
af47c0dc21 Added /server_physics admin command. 2021-04-17 13:44:22 -04:00
Samuel Keiffer
c962c5f12e Merge branch 'gGmMsS/Burning' into 'master' 
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
 2021-04-15 23:51:33 +00:00
Imbris
85ee4c8cd1 Merge branch 'aweinstock/server-authoritative-physics' into 'master' 
Aweinstock/server authoritative physics

See merge request veloren/veloren!2126
 2021-04-15 22:24:00 +00:00
gGmMsS123
d5a887f195 m2 staff 2021-04-16 00:48:20 +03:00
gGmMsS123
e33961e1fa M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Avi Weinstock
2fb7575d60 Address MR 2126 comments. 2021-04-15 15:17:39 -04:00
jshipsey
8f20d17c9a attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Avi Weinstock
50d0314a75 Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00
Justin Shipsey
f7f2eb4b9b Merge branch 'sam/2h-offhand-anim-fixes' into 'master' 
2 Hand Offhand Animation Fixes

See merge request veloren/veloren!2129
 2021-04-15 01:21:52 +00:00
Sam
c88df846a7 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
Sam
94042bdf79 Stats adjusted for 2h. Poise adjusted by handedness. 2021-04-14 15:03:37 -04:00
holychowders
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
jshipsey
161382d06a changelog 2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
Sam
0b10ffc715 You can now roll without a weapon equipped. 2021-04-13 20:18:58 -04:00
jshipsey
b53e1653f6 initial wield testing 2021-04-13 20:18:58 -04:00
Ben Wallis
1de94a9979 * Replaced diesel with rusqlite and refinery 
* Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table
* Removed all down migrations as refinery does not support down migrations
* Changed all diesel up migrations to refinery naming format
* Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling
* Added /disconnect_all_players admin command
* Added disconnectall CLI command
* Fixes for several potential persistence-related race conditions
 2021-04-13 22:05:47 +00:00
Vincent Foulon
a4bd47f340 Support quantity + use Enum for autocompletion + Address comments 2021-04-12 20:07:34 +02:00
Vincent Foulon
0692562533 New Command: "kit" + Removed Command: "debug" 
Update CHANGELOG.md

Update CHANGELOG.md
 2021-04-12 18:53:36 +02:00
Marcel
54024ce401 Merge branch 'DaforLynx/more-music' into 'master' 
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds

See merge request veloren/veloren!2102
 2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds 2021-04-12 00:43:08 +00:00
Avi Weinstock
ddf6a26577 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
Joshua Yanovski
af94753ad9 Remove panics and unwraps, part 1. 
Also fixes various other miscellaneous bugs.
 2021-04-10 10:03:21 +02:00
Marcel Märtens
1a9425526b remove spamming of the logs 2021-04-08 23:55:13 +02:00
Imbris
0eecc61ddf Merge branch 'vfoulon80/behavior-component' into 'master' 
New Component: Behavior

See merge request veloren/veloren!2033
 2021-04-08 19:16:28 +00:00
Vincent Foulon
d80db38bc9 Remove TRADE capability, use trade_site attribute instead 2021-04-08 19:06:57 +02:00
Vincent Foulon
bc1797a240 Address comments 2021-04-08 18:33:00 +02:00
holychowders
a4b00a3b97 Fix issue #1061 - Combat Rating is Affected by Buffs 
Replaced `stats` with `None` into the calculation for damage reduction
 2021-04-07 17:09:51 -07:00
Vincent Foulon
a30cbaf735 Move Behavior to Agent's Component 2021-04-07 22:11:29 +02:00
Vincent Foulon
dbee13f9be Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly 2021-04-07 22:02:57 +02:00
Vincent Foulon
45fb9f3211 Address comments 
- make Behavior's capabilities and state private
 - Typo in a comment
 - add basic tests

Apply 1 suggestion(s) to 1 file(s)

Remove comments in agent.rs
 2021-04-07 22:02:42 +02:00
Vincent Foulon
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
114715908a fix tag removing 2021-04-07 17:26:54 +02:00
Vincent Foulon
b1718cf578 Use HashSet instead of Vec 2021-04-07 17:26:48 +02:00
Vincent Foulon
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
18694b30ad Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
41314e9098 Create Behavior component 2021-04-07 17:21:53 +02:00
Marcel
45b4349bc7 Merge branch 'james/topo-map' into 'master' 
Adds topographic map option and allows for map layers

See merge request veloren/veloren!2074
 2021-04-07 09:34:13 +00:00
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
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