ccgauche
74ec5c652a
Added safety section to the EcsAccessManager
2021-02-23 13:58:07 +01:00
Marcel
2fbd382c91
Merge branch 'xMAC94x/physics_followup' into 'master'
...
physics followup, fix arrow problems
See merge request veloren/veloren!1811
2021-02-23 02:00:40 +00:00
Avi Weinstock
c3ac8a1b51
Support modular weapon voxel meshes being made by assembling their components.
2021-02-23 00:45:26 +00:00
ccgauche
387daf8aea
Change invalid message in examples and cleanup
...
Updated changelog + Removed hello plugin from plugins folder
2021-02-23 00:02:58 +01:00
ccgauche
267e7d8b4c
Finalized Retrieve API
2021-02-22 23:59:41 +01:00
Marcel Märtens
6008109413
physics followup, fix arrow problems by adding the vel_dt to the collision boundry
2021-02-22 23:51:01 +01:00
Vincent Glize
4f37c626ea
Optimize Entity <> Entity collision check by calculating a entity via sphere.
2021-02-22 12:36:42 +01:00
Justin Shipsey
1f88b87ca4
fix glider crash
2021-02-22 06:31:12 +00:00
Joshua Barretto
e2290783fc
Merge branch 'humanoid_ai_glide_when_falling' into 'master'
...
FIX #956 : Humanoid ai glide when falling
See merge request veloren/veloren!1772
2021-02-22 00:57:25 +00:00
Overblob
370259fe54
CI - Fix clippy errors
...
Fix trailing whitspace
2021-02-22 00:57:25 +00:00
Snowram
4078eeb877
Various fixes to object animation, cleanup
2021-02-21 19:56:46 +01:00
Snowram
f25b2b1500
Various fixes to beam, body based interp
2021-02-21 19:17:56 +01:00
Sam
11050a05ce
Beam particles now determined from beam segment rather than character state.
2021-02-21 19:17:56 +01:00
Snowram
e7bbf3981d
Object animation
2021-02-21 19:17:44 +01:00
Snowram
775224983b
Initial turret implementation
2021-02-21 18:23:54 +01:00
Samuel Keiffer
3cb6a5592d
Merge branch 'aweinstock/speed-floor-quickfix' into 'master'
...
Change the speed floor to `0.1` (avoiding a division by zero in modular...
See merge request veloren/veloren!1804
2021-02-21 02:49:57 +00:00
Avi Weinstock
3606490308
Change the speed floor to 0.1 (avoiding a division by zero in modular weapons accidentally buffed the Twitching Root).
2021-02-20 19:19:26 -05:00
Sam
f24490dc80
Added functionality for buffs queueing. Saturation now queues.
2021-02-20 17:13:17 -05:00
Avi Weinstock
c489d095df
Implement persistence for modular weapons.
...
This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search.
Squahed fixes:
- Fix some constraint violations that occurred when swapping inventory items.
- Comment out recipes for modular weapons.
- Make update_item_at_slot_using_persistence_key and is_modular more idiomatic.
- Add changelog entry.
- Document `defer_foreign_keys` usage.
2021-02-20 14:31:46 -05:00
Avi Weinstock
8bdbf4f7c9
Implement modular weapons.
...
- Add ItemKind::ModularComponent, Item::components.
- Add tool::StatKind::{Direct,Modular} for the modular weapons themselves.
- Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account.
- Crafting stores into the components field.
- Components/recipes/placeholders are created dynamically.
- Show which components a modular weapon contains in the tooltip in voxygen.
Squashed fixes:
- `Item::duplicate` components in `Item::new_from_item_def`.
- Speed of 1.0 for now.
2021-02-20 14:30:39 -05:00
Snowram
f78170704a
Allows some species to be immune to specific buffs
2021-02-20 14:03:15 +00:00
Samuel Keiffer
479cf9fc4e
Merge branch 'sam/dual-wielding' into 'master'
...
Dual wielding backend
See merge request veloren/veloren!1787
2021-02-20 05:12:17 +00:00
Sam
eaf3e02e39
Addressed comments
...
Fixed audio test
2021-02-19 19:55:23 -05:00
Sam
d5ccc33abc
Factored out duplicate code into closures, consolidated ability handling logic to a single function.
2021-02-19 18:45:48 -05:00
Sam
18309fe4c6
Added AbilityInfo struct to attack states
2021-02-19 17:30:24 -05:00
Sam
8f0cca074d
Dual wielding now uses skillbar abilities from multiple weapons.
2021-02-19 17:30:22 -05:00
Sam
f50fa25467
ItemConfig now stores AbilitySet directly instead of each individual ability.
2021-02-19 17:30:21 -05:00
Sam
fc01e9ea68
Handedness of weapons affects power and speed.
2021-02-19 17:30:21 -05:00
Sam
582c3f8459
Check for prerequisite skill in using an ability is no longer hardcoded.
2021-02-19 17:30:21 -05:00
Sam
341affdae2
Added hands field to all ron files of weapons.
...
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
2021-02-19 17:30:20 -05:00
Sam
d4f509b3d0
Added hands field onto weapons.
2021-02-19 17:30:20 -05:00
Avi Weinstock
559ad7b7f5
Client-side trade improvements.
...
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
2021-02-19 15:20:27 -05:00
Joshua Barretto
4d19308612
Merge branch 'lboklin/quat-ori' into 'master'
...
Redefine Ori as a quaternion
See merge request veloren/veloren!1755
2021-02-16 22:39:11 +00:00
Avi Weinstock
03d28f7d93
Implement tags for items, allowing a crafting recipe to take any item with that tag as input.
...
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
2021-02-16 01:05:54 +00:00
Avi Weinstock
c984035976
MR 1775 review fixes.
...
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
2021-02-14 11:13:56 -05:00
Avi Weinstock
ae528124fc
Trade implementation progress.
...
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
2021-02-12 18:43:09 -05:00
Avi Weinstock
e9b811b62b
Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement.
2021-02-12 18:43:09 -05:00
Quellus
63952875d9
Rebase !1447 Chat input color and icon reflect channel message is sent to.
2021-02-10 19:42:59 +00:00
Ludvig Böklin
74badd3dbd
Add note about to_quat() being a cheap copy operation
2021-02-10 17:35:20 +01:00
Ludvig Böklin
990198cd87
Don't test Dir->Ori correctness because it will fail from floating point errors
2021-02-09 15:44:12 +01:00
Ludvig Böklin
065e260e78
Code quality
2021-02-09 14:06:27 +01:00
Ludvig Böklin
582ddfc3cd
Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot
2021-02-09 13:52:03 +01:00
Sam
e033fe6bee
Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.
2021-02-08 13:55:50 -05:00
Sam
1c83c5ee6f
Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.
2021-02-08 12:31:17 -05:00
Sam
f026aeb2dc
Server events directly emitted in states now.
2021-02-08 12:01:48 -05:00
Sam
6a1e583d45
Eradicated clones
2021-02-08 12:01:48 -05:00
Sam
8eebcdfcd2
Inventory changes that modify the loadout now go through a control action instead of a control event.
2021-02-08 12:01:47 -05:00
Ludvig Böklin
46750880eb
Add Plane type, Projection trait, fix upright() and add doc tests
2021-02-07 17:16:15 +01:00
Sam
252e421692
Roll is no longer free.
2021-02-06 15:20:08 -05:00
Ludvig Böklin
a1ff9ab83f
Redefine Ori as a quaternion
2021-02-05 09:33:14 +01:00
Pascal Fuhrmann
9f7637ab21
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
Sam
be8df9aef6
Addressed comments.
2021-02-02 16:08:09 -05:00
Sam
af982ec0bb
Changed knockback to be an effect on the overall attack, rather than a damage.
2021-02-02 13:07:07 -05:00
Sam
17d1432be0
Outcomes now correctly read if an attack had any healing components.
2021-02-02 13:07:06 -05:00
Sam
5c16b0b532
Explosions now use attacks.
2021-02-02 13:07:06 -05:00
Sam
7675e53740
Shockwaves now use attacks.
2021-02-02 13:07:05 -05:00
Sam
edcfcc31f6
Attacks can now deal poise damage.
2021-02-02 13:07:04 -05:00
Sam
fdef168e82
Beams now use Attack, with limited functionality in some cases.
2021-02-02 13:07:03 -05:00
Sam
59ce8c6843
Projectiles now use attacks.
2021-02-02 13:06:57 -05:00
Sam
2690e9caa1
Applied basic functionality of attack-effects system to melee.
2021-02-02 13:06:32 -05:00
Sam
d3b75df76f
Changed name of Attacking comp to MeleeAttack
2021-02-02 13:06:31 -05:00
Sam
78a2459e6d
Changed knockback from an enum to a struct.
2021-02-02 13:06:30 -05:00
Pascal Fuhrmann
f4deb08a40
fixing #944 - LeapMelee fall damage fix & adjustments
2021-02-02 16:51:04 +00:00
James Melkonian
23b1df3cdd
Add basic NPC interaction and fix NPC chat spamming
2021-01-31 20:29:50 +00:00
jiminycrick
ea13f75427
Quick poise fix
2021-01-29 15:52:40 -08:00
jiminycrick
a02444825d
Address some comments
...
Eliminated extra stagger state
Responding to more comments
Move poise character state changes to character behavior system
Move poise out of JoinTuple/Data
Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
jiminycrick
46c8c744fa
Add migration for starter gear
2021-01-28 17:22:39 -08:00
jshipsey
d456271921
animal stuns
...
Fix rebase
2021-01-28 17:22:39 -08:00
jiminycrick
661764f4aa
Some preliminary balancing
...
Fix rebase
2021-01-28 17:22:39 -08:00
jshipsey
29732bb763
starting stun anim
...
stagger anim, mirroring, bettern walk anim
wielding with stuns/stagger
Knockback fix
Added Poise documentation/comments
2021-01-28 17:22:37 -08:00
jiminycrick
0f244bf84b
Made stunned state invulnerable to poise damage
...
Fixing silly error for comp creation
2021-01-28 17:22:35 -08:00
jiminycrick
dd69b5f2bc
Poise stats
2021-01-28 17:22:35 -08:00
jiminycrick
af076aa87f
Add knockback to poise
2021-01-28 17:22:35 -08:00
jiminycrick
e3965ae0ab
Very basic functioning stun
2021-01-28 17:22:35 -08:00
jiminycrick
c83296a4ec
Initial broken implementation of poise
...
Character movement no longer broken.
2021-01-28 17:22:33 -08:00
jiminycrick
8b97199245
Update rand dependency
2021-01-26 20:35:08 -08:00
Sam
680a4e4dde
Fixed base energy being 0.
2021-01-26 21:25:00 -05:00
Entropy9s
1f6cf7e155
StaminaPlus buff, modifying stamina via buffs
...
trying to fix this, coming back to this later
please remember to change potion back future self!
this ALMOST works. maybe MR ready, kinda jank tho
so close, and yet so far...
IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO
did the same with health, ill fix this garbage l8r
think we're basically done here
whoops forgot to change the food back
fixing and cleaning up part 1
fixed everything part 2 now with buff images
ran clippy + fmt, fixed items that i modified
bracket bulldozing, boldly
hopefully this should be good?
need to rebase real quick
please let me be done
StaminaPlus buff, modifying stamina via buffs
trying to fix this, coming back to this later
please remember to change potion back future self!
this ALMOST works. maybe MR ready, kinda jank tho
so close, and yet so far...
IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO
did the same with health, ill fix this garbage l8r
think we're basically done here
whoops forgot to change the food back
fixing and cleaning up part 1
fixed everything part 2 now with buff images
ran clippy + fmt, fixed items that i modified
hopefully this should be good?
cargo clippy fmt stuff
deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
Snowram
ad6cdcab71
Merge branch 'swilliams/gems' into 'master'
...
Adds 6 different gems and removes shiny gem.
See merge request veloren/veloren!1729
2021-01-25 01:25:40 +00:00
Samuel Keiffer
c349afc9e9
Merge branch 'sam/speed-beam' into 'master'
...
Fixed how the speed stat was applied to beams.
See merge request veloren/veloren!1732
2021-01-24 23:23:53 +00:00
Sam
a83baa8243
Fixed how the speed stat was applied to beams.
2021-01-24 16:01:38 -05:00
Sam
6dd740feaa
Nerfed bow M1 and M2, slightly buffed bow skillbar ability.
2021-01-24 14:24:59 -05:00
Scott Williams
157e56d8ca
Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds
2021-01-24 16:40:22 +00:00
Scott Williams
32bbdffc38
Added 6 gems, removed shiny gem from cave, replaced with diamond.
2021-01-24 14:00:49 +00:00
Scott Williams
c7baf1fd86
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +00:00
Samuel Keiffer
39d1c9e885
Merge branch 'sam/skill-balancing-1' into 'master'
...
Skill balancing
See merge request veloren/veloren!1716
2021-01-23 21:12:35 +00:00
Samuel Keiffer
97f0413307
Merge branch 'sam/fix-dash' into 'master'
...
Dash now ticks damage based off distance rather than duration.
See merge request veloren/veloren!1715
2021-01-23 04:42:56 +00:00
Sam
5e4b6809ca
Sceptre nerfs.
2021-01-22 22:46:18 -05:00
Sam
d6be67e0a0
Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee.
2021-01-22 18:10:47 -05:00
Sam
4014b28d19
Removed body from stats component as there is already a body component.
2021-01-22 16:50:22 -05:00
Scott Williams
2a9c4f6f2e
Swilliams/golem hitbox fix
2021-01-22 16:30:35 +00:00
Sam
b5a3b3442c
Addressed comments.
2021-01-21 17:45:03 -05:00
Sam
c888ec0535
Golems are now lactose tolerant.
2021-01-20 11:54:57 -05:00
Sarra Kitty
e7d852835c
Sarrakitty/rotsys item sprites
2021-01-19 18:23:44 +00:00
Samuel Keiffer
b04158c5f9
Merge branch 'sam/combat-skill-trees' into 'master'
...
Sam/combat skill trees
See merge request veloren/veloren!1680
2021-01-19 14:18:07 +00:00
Monty Marz
ac60bf5794
Better visuals for skill button labels, don't show "0 EXP" in the SCT
...
Made functions that were called every frame significantly cheaper.
Final UI fixes.
2021-01-19 08:08:29 -05:00
Sam
eaa41c7dea
Skills are now factored into combat rating. New formula for exp scaling per SP.
...
Adjust lvl up msg fade
Add female humanoid names WIP
Changed text formatting when skill is max level. Added message to show you have 0 skill points available.
Addressed a lot of comments.
various changes to UI
- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon
Exp reward tweaks.
Fixed flamethrower range skill description.
2021-01-19 08:08:26 -05:00
jshipsey
0b156542e4
roll keyframes
...
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
jshipsey
5d1993009f
keyframed axe spin
...
Fixed error in converting FK to entity_id from character_id.
Giant match statements in persistence.
Tweaked roll.
Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-19 08:08:18 -05:00
Monty Marz
de5c5702b3
stats display
...
Addressed comments.
Addressed comments.
2021-01-19 08:08:11 -05:00
Sam
c809569f6b
Added level up sound to skill point gain. Fixed tests.
...
Fixed duplicate roll description.
2021-01-19 08:08:08 -05:00
jiminycrick
3d44ac2c35
Humanoid skill config and AI skill check
...
updated axe skill with correct icons
2021-01-19 08:08:05 -05:00
Noé
acbd965e65
implemented en translation for Hammer, Bow, Scepter and Staff skills
...
skill tree translation
Clamped earning SP to avoid u16 overflow.
translation fixes
Fixed exp scaling function
Fixed exp scaling function
remove debug combat rating display
Update overhead.rs
implemented en translation for Axe
2021-01-19 08:08:02 -05:00
Sam
a606313856
Added scaling exp costs per skill point.
...
Fix tooltip being red.
multiple fixes, started translation
change exp giving items
adjust loot tables
adjust combat rating indicators
fix group frame offsets
2021-01-19 08:07:57 -05:00
Sam
6ce422748c
Added SkillSetConfig to specify skill sets for npcs.
2021-01-19 08:07:55 -05:00
Sam
968b66260e
Levling health gives you health. Added combat scaling to UI.
2021-01-19 08:07:54 -05:00
Sam
83fdc8806d
Added function to automatically generate a combat rating. Currently, it is used to calculate exp.
2021-01-19 08:07:54 -05:00
Sam
4f552a736e
Added skill point costs to tooltips.
2021-01-19 08:07:53 -05:00
Sam
ae8c8b47f1
Added tooltips with numbers. Balancing on some skills.
...
Added experience scaling for tougher enemies.
2021-01-19 08:07:51 -05:00
Sam
986c05621a
Wired up skill UI to check for prerequisites being met and sufficient skill points.
...
available SP check in general HUD, more skill icons
Trimmed 2000 lines from a file.
UI tweaks
2021-01-19 08:07:45 -05:00
Sam
4b52574750
Skill point gains are displayed in hud.
...
level up message visuals and functionality
Handles simultaneous skill point gains in UI.
2021-01-19 08:07:41 -05:00
Sam
1d90b64898
Added function to get the max amount of skill points that can be spent in a tree.
2021-01-19 08:07:39 -05:00
Sam
b6d2d48ead
Exp floaters.
...
You load in with correct energy and health values now.
2021-01-19 08:07:36 -05:00
Monty Marz
48bd921d0a
EXP bar and available points UI
...
fix overhead UI
Add WIP overhead difficulty indicator
readd commented out exp counter for later use
Wired skill information into UI.
2021-01-19 08:07:25 -05:00
Sam
c0c45a1996
Purged stats, including level and experience
2021-01-19 08:07:23 -05:00
Sam
48c98b11cf
General combat skill tree.
...
UI for general skill tree
2021-01-19 08:07:20 -05:00
Monty Marz
3f436079e8
Skill-Tree UI
...
switchable tabs
rework icons, fix cursor toggle
auto slot placing
Bow leap skill changed to bow glide skill.
2021-01-19 08:07:06 -05:00
Sam
0ccbdc3b8c
Sceptre skill tree.
2021-01-19 08:07:03 -05:00
Sam
5c7705f874
Staff skill tree.
2021-01-19 08:07:03 -05:00
Sam
662a08defc
Implemented bow skill tree.
2021-01-19 08:07:02 -05:00
Sam
4dfe14c103
Hammer skill tree complete.
2021-01-19 08:07:02 -05:00
Sam
72604e8a4e
Axe skill tree functional.
2021-01-19 08:07:01 -05:00
Sam
cc60ca58be
Added sword skill tree
2021-01-19 08:06:59 -05:00
Sam
0e84ba18c2
Moved skill max level and skill prerequisites into ron files.
2021-01-19 08:06:59 -05:00
Sam
5a23f063a0
Ron file now used for skills belonging to each skill group.
2021-01-19 08:06:58 -05:00
Sam
fa073bceff
Skills can now optionally have levels. Max level prevents adding skill of higher level. Support for skills having a prerequisite of a particular level.
2021-01-19 08:06:57 -05:00
Sam
5d474974b9
Skills can now have prerequisite skills. Skills can now cost different amounts of skill points.
2021-01-19 08:06:57 -05:00
Sam
cbfe064e4f
You now gain skill points after a threshold of xp within a particular skill group.
...
Skills can now unlock skill groups. Temp method of using chat to unlock skills.
2021-01-19 08:06:52 -05:00
Jesus Bracho
42679201b0
Set up aura filtering
2021-01-18 22:58:56 +00:00
Sam
63eb71ed5b
Exp is now awarded to specific skill groups. It's automatically split between a general pool and weapon pools based on if you have the weapon in your loadout and if you've unlocked the weapon pools.
2021-01-18 17:54:03 -05:00
Jesus Bracho
ec79890335
Provide buff information on killed entities
2021-01-18 05:46:53 +00:00
Ben Wallis
c785e75e60
Follow-up fixes from review of inventory MR
2021-01-10 11:27:09 +00:00
Ben Wallis
d7cbf479e3
Fixed a bug which prevented picking up stackable items with a full inventory
2021-01-08 23:34:35 +00:00
Ben Wallis
aef2637288
Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts
2021-01-08 19:12:09 +00:00
Joshua Barretto
a4b9230f03
fixed Cargo.lock conflict
...
Fixed `crossbeam-queue` being referenced twice in the lockfile
2021-01-07 20:25:12 +00:00
unknown
3c1e1c6733
Converts npcs names file to ron
2020-12-23 00:58:25 +01:00
Frinksy
53d5a9373e
fixing #881
...
- Multiple buffs make the UI icons flicker
2020-12-22 15:40:57 +00:00
Justin Shipsey
3466d638fe
Merge branch 'gliding-energy-cost' into 'master'
...
Glider mid-air deploy and gliding energy-cost
See merge request veloren/veloren!1626
2020-12-18 21:18:32 +00:00
Ludvig Böklin
8f9db19a4a
Glider mid-air deploy and gliding energy-cost
2020-12-18 19:16:06 +01:00
Benoît du Garreau
1ace001fde
Fix debug items
2020-12-18 18:11:48 +01:00
Benoît du Garreau
989683d2d3
Improve world::Index
2020-12-17 12:08:04 +01:00
Benoît du Garreau
1c4e334cd4
Apply suggestion
...
- Remove default value for CharacterAbility
- Put back accidentally removed comment
2020-12-17 12:06:32 +01:00
Benoît du Garreau
ce9d706ed4
Fix clippy lints
2020-12-17 12:06:28 +01:00
Benoît du Garreau
7b4aa6d4cc
cargo fmt
2020-12-17 12:06:22 +01:00
Benoît du Garreau
d090eefb00
Move the asset module to a single file
2020-12-17 12:06:13 +01:00
Benoît du Garreau
0cf164f33a
Use assets_manager to load assets
2020-12-17 12:06:07 +01:00
jiminycrick
60d5d62eef
Switched to hashbrown everywhere
2020-12-17 10:31:35 +01:00
Marcel
24a840bc6b
Merge branch 'xMAC94x/dependencies' into 'master'
...
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
See merge request veloren/veloren!1641
2020-12-16 09:33:34 +00:00
Justin Shipsey
e7249210f6
accel based run
2020-12-16 08:07:38 +00:00
Marcel Märtens
107fd432f5
update further crates
2020-12-16 08:56:21 +01:00
