Sam
398370ca51
Changed lifesteal beam particles to look better.
...
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
2021-03-09 17:59:41 -05:00
Sam
18edc1092b
Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal.
2021-03-09 17:59:33 -05:00
Sam
43874a4aa5
Added healing beam character state.
...
This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-09 17:58:20 -05:00
Sam
a1bbc136fc
New abilities for sceptre are done
2021-03-09 17:56:38 -05:00
ccgauche
10e5620642
Moved back register to a system
2021-03-09 21:16:23 +01:00
Marcel Märtens
d7df741671
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 20:17:29 +01:00
Marcel Märtens
4ebfbdde0f
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-09 00:54:01 +01:00
Marcel Märtens
f353f14703
change Name from VSystem to System
2021-03-08 13:15:00 +01:00
Marcel Märtens
6b88545481
restructure server metrics
...
- get rid of old SysTimers for each system in favour of VSystem tracking
- move metrics generation from lib.rs to own system
- code cleanup
- remove time tracking in common::sys
2021-03-08 11:51:13 +01:00
Marcel Märtens
c515fece28
Implement a VSystem trait that can be implemented by Systems.
...
It will autodo some things, like track start and time and export those in system metrics
Add a origin and implement it for all Systems in Veloren
2021-03-08 11:51:04 +01:00
ccgauche
89774980b4
First commit
2021-03-07 22:32:52 +01:00
Joshua Yanovski
2dd7089e52
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
ccgauche
7f4411ba1f
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
Sam
d02c61ad8a
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
ccgauche
db9991ce6d
Adressed all comments
2021-03-01 22:24:02 +01:00
ccgauche
9628dfaf99
Fixed comments
2021-03-01 21:29:18 +01:00
ccgauche
dbd4d70b79
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
2021-03-01 19:00:44 +01:00
Sam
a88ad7b971
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
2021-02-28 15:02:03 -05:00
Sam
50c47ce84d
Made changes to fix torvus
2021-02-27 22:42:11 -05:00
Sam
404c7f0905
Combo melee now checks combo
2021-02-27 18:24:28 -05:00
Sam
f24433c8cf
Added combo component
2021-02-27 14:55:06 -05:00
Sam
53b0ba286a
Ice particles for Wendigo
2021-02-27 01:42:46 -05:00
Sam
64a809ee5b
Made comments more descriptive
2021-02-26 18:15:24 -05:00
Sam
45dd36be07
Auras now apply a buff only once, instead of applying a buff every second.
...
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
2021-02-26 17:57:01 -05:00
Samuel Keiffer
00937a4e8b
Merge branch 'aweinstock/modularforms' into 'master'
...
Support modular weapon components made from a tagged material using the material as a multiplier.
See merge request veloren/veloren!1815
2021-02-26 00:53:02 +00:00
Avi Weinstock
78014d7d3b
Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers.
2021-02-23 15:49:34 -05:00
Sam
3d57db9485
Test fix for torvus
2021-02-23 14:38:58 -05:00
Imbris
da3edf54fb
Merge branch 'ccgauche/plugin-retreive' into 'master'
...
ccgauche/plugin retreive
See merge request veloren/veloren!1788
2021-02-23 16:36:05 +00:00
ccgauche
4b1c033f6e
Added scopeguard to protect against unwind
2021-02-23 13:58:13 +01:00
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
Marcel
6081ebbe15
Merge branch 'sam/ecs-sys-struct' into 'master'
...
Sam/ecs sys struct
See merge request veloren/veloren!1813
2021-02-23 00:08:09 +00:00
ccgauche
f85e79af07
Fixed turbofish issues
2021-02-23 00:03:29 +01:00
ccgauche
a12e554266
Removed the unwrap to ensure the WASM instance can't crash the host
2021-02-23 00:03:27 +01: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
6c991cc2cd
Changed to less restrictive memory ordering
2021-02-23 00:02:51 +01:00
ccgauche
267e7d8b4c
Finalized Retrieve API
2021-02-22 23:59:41 +01:00
ccgauche
06aa7ab70c
Retrieves added + New ECS memory layout for plugins
2021-02-22 23:59:32 +01:00
ccgauche
1597fcc79e
Fixed the plugin compilation and added comments
...
TODO: Remove compilation errors on WASM side (while using common).
2021-02-22 23:59:25 +01:00
ccgauche
8a693d9fde
New cleaner safer version
2021-02-22 23:59:15 +01:00
ccgauche
a067a20b69
added basic retreive
2021-02-22 23:59:11 +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
Sam
3f467a32e6
Changed naming from 'immutable data' to 'read data'
2021-02-22 16:02:37 -05:00
Sam
2b5120319d
Character behavior system now uses immutable data struct
2021-02-22 15:30:53 -05:00
Sam
fae1db90d5
Controller system now uses immutable data struct
2021-02-22 14:33:54 -05:00
Sam
dcacd82293
Stats system now uses immutable data struct
2021-02-22 14:27:34 -05:00
Sam
27fe1c20ac
Aura system now uses immutable data struct
2021-02-22 14:14:10 -05:00
Sam
4c0c06ea4c
Buff system now uses immutable data struct
2021-02-22 14:03:18 -05:00
Sam
605513ea56
Beam system now uses immutable data struct
2021-02-22 13:57:56 -05:00
Sam
11a0d67b35
Shockwave system now uses immutable data struct
2021-02-22 13:49:56 -05:00
Sam
b278cad807
Projectile system now uses immutable data struct
2021-02-22 13:37:42 -05:00
Sam
91e982b3ee
Melee system now uses immutable data struct
2021-02-22 13:25:21 -05:00
Marcel Märtens
1a7c179bbb
share tokio Runtime between Client and Server, name rayon Threadpool
2021-02-22 17:35:06 +01:00
Vincent Glize
4f37c626ea
Optimize Entity <> Entity collision check by calculating a entity via sphere.
2021-02-22 12:36:42 +01:00
Sam
f24490dc80
Added functionality for buffs queueing. Saturation now queues.
2021-02-20 17:13:17 -05:00
Caelan
dda4931f46
Clean and update dependencies
...
* Remove tweak feature
* Remove const-tweaker
* Update tiny_http
* Update bitvec to 0.21.0
* Downgrade euc to avoid conflict with vek 0.12.0
* Require exactly vek 0.12.0
* Update all other dependencies automatically based on these changes
* Update gilrs to latest at the request of Ada Lovegirls
* Update meshing benchmarks to new criterion API
2021-02-17 01:27:06 -08: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
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
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
James Melkonian
1d8496ea21
Move agent system to server
2021-02-06 06:15:25 +00:00
Ludvig Böklin
a1ff9ab83f
Redefine Ori as a quaternion
2021-02-05 09:33:14 +01:00
Sam
be8df9aef6
Addressed comments.
2021-02-02 16:08:09 -05:00
Sam
80954f3ba4
Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps.
2021-02-02 13:07:07 -05:00
Sam
5eec915c2e
Added support for damage falloff with explosions.
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
e5caef8a54
Effects on attacks can now require energy.
2021-02-02 13:07:05 -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
18aa315f0d
Rolling now dodges melee attacks again.
2021-02-02 13:06:34 -05:00
Sam
78879d5189
Attacks can now inflict de/buffs.
2021-02-02 13:06:33 -05:00
Sam
6d509932db
Attacks can now reward energy.
2021-02-02 13:06:33 -05:00
Sam
c3408c084c
Critical hits are now functional.
2021-02-02 13:06:32 -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
Blob
5c8fc4f378
Fix projectile explosion being triggered twice.
2021-02-01 15:41:34 +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
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
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
Scott Williams
c7baf1fd86
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +00:00
Sam
77312ccdd4
Move outcome vec from being defined in frontend and server to common.
2021-01-23 15:17:36 -05: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
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
Sam
aaad5e49cc
Changed how it moved golem.
2021-01-20 17:22:24 -05:00
Sam
c888ec0535
Golems are now lactose tolerant.
2021-01-20 11:54:57 -05:00
jiminycrick
08922dfc64
Make only humanoid agents attempt to roll
2021-01-19 10:42:46 -08: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
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
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
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
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
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
48c98b11cf
General combat skill tree.
...
UI for general skill tree
2021-01-19 08:07:20 -05:00
Sam
69be3a3d93
Added persistence for skill trees.
2021-01-19 08:07:00 -05:00
Sam
cc60ca58be
Added sword skill tree
2021-01-19 08:06:59 -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
Jesus Bracho
ec79890335
Provide buff information on killed entities
2021-01-18 05:46:53 +00:00
ubruntu
74d17ff4c8
Slightly better bird pathing
2021-01-15 00:42:57 +00:00
Acrimon
ceae51b0b7
fix #925
2021-01-14 13:21:55 +01:00
Ben Wallis
c785e75e60
Follow-up fixes from review of inventory MR
2021-01-10 11:27:09 +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
ccgauche
5ff2f5bc5d
updated to wasmer 1.0.0
...
- Everything seems to be working just fine
2021-01-08 16:33:19 +01:00
Joshua Barretto
1604616768
Merge branch 'ccgauche/new-wasmer-backend' into 'master'
...
ccgauche/new wasmer backend
See merge request veloren/veloren!1644
2021-01-08 08:48:31 +00:00
ccgauche
06ffe61219
Added feature flag
...
changed field name to size
2021-01-08 08:48:30 +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
ubruntu
ae366e03c5
Reduced downward fall of birds, Humanoid travelers no longer visit dungeons, birds only travel between dungeons
2021-01-05 01:04:01 +00:00
Marcel Märtens
c37384979c
switch toolchain to nightly-2021-01-01
2021-01-03 21:31:21 +01:00
Ludvig Böklin
8f9db19a4a
Glider mid-air deploy and gliding energy-cost
2020-12-18 19:16:06 +01:00
Marcel Märtens
e8003a44dd
update specs
2020-12-16 14:31:16 +01:00
Marcel Märtens
26918d10c9
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-16 00:51:07 +01:00
Joshua Barretto
198b1970a7
Merge branch 'ccgauche/fix-memory-overwrite' into 'master'
...
ccgauche/fix memory overwrite
See merge request veloren/veloren!1631
2020-12-15 17:09:17 +00:00
ccgauche
2b9dee0727
Updated buffer
2020-12-15 16:04:55 +01:00
Joshua Barretto
494436be01
Hid plugins behind a feature flag to resolve Windows CI issue
2020-12-15 11:14:26 +00:00
Monty
cd1c1ffe9c
hotfix NPC inviting
2020-12-15 01:43:44 +01:00
Monty
8b9db7b179
cleanup, changelog, small bugfixes
...
fmt
fix rebase
fmt
2020-12-14 21:52:24 +01:00
ccgauche
ea1efd1ce1
Runned FMT
2020-12-14 18:46:04 +01:00
ccgauche
69dba49884
Fixed clippy warnings
2020-12-14 18:31:01 +01:00
ccgauche
d7aa26371c
Fixed memory issue now using alloc
2020-12-14 17:07:05 +01:00
Joshua Barretto
023888f560
Updated changelog, fmt and clippy fixes
2020-12-13 17:40:15 +00:00
Joshua Barretto
f8c8e342e6
Moved common networking code to common/net, clippy fixes
2020-12-13 17:23:45 +00:00
Joshua Barretto
027842f832
Resolved plugin dependency cycle, allowing more interesting plugin API
2020-12-13 17:15:33 +00:00
Joshua Barretto
8e937a50ca
Better plugin API
2020-12-13 17:15:33 +00:00
Joshua Barretto
780f54ac90
Reorganised plugin crates
2020-12-13 17:15:32 +00:00
ccgauche
ee7fb990c3
Added plugin system
...
Added a plugin system based on wasmer-runtime
- Support Action (Print handled)
- Support Events (PluginLoadEvent handled)
2020-12-13 17:14:37 +00:00
Joshua Barretto
12b29ea174
Began work on plugin API and plugin loading
2020-12-13 17:13:57 +00:00
James Melkonian
71303fecfd
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
Marcel Märtens
e398cca53c
move common_state into common_sys
2020-12-01 13:46:28 +01:00
Marcel Märtens
add7922653
Move Systems out of common into common_sys
...
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
2020-12-01 13:44:07 +01:00
