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
11,415 Commits 151 Branches 18 Tags 2.1 GiB
593d8fa4b5
Commit Graph

3586 Commits

Author SHA1 Message Date
Joshua Barretto
e098a38d8e Merge branch 'james/rrt-pathfinding' into 'master' 
Initial RRT flight pathfinding

See merge request veloren/veloren!2773
 2021-09-19 19:30:31 +00:00
Joshua Barretto
f94d579c04 Merge branch 'juliancoffee/clay_gole_laser_fix' into 'master' 
Tweak coefficient of beam_offset for clay_golem

See merge request veloren/veloren!2859
 2021-09-18 17:36:08 +00:00
juliancoffee
1d8c368137 Tweak coefficient of beam_offset for clay_golem 2021-09-18 19:55:46 +03:00
Ben Wallis
d665ce329d * Added new Admin Commands window to egui, including Give Items and Kits sections 
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
 2021-09-18 16:17:42 +01:00
Joshua Barretto
2f1fe39e04 Merge branch 'james/lava-dungeons' into 'master' 
Prettier site2 houses

See merge request veloren/veloren!2852
 2021-09-18 14:58:42 +00:00
Justin Shipsey
02c19aaee8 Merge branch 'zesterer/remove-unscheduled-skydives' into 'master' 
Remove unscheduled skydives

See merge request veloren/veloren!2851
 2021-09-18 04:53:22 +00:00
James Melkonian
36884d6919 Move rrt algorithm into its own function 2021-09-17 16:27:00 -07:00
James Melkonian
9875a74640 Make RRT pathfinding a cfg feature 2021-09-17 16:01:20 -07:00
James Melkonian
c2c4429750 Disable RRT pathfinding 2021-09-17 16:01:19 -07:00
James Melkonian
7ddc229728 Initial RRT flight pathfinding 2021-09-17 16:01:19 -07:00
James Melkonian
42fdf0818d Gable primitive and dungeon lava rooms 2021-09-17 15:45:26 -07:00
Joshua Barretto
a76496c339 Use previous position caches for airship collision detection 2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4 Merge branch 'anomaluridae/cleanup-interactable' into 'master' 
Seperation of targets vs interactables. Cleaner cursor interactions.

See merge request veloren/veloren!2754
 2021-09-17 19:25:08 +00:00
anomaluridae
82f3c3c3e8 is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer 2021-09-17 10:34:20 -07:00
anomaluridae
6362df4ffc keep MAX_TARGET_RANGE within voxygen 2021-09-17 10:34:20 -07:00
anomaluridae
42d5836cfa properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds. 2021-09-17 10:34:20 -07:00
anomaluridae
5c66f73bb4 make the ContollerInputs.select_pos be explicitly the breakable blacks for mining 2021-09-17 10:34:20 -07:00
juliancoffee
f810af4eec Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
juliancoffee
19f0cf4ee5 Set z_min to 0 for terrain collision checks 
This allows us have different z_min for e2e checks
 2021-09-17 13:28:34 +03:00
juliancoffee
e5d69d153b Adress review 
Make sausage ascii-art have `a` line inside of stadium
 2021-09-17 13:28:34 +03:00
juliancoffee
4e3fb87526 Adress review 
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
  magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
  resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
  with p0=p1=Vec2::zero())
 2021-09-17 13:28:34 +03:00
juliancoffee
3dd6aa9dea Implement capsule2capsule collisions 2021-09-17 13:28:34 +03:00
juliancoffee
fdb4b7111a Fix bug with zero-pushback for bigger colliders 2021-09-17 13:28:34 +03:00
juliancoffee
c069a3523d Fix beam offsets 
- Introduce notion of min and max radius for Body instead of old
  `radius()` function (which is renamed to `max_radius()`).
 2021-09-17 13:28:34 +03:00
juliancoffee
7d97fe7ec5 Fix colliding bugs 
- Make cylinder-like capsules prisms work without NaN in origin offsets.
Just return p0 as both origins instead of getting NaN by further
normalizing required because of how we rotate offsets.
- Fix pushback direction.
Make sure that pushback is calculated as our_pos - their_pos (and not
other way around).
- Fix colliding boundary detection.
Calculate center as Vec3::new(0, 0, height) and
not as `Vec3::new(0, height, 0)`.
 2021-09-17 13:28:34 +03:00
juliancoffee
eeb3bec8ad Refactor implementation of e2e collision 
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
  Capsule.
 2021-09-17 13:28:34 +03:00
juliancoffee
44962958d8 Adress feedback 
- Rewrite 2 * PI to TAU
- Some comment formatting
 2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678 Remove body::Shape enum, make npc use CapsulePrism 2021-09-17 13:28:34 +03:00
juliancoffee
6c3b61dc25 Implement CapsulePrism collisions 2021-09-17 13:28:34 +03:00
juliancoffee
7712976b86 Refactor box_voxel_collision function 2021-09-17 13:28:34 +03:00
juliancoffee
3b308a3f6f Add CapsulePrism collider variant 
+ Add placeholder physics collision implementation as copy of cylinder
  Box collider.
+ Display it with debug hitboxes.
 2021-09-17 13:28:34 +03:00
Sam
99981338bb Fixed exp fix mistake and fixed lava, campfire, and bomb damage. 2021-09-15 08:32:44 -04:00
Sam
3d31248ced Fixed health ui in few places and xp scaling from health. 2021-09-14 10:55:14 -04:00
Samuel Keiffer
73d3d3e4bb Merge branch 'sam/health-float' into 'master' 
Turned Health into a Float

See merge request veloren/veloren!2824
 2021-09-13 15:23:18 +00:00
Sam
fec92c3000 Fixed plugin tests with hack. 2021-09-13 10:34:40 -04:00
Sam
85f4e66337 Addressed MR 2824 comments 2021-09-10 15:20:14 -04:00
Monty Marz
1d94adc2e1 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Sam
42012fddcb Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
Sam
c7291701e1 Sprite interaction fixes 2021-09-07 20:34:04 -04:00
Joshua Barretto
003b9f57ce Merge branch 'juliancoffee/pvp_command' into 'master' 
Implement /battlemode command and more

See merge request veloren/veloren!2787
 2021-09-04 18:37:01 +00:00
juliancoffee
670e29a286 Better formatting 2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0 Adress review: 
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
  plant fields, which is kinda meh)
- better error displaying
 2021-09-04 20:38:53 +03:00
Sam
f65b3a094d Cultists now properly raid villages. 2021-09-04 12:25:04 -04:00
juliancoffee
43d40c4efc Workaround of bug with global Player component 
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
 2021-09-04 02:29:02 +03:00
juliancoffee
1baa9e9879 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03:00
juliancoffee
fbe745fe1e Cooldowns 
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
 2021-09-04 01:41:48 +03:00
juliancoffee
338e81de10 Deduplicate pvp-checks 2021-09-03 17:28:34 +03:00
juliancoffee
2e79c61123 Implement /battlemode_force command 
+ add placeholder for /battlemode command (currently can only show your
  battle mode)
 2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418 Don't forget about pets in PvP checks 2021-09-03 17:28:34 +03:00
Sam
0a3b541940 Removed ability to 'droideka' through dungeons. 2021-09-02 19:48:30 -04:00
Sam
5f08089bd9 Recover section no longer has 0 movement. 2021-09-02 19:27:07 -04:00
juliancoffee
6c1ecc9766 Add support for override asset folder 
- ASSETS_OVERRIDE environment variable with asset path which has higher
  priority.
 2021-09-02 20:24:23 +03:00
Marcel
970d57f905 Merge branch 'juliancoffee/skill_boost_rework' into 'master' 
ECS & Diary info synchronization

See merge request veloren/veloren!2771
 2021-09-02 16:04:23 +00:00
Samuel Keiffer
a733ad00e6 Merge branch 'ubruntu/sometimes-drop-nothing' into 'master' 
NPCs can drop nothing

See merge request veloren/veloren!2794
 2021-09-01 23:17:36 +00:00
ubruntu
bbc366e1b3 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Sam
41a385c517 Turn towards center of sprite instead of corner. 2021-09-01 17:24:09 -04:00
Joshua Barretto
82886dcd3f Merge branch 'zesterer/tiny-fixes' into 'master' 
Worldgen hotfix

See merge request veloren/veloren!2797
 2021-09-01 12:47:50 +00:00
Joshua Barretto
1b0cb40d94 Made ore streams mineable 2021-09-01 12:05:00 +01:00
Knightress Paladin
f49dc2191d Make parrying refund the block stamina cost and cancel the recover animation 2021-08-31 23:46:33 -07:00
Sam
156820cd5c Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite. 2021-08-31 13:57:17 -04:00
Sam
5dbc05730d Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement. 2021-08-31 13:37:57 -04:00
Sam
f986176604 Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection. 2021-08-31 13:37:56 -04:00
Sam
2a3cc3d35a No longer send collect inventory event if interactable sprite kind cannot be found. 2021-08-31 13:37:56 -04:00
Sam
6b71133c50 Fixed interaction to work underwater. 2021-08-31 13:37:55 -04:00
Sam
13fa154e55 Changelog and added arm length (body radius) to sprite pickup range. 2021-08-31 13:37:53 -04:00
Sam
6d91bae44b Sprite interaction now uses pathfinding to check that it can be picked up. 2021-08-31 13:37:36 -04:00
Sam
28d23c89ed Added simple distance check for sprite interaction. 2021-08-31 13:37:36 -04:00
Sam
9e5744f3ee Entities will now attempt to orient towards the sprite they are interacting with. 2021-08-31 13:37:36 -04:00
Sam
44c3b0f153 Added attack hook event, attacks now cancel item use and sprite interaction. 2021-08-31 13:37:32 -04:00
Sam
538cb56b87 Sprites now go through a character state to be picked up. 2021-08-31 13:36:04 -04:00
Joshua Barretto
0b1a820762 Make arrows 'bonk' hanging sprites 2021-08-31 13:31:27 +01:00
Joshua Barretto
913c23e1ad Merge branch 'zesterer/spots' into 'master' 
Spots

See merge request veloren/veloren!2695
 2021-08-31 12:03:47 +00:00
Monty Marz
13c15b3840 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
0011e75526 More tree variety 2021-08-29 18:38:34 +01:00
Joshua Barretto
87f4efd65b Added spot loot 2021-08-29 12:50:35 +01:00
Sam
7dcbd6aaf0 Renamed variable to make more explicit what it does. 2021-08-28 18:31:44 -04:00
Monty Marz
771a380e6c witch stuff 2021-08-28 14:53:30 +01:00
Monty Marz
df0ab43bb8 taiga and savannah definitions 2021-08-28 14:53:30 +01:00
Joshua Barretto
06d85b8b10 Added index customisation for world structure models 2021-08-28 14:53:30 +01:00
Joshua Barretto
76ba3496a1 sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Sam
0a648e2e8f Fixed arrows dealing damage to entities if entity walked near arrow that stuck to terrain several seconds prior. 2021-08-26 19:00:28 -04:00
juliancoffee
9211b4a00a Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
54cb990d52 Move to one SKILL_MODIFIERS constant 2021-08-26 14:49:52 +03:00
juliancoffee
b1bac83319 SkillTreeModifiers data structs 2021-08-26 14:49:52 +03:00
juliancoffee
1ff99dcc34 Remove unused SkillBoost functions 2021-08-26 14:49:52 +03:00
juliancoffee
81bbc8c31f Split adjusted_by_skills by toolkind 2021-08-26 14:49:51 +03:00
Sam
790c3669a0 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Imbris
2c3b484567 Merge branch 'imbris/some-tweaks' into 'master' 
Add comment on tuple bool field meaning in pathing

Closes #758

See merge request veloren/veloren!2778
 2021-08-21 16:56:01 +00:00
Ben Wallis
7acae057c5 Merge branch 'xvar/book-doc-gen' into 'master' 
Added cargo cmd-doc-gen to auto-generate the table of commands in the book

See merge request veloren/veloren!2776
 2021-08-21 16:14:42 +00:00
Imbris
a612631aa4 Add comment on tuple bool field meaning in pathing 2021-08-21 15:19:12 +00:00
Ben Wallis
c00bca7e93 Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book 2021-08-21 13:36:55 +01:00
Ygor Souza
54c3adf9af Use all armor stats to calculate combat rating 
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
 2021-08-16 19:59:54 +02:00
juliancoffee
09e8ee2b3f Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
130ae1f429 Add ori_modifier for DashMelee and nerf it 
* 0.6 -> 0.3 ori modifier during charge in DashMelee
 2021-08-16 17:27:59 +03:00
juliancoffee
e9dde3ecec Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
Imbris
1fd25c22dd Merge branch 'juliancoffee/explode_vines' into 'master' 
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
 2021-08-14 19:09:05 +00:00
juliancoffee
c2247686db Make is_mid_air use on_surface().is_none() 2021-08-13 23:16:38 +03:00
Joshua Barretto
5e7e560c10 Merge branch 'min-persistent-world' into 'master' 
min-persistent-world

See merge request veloren/veloren!2662
 2021-08-13 12:30:28 +00:00
juliancoffee
a82f5ca057 Add comment about fragility of solution 2021-08-12 15:28:58 +03:00
Dr. Dystopia
94bcf5b59b Move assignment out of if-statement 2021-08-12 12:34:04 +02:00
Joshua Barretto
738e59965f Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
juliancoffee
86b9e2d8e6 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
juliancoffee
3ac74a8259 Implement /kit all and a bit of refactoring 
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
 2021-08-10 13:28:38 +03:00
Samuel Keiffer
d5feca45c5 Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' 
Consolidate redundant stage sections

See merge request veloren/veloren!2748
 2021-08-10 01:23:26 +00:00
juliancoffee
449902a50e Use asset::load_dir to get list of all items 2021-08-10 02:03:46 +03:00
Sam
52ee598cf1 Consolidated Use into Action as well. 2021-08-09 10:31:17 -04:00
pacmanmati
5f37509a78 #1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action 2021-08-09 10:27:53 -04:00
juliancoffee
4069a381c5 Make Frenzied buff again 2021-08-09 13:05:00 +03:00
Treeco
a48fa0f349 Buff swim thrust for humans reduce gains from skillpoints 
This is intended to give a swim speed of 4.7 m/s when unskilled, and 7.2 when skilled
However, this turns out to be horrifically fps-dependant, both after this branch and in master. Needs further research into fixes
This commit tunes it for 60 fps
 2021-08-09 10:06:16 +01:00
Treeco
2fc62bfe7f Make each race's hitbox and weight scale linearly with their height 
This causes all humanoids to handle identically when falling, gliding, or swimming
 2021-08-09 10:06:16 +01:00
Ludvig Böklin
ebf489984c Improve gliding 
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
 2021-08-09 10:06:16 +01:00
Ludvig Böklin
b667ba86f9 Fix mistake of pre-multiplying aerodynamic coefficients 
Increase glider zero-lift drag
 2021-08-09 10:06:15 +01:00
Samuel Keiffer
9bfd396c36 Merge branch 'ubruntu/relative-xp-curve' into 'master' 
XP reward curve modified for faster gain at lower levels

See merge request veloren/veloren!2706
 2021-08-08 03:34:57 +00:00
ubruntu
dca795e533 XP reward curve modified for faster gain at lower levels 2021-08-08 03:34:56 +00:00
juliancoffee
a7922336ea Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
Samuel Keiffer
2b10f818f5 Merge branch 'juliancoffee/pillar_fix' into 'master' 
Nerf pillars + Fix Beam ori

See merge request veloren/veloren!2732
 2021-08-07 16:35:24 +00:00
Illia Denysenko
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
Imbris
e99a885bfe Merge branch 'juliancoffee/asset_tweak_v2' into 'master' 
asset_tweak v2

See merge request veloren/veloren!2723
 2021-08-06 17:41:54 +00:00
juliancoffee
bdce07e7a0 Adress review, add test for structs 2021-08-06 13:04:01 +03:00
juliancoffee
c0f3dfe6bd Normalize masses in range 75-100. 
+ Remove match on body_type
 2021-08-06 11:57:42 +03:00
juliancoffee
4029d4a720 Change beam offsets 
* Make it so that beam starts from inside hitbox of owner.
Without it it's possible to cheese beem attack just making close enough
to its owner.
 2021-08-05 21:07:46 +03:00
juliancoffee
3386805765 Give TrainingDummy hitbox 2021-08-05 21:07:46 +03:00
juliancoffee
8a83ecf57f Fix Beam orientation, remove orientation_behavior 
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
 2021-08-05 21:07:46 +03:00
Ludvig Böklin
cbd7c4481c Make character upright itself even while idle 2021-08-05 08:34:21 +02:00
Samuel Keiffer
92b32b4c36 Merge branch 'ygor/fix-axe-energy-reward' into 'master' 
Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722
 2021-08-05 00:38:41 +00:00
Joshua Barretto
665951946f Fixed block snapping 2021-08-04 14:12:10 +01:00
Joshua Barretto
31a49d26a9 Added action timer system for agent code 2021-08-04 14:04:56 +01:00
juliancoffee
4766450258 Avoid negative bounds in harm checks 
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
 2021-08-03 18:57:53 +03:00
juliancoffee
5e6007db03 Return self-harm 2021-08-03 16:43:56 +03:00
juliancoffee
1efc3188ef Refactor projectile system 2021-08-03 16:43:55 +03:00
juliancoffee
497a94cd7a Post review refactoring 
* inline `target_dodging` into struct declaration as they are named
anyway
* move `avoid_harm` check out of `Attack::apply_attack` so we don't need
to pass whole Player component.
* another cosmetic things
 2021-08-03 16:43:55 +03:00
juliancoffee
7413e7fd11 Prettify aura system 2021-08-03 16:43:55 +03:00
juliancoffee
aaf2df19d4 Make Veloren compile again 2021-08-03 16:43:55 +03:00
juliancoffee
229e7b9cec Add CHANGELOG note about battle_mode setting 2021-08-03 16:43:54 +03:00
juliancoffee
61416faec3 Refactor Aura system, add avoid_harm flag 
+ fix bug where you cast OutOfGroup on yourself and your group
 2021-08-03 16:42:58 +03:00
juliancoffee
c7fdb640ac Cleaning 2021-08-03 16:42:58 +03:00
juliancoffee
7d4a8cbfa4 Add battle_mode server setting and player flag 2021-08-03 16:42:58 +03:00
juliancoffee
328e865ed3 Add asset_tweak macros 2021-08-03 16:31:13 +03:00
juliancoffee
2ce09af2d8 Remove redundant serial_test crate 2021-08-03 16:31:13 +03:00
juliancoffee
30ebf04e96 Add ability to specify directory in asset_tweak 2021-08-03 16:31:13 +03:00
juliancoffee
99d0c2cb95 Remove clone() for creating new tweak file 2021-08-03 16:31:13 +03:00
juliancoffee
846233367f Introduce helper functions and deduplicate docs 2021-08-03 16:31:13 +03:00
Ygor Souza
1b5c3883a4 Allow axe combo to reward energy without skillpoint 
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
 2021-08-03 07:10:03 +02:00
Joshua Barretto
45f94b0bce Better Agent API 2021-08-02 13:08:39 +01:00
Ludvig Böklin
400734cc0a Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Joshua Barretto
f51c4ed860 Merge branch 'zesterer/menacing' into 'master' 
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
 2021-08-01 00:27:02 +00:00
Imbris
97e5ad02ff Merge branch 'imbris/stamina-energy' into 'master' 
Replace stamina with energy

Closes #1214

See merge request veloren/veloren!2704
 2021-08-01 00:26:59 +00:00
Joshua Barretto
da691cbf60 Merge branch 'imbris/small-fix' into 'master' 
Fix typo in log message and remove prefixed '_' from a few used variables

See merge request veloren/veloren!2703
 2021-07-31 21:54:25 +00:00
Joshua Barretto
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Imbris
3ddbb0a5fb Merge branch 'mohs/refactoring_character_behavior' into 'master' 
reducing complexity of character_behavior's run method by extracting logical pieces.

See merge request veloren/veloren!2697
 2021-07-31 02:47:55 +00:00
Imbris
119c72f5d8 Fix typo in log message and remove prefixed '_' from a few used variables 2021-07-30 22:10:12 -04:00
Thomas Kosel
2bf8a8c55c
improving code quality by removing superfluous & 2021-07-30 10:12:20 +02:00
Monty Marz
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Thomas Kosel
3735688e4c
changing <Sys> to Self to be a little more speaking and less riddles. 2021-07-29 23:14:46 +02:00
Thomas Kosel
005c33bb28
renaming methods to match the names of the methods called within 2021-07-29 22:55:58 +02:00
Thomas Kosel
0b07b14093
moving CharacterState interpreting methods to character_state.rs 2021-07-29 22:38:20 +02:00
Thomas Kosel
93045ba1ee
reducing complexity of character_behavior's run method by extracting logical pieces. 2021-07-29 20:09:31 +02:00
Imbris
6b54bedcd0 Merge branch 'imbris/1002-fix' into 'master' 
Add comment to physics and replace magic number in climbing boost with a named...

Closes #1002

See merge request veloren/veloren!2694
 2021-07-29 17:46:14 +00:00
Imbris
9fb6b84670 Merge branch 'juliancoffee/hud_refactor' into 'master' 
Skillbar hud refactoring (+ shortened key names)

See merge request veloren/veloren!2663
 2021-07-29 16:08:56 +00:00
Imbris
01d1089a46 Add comment to physics and replace magic number in climbing boost with a named constant, fixes #1002 2021-07-29 03:11:44 -04:00
Marcel
680492cea6 Merge branch 'juliancoffee/entity_refactor' into 'master' 
Improve terms of EntityConfig and LoadoutBuilder

See merge request veloren/veloren!2688
 2021-07-28 23:19:04 +00:00
Ben Wallis
01ca6911a9 * Pets are now saved on logout and spawned with the player on login 
* Pets now teleport to their owner when they are too far away from them
* Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed
* Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID
* Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to
* Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
 2021-07-28 22:36:41 +00:00
Thomas Kosel
c8527491cc
#918 reverting wrongly merged inventory related changes. 2021-07-28 21:13:09 +02:00
juliancoffee
4adc045627 Added comments on PositionSpecifier usage 2021-07-28 20:03:23 +03:00
juliancoffee
14ac9a8b4e Improve terms of EntityConfig and LoadoutBuilder 
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
 2021-07-28 19:19:10 +03:00
juliancoffee
1bdab02aad Deduplicate bar text 2021-07-28 10:33:51 +03:00
Thomas Kosel
acb7f5dc4b
#918 remove usages of .restrict_mut() from character_behavior.rs 2021-07-27 23:34:16 +02:00
Thomas Kosel
27f666622f
#918 remove usages of .restrict_mut() from mount.rs and stats.rs 2021-07-27 22:22:39 +02:00
Sam
f164d6036e Made swapping equipped weapons a server event instead of being called in common to prevent server-client desyncs. 2021-07-25 18:30:17 -05:00
Joshua Barretto
199d56b1db Fix block-hopping with strangely sized blocks 2021-07-25 20:03:17 +01:00
Imbris
1a081cdc5b Merge branch 'james/map-ui' into 'master' 
Reduce number of map layers and remove unneeded alpha channel

See merge request veloren/veloren!2676
 2021-07-25 17:24:50 +00:00
Avi Weinstock
edad38098f Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions" 
This reverts commit 0247ae2bf6.
 2021-07-25 12:29:21 -04:00
Avi Weinstock
516ad1c772 Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" 
This reverts commit 63eff216f0.
 2021-07-25 12:28:25 -04:00
Jonathan Berglin
cd2992afd3 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
James Melkonian
54eb97b9de Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07:00
Joshua Barretto
37077b5703 Merge branch 'Resolve-unused-clippy-supressions' into 'master' 
Resolve unused clippy supressions

See merge request veloren/veloren!2673
 2021-07-24 20:44:06 +00:00
Dr. Dystopia
db48e30ea1 Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions 2021-07-24 20:22:05 +02:00
Dr. Dystopia
f039321cd7 Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-24 20:19:16 +02:00
Dr. Dystopia
c577a7d677 Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions 2021-07-24 20:04:52 +02:00
Dr. Dystopia
575db6f51d Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions 2021-07-24 20:01:11 +02:00
Joshua Barretto
6fa3ac610b Merge branch 'aweinstock/fix-waypoint-2' into 'master' 
Further improve handling of underground waypoints:

See merge request veloren/veloren!2665
 2021-07-24 17:59:58 +00:00
Avi Weinstock
5dd56b724c Rename find_space_opt to try_find_space. 2021-07-24 13:09:10 -04:00
Samuel Keiffer
85b9f70469 Merge branch 'knightresspaladin/fix-circle-charge' into 'master' 
Fixed CircleCharge and buffed Rugged Hide droppers

See merge request veloren/veloren!2613
 2021-07-23 14:56:36 +00:00
Avi Weinstock
ca10d89068 Further improve handling of underground waypoints: 
- Set the waypoint to the valid position after chunk load, so that respawns work.
- Search for the nearest valid surface before falling back to the top of the chunk, so that waypoints inside caves/buildings work.
 2021-07-22 23:03:52 -04:00
Marcel Märtens
baf19b4d60 remove an unused queue_created in the Queue, might be added in the future again for more metrics. Also use core than std in one place 2021-07-22 20:57:16 +02:00
Marcel Märtens
7d93d907f6 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
Knightress Paladin
7ce9a3e284 Removed exhausted check from BasicAura and reformat max call 2021-07-21 20:20:27 -07:00
Knightress Paladin
c48a7c0072 Used integer types to store combo values 2021-07-21 16:46:26 -07:00
Knightress Paladin
578cacc194 Relocated BasicAura's combo reading to its static data 2021-07-21 16:46:26 -07:00
Knightress Paladin
9be690770a Added check to prevent heal aura from being negative 2021-07-21 16:46:26 -07:00
Knightress Paladin
ce31ac9fd1 Added exhaustion check to BasicAura to try to prevent repeated casts 2021-07-21 16:46:26 -07:00
Knightress Paladin
68725a0131 Added check for 0 combo in healing aura strength equation 2021-07-21 16:46:26 -07:00
Dr. Dystopia
9abd066e53 Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Knightress Paladin
081c6e5362 Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07:00
Imbris
d2b8a5a169 Fix check before calculating entity pushback, was causing a NaN and probably other bugs 2021-07-19 01:31:40 -04:00
Imbris
3e6fd0ee1d Setup animation mount points for quadruped medium, update offsets in 
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
 2021-07-18 15:09:36 -04:00
Imbris
b2bf83e200 Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs 2021-07-18 15:04:02 -04:00
Snowram
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Jonathan Berglin
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Samuel Keiffer
37147e2a83 Merge branch 'juliancoffee/overworld_assetization' into 'master' 
Wildlife assetization

See merge request veloren/veloren!2591
 2021-07-18 13:43:32 +00:00
Joshua Barretto
1501f0467e Merge branch 'zesterer/small-fixes' into 'master' 
Fixed handling of orientation changes for airships

See merge request veloren/veloren!2640
 2021-07-18 08:29:50 +00:00
Imbris
30119a6afc Re-address approx_constant lint without using fractional constants and 
re-add a few blank lines
 2021-07-17 20:41:09 -04:00
Joshua Barretto
eade248e1f Fixed handling of orientation changes for airships 2021-07-18 01:13:36 +01:00
Imbris
9c72333741 Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
juliancoffee
021d5c60de Add test for duplicates in EntityConfig::meta 
+ make tests cleaner
 2021-07-17 15:37:31 +03:00
juliancoffee
23a020f602 Add Automatic NameKind to EntityConfig 
+ add animal entities for wildlife spawns
 2021-07-17 15:37:31 +03:00
juliancoffee
d04364b1f1 Replace EntityConfig main/second_tool with hands 
+ Check equip_slot can hold item in LoadoutBuilder
 2021-07-17 15:37:31 +03:00
juliancoffee
1d2ea717ab Move builder assets in EntityConfig to meta field 2021-07-17 15:37:31 +03:00
juliancoffee
6403ee0634 Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
juliancoffee
7401d74aa6 Add wildlife assetization support 
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
 2021-07-17 15:37:30 +03:00
juliancoffee
d920f911a2 Add Exact body field for EntityConfig 
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
 2021-07-17 15:37:30 +03:00
Imbris
eb999b2821 Merge branch 'aweinstock/fix-waypoint' into 'master' 
Spawn players aboveground when using `/site` or when their waypoint is underground.

See merge request veloren/veloren!2612
 2021-07-16 23:18:33 +00:00
Avi Weinstock
a4d6f0f3c1 Address MR 2612 review comments. 2021-07-16 17:46:48 -04:00
Samuel Keiffer
f38cde9d40 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
 2021-07-16 21:32:03 +00:00
Avi Weinstock
c417e8c5b9 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00
Marcel
0492b8dc87 Merge branch 'savalige/ai_spacing' into 'master' 
Issue #1153 - Improve combat AI spacing between Agents of the same Alignment

Closes #1153

See merge request veloren/veloren!2451
 2021-07-16 16:40:27 +00:00
Jonathan Berglin
b88c23e74f Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Avi Weinstock
9e9cbd290b cargo fmt 2021-07-15 15:52:10 -04:00
Savalige
171113ea74 Added a spacing_radius method to body to make it possible to sett different spacing for different entities 2021-07-15 13:33:51 -04:00
Jonathan Berglin
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Marcel
f05fc79fe2 Merge branch 'juliancoffee/forgiving_travellers' into 'master' 
AI small fixes

See merge request veloren/veloren!2598
 2021-07-15 08:15:25 +00:00
Dr. Dystopia
4d96d6f9a0 Resolve all '#[allow(clippy::neg_multiply)]' error supressions 2021-07-14 22:18:30 +02:00
juliancoffee
d42c7be141 Teach AI how to interact in this evil world 2021-07-14 19:26:12 +03:00
juliancoffee
b6460f6c61 Teach AI how to forgive 2021-07-14 19:26:11 +03:00
juliancoffee
59e9fc6530 Agent code refactoring 
0) extracting code branches to closures
1) make RTSim remember target, even if they can't speak about it
2) make only RTSim Ships constantly flying (and not every flying RTSim)

You can tame RTSim Phoenix, yay
 2021-07-14 14:55:50 +03:00
holychowders
f316f1da60 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
Marcel Märtens
468cfe84e7 clippy fixes in tests 2021-07-12 13:35:26 +02:00
Marcel Märtens
db8aedd363 fmt after applying clippy fixes after toolchain update 2021-07-12 12:09:27 +02:00
Marcel Märtens
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
Sam
be8b12845a Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
Knightress Paladin
146f86be2c Removed references to Healing Beam, which Healing Aura is replacing 2021-07-10 21:39:11 -07:00
Sam
fbcc774911 Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future. 2021-07-10 23:22:00 -05:00
Knightress Paladin
b96bb6fc5d Added combo scaling to healing aura and allowed cultists to use it 2021-07-10 20:02:36 -07:00
Knightress Paladin
b4ec433509 Add healing aura for sceptre M2 2021-07-10 20:02:35 -07:00
Benoît du Garreau
286037166a Update wasmer 2021-07-10 15:06:51 +02:00
Samuel Keiffer
351a68944b Merge branch 'juliancoffee/skill_truth' into 'master' 
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
 2021-07-09 23:05:48 +00:00
Samuel Keiffer
32c2807ee0 Merge branch 'swrup/fix_melee_hit_count_increment' into 'master' 
fix melee hit_count increment

See merge request veloren/veloren!2574
 2021-07-09 16:17:51 +00:00
swrup
02151417f2 fix melee hit_count increment 2021-07-09 16:17:51 +00:00
Knightress Paladin
c5c89e8662 Added check to prevent melee leaps from stalling in liquids 2021-07-08 23:52:00 -07:00
Swrup
a8579670cf make apply_attack() return if attack was actually applied 2021-07-08 21:05:32 +02:00
Marcel Märtens
98800c5424 update depednencies 2021-07-08 12:21:02 +02:00
Dominik Broński
e6af005ed1 Merge branch 'pfau/stuff' into 'master' 
Minimap modes, Danari customizations update & bald hairstyles

See merge request veloren/veloren!2576
 2021-07-08 00:01:09 +00:00
Monty Marz
7c8d73a0c6 Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
juliancoffee
066e0a0323 Revert non-ui code changes 2021-07-07 17:53:17 +03:00
juliancoffee
034b032954 Add tests 2021-07-07 17:51:30 +03:00
juliancoffee
274acae939 Move skill boost modifiers to skills module 2021-07-07 17:51:30 +03:00
Sam
509461763b Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive. 2021-07-06 22:54:23 -05:00
Samuel Keiffer
01a8f53ba3 Merge branch 'aweinstock/improve-airship-pid' into 'master' 
Fix integral error calculations in PID controller, and change coefficients for...

See merge request veloren/veloren!2568
 2021-07-06 21:38:07 +00:00
Samuel Keiffer
e5a5d28246 Merge branch 'sam/range-stat' into 'master' 
Added range stat to weapons.

See merge request veloren/veloren!2563
 2021-07-06 21:18:47 +00:00
Avi Weinstock
1a60ebd5db Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon. 2021-07-06 16:52:12 -04:00
Sam
1c3bd13afa Addressed review comments. Removed individual stat assignments. 2021-07-06 15:27:49 -05:00
Sam
e8e953ffab Added range stat to weapons. 2021-07-05 20:32:12 -05:00
Benoît du Garreau
110b9742b7 Add a feature to optionnally disable hot-reloading 2021-07-06 00:27:09 +02:00
Marcel
572a41b029 Merge branch 'juliancoffee/trade_rebalancing' into 'master' 
Make trade_pricing great again

See merge request veloren/veloren!2546
 2021-07-05 21:40:58 +00:00
juliancoffee
15d83e65cc Remove load_expect_dir as it's misused 
- load_expect_dir while expected to fail on erros, fails only on
filesystem errors and only on root directory.
This commit replaces this function with `read_expect_dir` which returns iterator
which loads all files and panics if can't load them.
 2021-07-05 20:14:26 +03:00
juliancoffee
1e358e6f0c Make ItemEquality work 
+ Create own directory for trade_pricing `assets/common/trading`
+ Move fictive loot tables there
+ Mark sellable/non-sellable items in trade_pricing tests
 2021-07-05 19:55:08 +03:00
juliancoffee
f213ba138a Fill trade_pricing with craftable items 2021-07-05 15:43:03 +03:00
AldanTanneo
3804c3d032 Implemented trading stackable items with a full inventory 2021-07-05 10:34:03 +00:00
juliancoffee
d4c61ae2f3 (voxygen) Better support for multibuff items 
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
 2021-07-05 10:56:29 +03:00
juliancoffee
c538a9696c Use Food after Buildup 
+ Remove Saturation effect by rolling
+ Remove Saturation effect if interrupted with poise
+ Rename Potion to Drink, add ComplexFood
 2021-07-05 10:56:29 +03:00
Samuel Keiffer
21523de394 Merge branch 'sam/fix-roll' into 'master' 
Fix first person backwards roll.

See merge request veloren/veloren!2558
 2021-07-05 03:46:47 +00:00
Samuel Keiffer
1020fbe86a Merge branch 'sam/fix-health-buffs' into 'master' 
Fix interaction of max health and max health over time buffs causing infinite health scaling.

See merge request veloren/veloren!2557
 2021-07-05 03:46:45 +00:00
Sam
d8f68668b1 Addressed potential for divide by zero. 2021-07-04 22:00:13 -05:00
Sam
d2cb0c76a7 Fix first person backwards roll. 2021-07-04 21:54:38 -05:00
Sam
4ac9d9e0a5 Fix interaction of max health and max health over time buffs causing infinite health scaling. 2021-07-04 21:43:29 -05:00
Sam
4bc54e0287 Fix oob panic in combo melee which can happen during desyncs. 2021-07-04 20:54:08 -05:00
Marcel
5da8c70f48 Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master' 
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.

See merge request veloren/veloren!2542
 2021-07-04 17:23:53 +00:00
Marcel
f0f64a9fc0 Merge branch 'juliancoffee/fix_test_parse_ron' into 'master' 
Split asset_tweak tests to separate command

See merge request veloren/veloren!2552
 2021-07-04 17:14:14 +00:00
juliancoffee
33a37a8857 Run asset_tweak tests separately 
+ Make parse_all_ron_files_to_value panic-friendly. Remove unwraps
to unwrap_or_else with panic message.
 2021-07-04 19:31:57 +03:00
Ben Wallis
b499cf2c58 Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds. 
Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph.

This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
 2021-07-04 09:47:18 +00:00
Avi Weinstock
836f10ae63 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04:00
eckso
4f66bff54a Fix #1158 - Add a test that all the .ron manifests parse 2021-07-03 18:11:04 +00:00
Imbris
a9767c40d1 Merge branch 'aweinstock/networktracy' into 'master' 
Add some tracy plots about network usage to the client.

See merge request veloren/veloren!2510
 2021-07-03 05:44:30 +00:00
Avi Weinstock
b4c2bc14df Deduplicate data involved in sprite harvesting, making it harder to make mistakes with. 2021-07-02 15:23:19 -04:00
Marcel
c751ec1381 Merge branch 'aweinstock/blockstats' into 'master' 
Add block statistics generator to world/examples.

See merge request veloren/veloren!2526
 2021-07-02 17:10:26 +00:00
Avi Weinstock
c2106e158f Use approximate byte count for the terrain recv graph. 2021-07-02 12:43:34 -04:00
Avi Weinstock
f9c263faf6 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
Samuel Keiffer
099ddea165 Merge branch 'juliancoffee/dungeon_rebalance' into 'master' 
Make cultist great again

See merge request veloren/veloren!2513
 2021-07-01 02:37:39 +00:00
Avi Weinstock
110aa17642 Fix underwater campfires. 2021-06-30 18:36:43 -04:00
Ben Wallis
398b658524 Merge branch 'juliancoffee/better_item_tests' into 'master' 
More informative item tests

See merge request veloren/veloren!2534
 2021-06-30 20:12:21 +00:00
juliancoffee
d92d54f8ad Better error signaling in assets::load_dir_expect 2021-06-30 21:06:06 +03:00
juliancoffee
a3bf073875 Use assets::load_dir to test item assets 2021-06-30 18:48:28 +03:00
Joshua Barretto
269c6171e4 Merge branch 'DaforLynx/aeh' into 'master' 
Sfx fixes and new test

See merge request veloren/veloren!2529
 2021-06-30 11:43:01 +00:00
DaforLynx
a757bf3dbd Sfx fixes and new test 2021-06-30 11:43:00 +00:00
juliancoffee
c5da56e900 Nerf Husk Brute 
- Remove HuskBrute health level buff
- Make their attack slower
 2021-06-30 03:52:50 +03:00
juliancoffee
b9134a3f61 Make QuadMed great again 
- Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber
attack)
 2021-06-30 03:52:50 +03:00
juliancoffee
46772c67e3 Remove post-armor crit damage 2021-06-30 03:16:04 +03:00
juliancoffee
ef6a12edc2 bumb Biped Cultist armour 2021-06-30 02:10:39 +03:00
Sam
f5533cdb92 Moved match on ItemUseKind to create durations to a function under ItemUseKind. 2021-06-29 05:59:02 -05:00
Sam
8a9de26132 Food now applies buff at end of state. 
Rolling and poise states now cancel the potion buff.
UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state.
Rolling can no cancel item use.
Rolling now checks for move_dir instead of velocity.
 2021-06-29 05:59:02 -05:00
jshipsey
37c6fe9ee8 anims 2021-06-29 05:59:02 -05:00
Sam
9ff7ecea81 Item use now goes through use item character state if it is a consumable. 2021-06-29 05:59:02 -05:00
Sam
3559ce5803 Added UseItem character state. 2021-06-29 05:59:02 -05:00
Sam
1978b590aa Destringified consumables 2021-06-29 05:59:02 -05:00
Avi Weinstock
47b3b5e5d9 Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00
Snowram
aaf5f89076 Merge branch 'snowram/death-outcome' into 'master' 
Adds an outcome to death with SFX and VFX

See merge request veloren/veloren!2519
 2021-06-28 23:18:45 +00:00
Snowram
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Dr. Dystopia
11d2017bb3 Extract 'swap_equipment' and 'swap_armor' functions 2021-06-28 16:17:18 +02:00
Marcel
f063dcd939 Merge branch 'alphyr/assets_manager0_5' into 'master' 
Update `assets_manager` to 0.5

See merge request veloren/veloren!2501
 2021-06-27 15:50:16 +00:00
Snowram
b477eac816 Merge branch 'juliancoffee/fix_dismantle' into 'master' 
Improve Dismantle UX

See merge request veloren/veloren!2498
 2021-06-27 00:11:01 +00:00
juliancoffee
681fd37429 style 2021-06-27 02:44:19 +03:00
juliancoffee
12243bd0c0 Add is_recycling field to recipe book 2021-06-26 21:37:13 +03:00
Daan Vanoverloop
0076b8379c Fixing #1169 - use strum macros for BlockKind conversion 2021-06-26 17:52:32 +02:00
Benoît du Garreau
1cba7db9b6 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Justin Shipsey
f983295318 Merge branch 'swilliams/jewellery' into 'master' 
Gem Rings and small change to trading.

See merge request veloren/veloren!2500
 2021-06-26 02:44:04 +00:00
Scott Williams
8d0a1ad7b4 Gem Rings and small change to trading. 2021-06-26 02:44:02 +00:00
Joshua Barretto
768e1c0d31 Merge branch 'aweinstock/site2dungeon' into 'master' 
Convert dungeons to site2.

See merge request veloren/veloren!2499
 2021-06-25 23:06:24 +00:00
Snowram
379e755006 Increases base damage of husk attack, rename some cultist weapons 2021-06-25 21:18:28 +02:00
Avi Weinstock
19979413d5 Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings. 2021-06-24 23:03:24 -04:00
Snowram
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
d7f25627ab Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
8760b69345 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4 Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0 Adds new species 2021-06-24 19:29:44 +02:00
Sam
645cc60dc0 Balance tweaks. 2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397 Added sparseness field to sprite summon. 2021-06-23 22:38:16 -05:00
Sam
68c6a0a495 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
aac24ad601 Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555 3 attack anims done 2021-06-23 22:38:16 -05:00
Sam
879aafad5c 3 attacks done 2021-06-23 22:38:16 -05:00
Avi Weinstock
c6bb61f2e6 Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances. 2021-06-23 23:22:14 -04:00
jshipsey
81aaf30d00 stride speed backwardd-dependence 2021-06-22 22:08:34 -04:00
Dominik Broński
8356e2ffca Merge branch 'aweinstock/lava' into 'master' 
Lava

See merge request veloren/veloren!2482
 2021-06-21 20:49:44 +00:00
Joshua Barretto
e930ff6779 Sanitise controller inputs 2021-06-21 21:13:49 +01:00
Joshua Barretto
90e5bac395 Made movement slower when strafing in non-forward directions 2021-06-21 20:32:20 +01:00
Joshua Barretto
288f2c13d4 Enable strafing in first-person mode 2021-06-21 13:27:19 +01:00
Marcel
ec7d3b5e37 Merge branch 'swilliams/give_item_fix' into 'master' 
Fix for Issue 1210

See merge request veloren/veloren!2484
 2021-06-20 23:26:59 +00:00
Marcel
b0574b4ddc Merge branch 'imbris/tracy' into 'master' 
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request veloren/veloren!2479
 2021-06-20 23:17:08 +00:00
Scott Williams
80c45b6396 Added another .replace 2021-06-20 22:55:58 +01:00
Avi Weinstock
0f9181cbcb Address MR 2482 comments. 
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
 2021-06-20 11:32:05 -04:00
Avi Weinstock
f1a1160b80 Make lava solid w.r.t. rendering while still being liquid w.r.t. physics. 2021-06-19 16:52:21 -04:00
Avi Weinstock
2226a4c6a9 Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode. 2021-06-19 16:31:21 -04:00
Samuel Keiffer
e7f54d6306 Merge branch 'juliancoffee/clay_golem_tweak' into 'master' 
clay golem tweak

See merge request veloren/veloren!2478
 2021-06-19 14:49:11 +00:00
Imbris
659b42e813 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
Imbris
2bb91e8d7d Fix span macros by putting cfgs outside the macro (they are evaluated in the crate where the macro is used), add shorthand for common case of prof_span macro, add some spans to the client code and spiff bits of it 2021-06-19 04:27:50 -04:00
juliancoffee
57649a2e90 tweak clay_golem HP 2021-06-19 10:47:45 +03:00
Samuel Keiffer
2abd23ec64 Merge branch 'juliancoffee/not_explodable_sprites' into 'master' 
Proof of concept non-explodable sprites

See merge request veloren/veloren!2475
 2021-06-19 01:10:20 +00:00
Samuel Keiffer
0b8039c3b0 Merge branch 'juliancoffee/trade_pricing_refactor' into 'master' 
Refactor trade_pricing.rs

See merge request veloren/veloren!2469
 2021-06-19 01:10:16 +00:00
juliancoffee
384409a1ed Load ori_rate for BasicBeam from assets 
+ make fire turret ori_rate slower
 2021-06-18 22:33:00 +03:00
juliancoffee
9a5f749bc7 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
Joshua Barretto
46dfc119fb Merge branch 'aweinstock/tighten_e2t' into 'master' 
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.

See merge request veloren/veloren!2460
 2021-06-18 16:27:20 +00:00
Joshua Barretto
05c375a8b0 Merge branch 'zesterer/meta' into 'master' 
Optimising for size

See merge request veloren/veloren!2468
 2021-06-18 12:35:16 +00:00
Joshua Barretto
747ef50a58 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
0265da1074 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
Joshua Barretto
bb6e8582a6 Merge branch 'zesterer/no-cmd-santisation' into 'master' 
Made dealing with chat vs commands safer for clients, made /alias require moderator permissions

See merge request veloren/veloren!2472
 2021-06-18 10:55:57 +00:00
Joshua Barretto
294b6e394a Renamed command event 2021-06-18 11:31:06 +01:00
juliancoffee
288a7a020b Proof of concept non-explodable sprites 2021-06-18 13:10:27 +03:00
DaforLynx
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
Joshua Barretto
0067cea560 Made /alias moderator-only 2021-06-17 19:55:46 +01:00
Joshua Barretto
96cbf60c3f Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
juliancoffee
ff27c550d1 clippy & code cleaning & test diagnostic 
- add clippy::pedantic
- move internal functions to methods/functions
- rename one-letter variables
- use tuple pattern matching instead of indexing
- make print_sorted fancier, also show prices on `.other` entries
 2021-06-17 19:10:55 +03:00
DaforLynx
9a5b95bc16 Added npc hurt sfx 2021-06-17 05:49:09 +00:00
jshipsey
a42e6e20b8 basilisk tweaks 2021-06-16 23:28:25 -04:00
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Joshua Barretto
e3c44ba7fe More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
fb51fd3230 Emit sound from head 2021-06-16 17:23:22 +01:00
Joshua Barretto
0ef29a6989 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
559311e1b0 Chasing sounds 2021-06-16 17:23:22 +01:00
Avi Weinstock
96ffae4387 Address MR 2460 comments. 
- Switch from point query to AABB query to take into account block thickness.
 2021-06-15 22:52:02 -04:00
Avi Weinstock
5e6363dbcc Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04:00
Snowram
8351aab25d Addresses comments about roc AI 2021-06-15 09:50:23 +02:00
Snowram
f2c7836161 Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
3ba0500b90 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Imbris
11994b5735 Merge branch 'imbris/userdata-tweak' into 'master' 
Fallback to executable strategy for the userdata rather than panicking when...

See merge request veloren/veloren!2445
 2021-06-15 03:22:51 +00:00
Samuel Keiffer
fec328a617 Merge branch 'juliancoffee/swing_fix' into 'master' 
Introduce hit_timing for combo_melee

See merge request veloren/veloren!2426
 2021-06-15 02:38:23 +00:00
Imbris
6fe3a3c77f Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder 2021-06-14 21:42:50 -04:00
Avi Weinstock
c5f82b241d Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller. 2021-06-14 13:39:50 -04:00
Marcel
1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' 
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
 2021-06-14 14:42:01 +00:00
Marcel
4cafdb3bfd Merge branch 'aweinstock/mining-skill-tree' into 'master' 
Mining skill tree.

See merge request veloren/veloren!2406
 2021-06-14 14:19:06 +00:00
Marcel
b0702d792a Merge branch 'juliancoffee/asset_entity' into 'master' 
EntityInfo assetization.

See merge request veloren/veloren!2382
 2021-06-14 12:56:28 +00:00
juliancoffee
d5cbe27612 Responding to review 
- make `skillset_builder::Preset` void enum and left comment about how to
extend it
- add `.with_default_equipment()` in case if preset is missing to `basic_summon`
loadout creation to match old `build_loadout()` behaviour
 2021-06-14 15:40:02 +03:00
Avi Weinstock
1af9ac568f Move force-movement e2e check so that it doesn't confer immunity to arrows. 2021-06-13 20:38:03 -04:00
Monty Marz
068d78bae8 Merge branch 'pfau/cactus_drink' into 'master' 
Cactus Colada

See merge request veloren/veloren!2431
 2021-06-13 20:03:58 +00:00
Avi Weinstock
9d4a65e8ac Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
Marcel Märtens
34f5ff62d4 implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling 2021-06-13 17:42:28 +02:00
Marcel Märtens
e2a9128976 redo slowjobs in order to have a try_run fn 2021-06-13 17:42:21 +02:00
Marcel Märtens
5f2b44002e make test less flanky, try to avoid absolute comparisions and compare jobs relative. 2021-06-13 17:31:34 +02:00
Monty
c17e3ad996 Cactus Colada 
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
 2021-06-13 13:52:56 +02:00
Ben Wallis
f47838ee9d Improved inventory swap 2021-06-12 19:06:39 +01:00
Avi Weinstock
d02ff2db20 Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
juliancoffee
62eaabfe88 Introduce hit_timing for combo_melee 
bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing
poise damage of hammer from 25 to 20
 2021-06-12 14:10:19 +03:00
Marcel Märtens
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Joshua Barretto
1b1287f407 Repaired common such that it works for plugin targets 2021-06-11 08:33:32 +01:00
Scott Williams
f336b0e2a8 Fixed biped_small and humanoid hitboxes 2021-06-09 15:23:10 +01:00
juliancoffee
057aa7fecf Move loot tables to entityconfigs 
* Moved all entities in dungeons to assets
 2021-06-09 15:37:04 +03:00
juliancoffee
a4cc1e24ee Move body to EntityConfig assets 
* currently works only for random and random_with, uses FromStr for
NpcKind
 2021-06-09 15:37:04 +03:00
juliancoffee
0c9f05b8d1 Load skillsets from assets 
Done:
    support loading from assets in skillset_builder.rs
    entity_config field with skillset asset field
    move every SkillSet config to assets
    tests for skillset assets
    tests for assets in entity configs
 2021-06-09 15:37:04 +03:00
juliancoffee
37af73b19e SkillSetBuilder pre-refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
c3a120c551 Post refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
45e5554ff5 Fix issue with villagers not having any item 2021-06-09 15:37:04 +03:00
juliancoffee
171c66d53d docs 2021-06-09 15:37:04 +03:00
juliancoffee
f5bf991eb0 Start to load EntityInfo from assets in dungeons 
* All enemies in dungeons are now specify loadout_config, name and
main_tool in assets
* Add more variance to the enemies names
 2021-06-09 15:37:04 +03:00
juliancoffee
5f3eaddb70 Split LodoutBuilder::build_loadout 
LoadoutBuilder::build_loadout is a function which has four parameters
and 3 of them are Option<>, and although fourth (body) isn't Option<>,
it's optional too because it is used only in some combinations of
another arguments.

Because these combinations produces quirky code flow, it will be better
to split it to different methods.

So we did following changes to remove it and rewrite code that was using it
to use better methods.

* Introduce LoadoutPreset as new LoadoutConfig, currently it's only used
in Summon ability, because SummonInfo uses Copy and we can't specify
String for specifying asset path for loadout.
Everything else is rewritten to use asset path to create loadouts.

* More builder methods for LoadoutBuilder.
Namely:
    - from_default which is used in server/src/cmd.rs in "/spawn" command.
    - with_default_equipment, with_default_maintool to use default
    loadout for specific body
    - with_preset to use LoadoutPreset

* Add new make_loadout field with `fn (loadout_builder, trading_info) -> loadout_builder`
to EntityInfo which allows to lazily construct loadout without
modifying LoadoutBuilder code

* Fix Merchants not having trade site
We had heuristic that if something has Merchant LoadoutConfig - it's
merchant, which can be false, especially if we create Merchant loadout
lazily
As side note, we do same check for Guards and it fails too.

Too fix it, we introduce new agent::Mark, which explicitly specifies
kind of agent for entity

* `LoadoutBuilder::build_loadout` was written in a such way that depending
on main_tool you will have different loadout. Turns out it was this
way only for Adlets though and this behaviour is reproduced by specifying
different loadouts directly in world code.
 2021-06-09 15:37:04 +03:00
juliancoffee
aad65c6159 Move traveler loadout declaration to asset 
* New loadout/world/traveler.ron file to specify traveler loadout
* LoadoutBuilder::with_asset_expect now can use passed rng to choose
items
 2021-06-09 15:37:03 +03:00
juliancoffee
e153cbe20e Rename LoadoutBuilder::apply_asset_expect 
to LoadoutBuilder::with_asset_expect
 2021-06-09 15:37:03 +03:00
juliancoffee
102f6d3338 EntityInfo assetization 
* Rename skillset_config to skillset_preset
* Rename loadout_config to loadout_preset
* Add skillset_config for asset_specifier of skillset
* Add loadout_config for asset_specifier of loadout
 2021-06-09 15:37:03 +03:00
juliancoffee
e832fa86f1 Add entity template and make 'loadouts' singular 2021-06-09 15:37:03 +03:00
Marcel
875b26a93a Merge branch 'aweinstock/recipe-graphviz' into 'master' 
Add graphviz diagram generator for crafting recipes.

See merge request veloren/veloren!2401
 2021-06-09 09:14:13 +00:00
Marcel
ee5d55f773 Merge branch 'swilliams/collision-balance' into 'master' 
NPC Hitbox Adjustments

See merge request veloren/veloren!2403
 2021-06-09 08:08:44 +00:00
Scott Williams
2a161abd0a NPC Hitbox Adjustments 2021-06-09 08:08:41 +00:00
juliancoffee
1dd621a56f serialize AssetTweakWrapper<T>, not just T 
asset_tweak::tweak_expect_or_create works by writing default data to
file and then read it as asset.
the problem is that it was writing T, and read AssetTweakWrapper<T>
which are different types.

Tests didn't handle case when you will load data back so bug was hidden.
 2021-06-08 22:39:51 +03:00
Avi Weinstock
b5ae6227c0 Run clippy for graphviz target in CI and add instructions on how to consume the output. 2021-06-08 15:08:14 -04:00
Avi Weinstock
b5b7de9532 Add graphviz diagram generator for crafting recipes. 2021-06-08 14:42:51 -04:00
Marcel Märtens
37c508d05d add todo for clippy exception 2021-06-08 15:45:46 +02:00
juliancoffee
cb7a41c72d put serde behind feature gate 2021-06-08 14:03:15 +03:00
juliancoffee
df2c3a4950 Fix find_root() search in case if .git isn't dir 2021-06-08 13:34:46 +03:00
juliancoffee
8f86f474e8 place asset_tweak behind a feature 2021-06-08 13:34:41 +03:00
juliancoffee
3c34301947 More tests, support only assets/tweak directory 
- Use `serial_test` because tests can't run in parallel as both of them
are accessing fs.
- Take only filename, use hardcoded `assets/tweak` to keep it simple and
support .gitignore
 2021-06-08 13:31:27 +03:00
juliancoffee
7533f4d17b add asset_tweak_or_create that will create file 2021-06-08 13:31:27 +03:00
juliancoffee
8a157b8410 New tweak_expect fn to tweak values from .ron 
- Function to tweak values via temporary hot-reloaded .ron files
 2021-06-08 13:31:27 +03:00
Marcel
39ea9d3aa3 Merge branch 'xMAC94x/ci_bin_features' into 'master' 
Add bot tests to CI

See merge request veloren/veloren!2326
 2021-06-08 10:04:17 +00:00
Marcel
eecb561838 Merge branch 'slipped/meatfollowup' into 'master' 
various fixes to items

See merge request veloren/veloren!2399
 2021-06-08 09:57:31 +00:00
Christof Petig
b3956517fc suppress recipes with no cost 2021-06-08 09:17:04 +02:00
jshipsey
fe1cbec37c various fixes to items 2021-06-07 21:21:12 -04:00
Avi Weinstock
3cbf84ddb1 Restore collision data for airships, and add the test that would have caught this. 2021-06-07 18:09:09 -04:00
Marcel Märtens
7185dcee68 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
Marcel Märtens
846df3a18a --all-targets does not run targets that needs some features which are not provided. --all-features is NOT possible as we have some features which are conflicting. 
The only possibility is to manually add the features we need to check in CI to the clippy query
 2021-06-07 12:29:08 +02:00
Marcel
f2eedf81f4 Merge branch 'imbris/648-cleanup' into 'master' 
Make handling of shortcut keywords for commands clearer and revise a TODO...

Closes #648

See merge request veloren/veloren!2387
 2021-06-07 10:27:54 +00:00
Marcel Märtens
b1c2a1bde0 put ron behind a cargo feature as its only used in a bin and fix a logical merge conflict, overwriting with edfe713076 2021-06-07 11:13:55 +02:00
Sam
0488b2fcd0 Adressed comments on energy and armor functions. 2021-06-07 11:06:25 +02:00
Snowram
76ca99ece4 Derive str from Material, better deserialization 2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
0e269b59d7 tooltip work 2021-06-07 11:01:32 +02:00
Snowram
29a38e6d4f Split tags into material class and material 2021-06-07 11:00:57 +02:00
Snowram
3fa7d0b6d4 Add material and armor class tags 2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
05de96c94b ore deposits, flower drops 2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e cave changes 2021-06-07 10:59:44 +02:00
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
Sam
2a07fad802 Removed armor stat hackery. 
Added new armor stats to remaining armor items.
Fixed broken tests.
 2021-06-07 10:59:26 +02:00
Sam
fa0fe38699 Fixed csv tools 2021-06-07 10:58:47 +02:00
Sam
855384fbeb Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used. 2021-06-07 10:58:42 +02:00
Sam
c3b834ec15 Max energy stat functional. 2021-06-07 10:58:37 +02:00
Sam
6790b71d53 Energy recovery stat functional. 2021-06-07 10:58:32 +02:00
jshipsey
1b575a5a04 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
Marcel
27e505e79d Merge branch 'xMAC94x/log_spam' into 'master' 
XMAC94x/log spam

See merge request veloren/veloren!2385
 2021-06-07 07:55:27 +00:00
Imbris
0b92c72096 Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes 2021-06-06 23:45:51 -04:00
Marcel Märtens
26160df8e5 adjust tracing 2021-06-06 19:31:25 +02:00
Marcel
521e1eacf3 Merge branch 'aweinstock/add-models-20210603' into 'master' 
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371
 2021-06-06 16:56:21 +00:00