75 Commits

Author SHA1 Message Date
holychowders
a1db073af5 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
Marcel Märtens
7153e8879d fix clippy warnings 2021-07-12 12:09:09 +02:00
swrup
83ecf7bd32 fix melee hit_count increment 2021-07-09 16:17:51 +00:00
juliancoffee
4f75e98cfa 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
Sam
70cfeb3e65 Addressed potential for divide by zero. 2021-07-04 22:00:13 -05:00
Sam
09d1cd68d7 Fix interaction of max health and max health over time buffs causing infinite health scaling. 2021-07-04 21:43:29 -05:00
Avi Weinstock
d3d4cc1382 Fix underwater campfires. 2021-06-30 18:36:43 -04:00
Sam
8bf3109133 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
Sam
ab74ee3f01 Added UseItem character state. 2021-06-29 05:59:02 -05:00
Sam
cd1ede0131 Balance tweaks. 2021-06-23 22:38:37 -05:00
Sam
5dc1f8f8ae Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Sam
d93d0aa4f5 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
cc748c0a3f Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
c326df0b88 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Dominik Broński
1d55cb9c15 Merge branch 'aweinstock/lava' into 'master'
Lava

See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
2cebfa7db5 Sanitise controller inputs 2021-06-21 21:13:49 +01:00
Avi Weinstock
5662ba98b8 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
a831a4fb69 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
e09c5adc02 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
Imbris
156e2e86b5 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
Joshua Barretto
0d3cd7897f 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
0d39e4047e Emit sound from head 2021-06-16 17:23:22 +01:00
Joshua Barretto
0a8d4af404 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
64e79b5659 Chasing sounds 2021-06-16 17:23:22 +01:00
Avi Weinstock
28cbaad146 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
e8ff267f90 Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04:00
Snowram
aa62ad8bc0 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Marcel
6225666050 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
Avi Weinstock
37730a0993 Move force-movement e2e check so that it doesn't confer immunity to arrows. 2021-06-13 20:38:03 -04:00
Avi Weinstock
667e5eb510 Mining skill tree. 2021-06-13 14:34:42 -04:00
Avi Weinstock
c97797a87c Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
Marcel Märtens
d291a71f79 Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Marcel Märtens
4c29484f22 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
Sam
58bcf27105 Adressed comments on energy and armor functions. 2021-06-07 11:06:25 +02:00
Sam
da65a1c166 Max energy stat functional. 2021-06-07 10:58:37 +02:00
Sam
4b91bea700 Energy recovery stat functional. 2021-06-07 10:58:32 +02:00
Sam
d0bfcabd1c First 3 abilities for tidal warrior functional. Added bubble particles. 2021-06-03 21:39:13 -05:00
Imbris
5caf8b6b55 Re-disable incremental just for common-systems, small fix in plugin
crate, more new clippy fixes
2021-05-31 20:44:57 -04:00
Imbris
5985584c5c Update toolchain 2021-05-31 20:44:57 -04:00
Samuel Keiffer
db8ea7c84f Merge branch 'adam/frozen-debuff' into 'master'
Frozen Debuff

See merge request veloren/veloren!2357
2021-05-30 22:39:11 +00:00
Adam Whitehurst
e3364d1bf4 refactor: variable names 2021-05-30 13:40:25 -07:00
Adam Whitehurst
bc53adeb9a fix: name 2021-05-30 12:56:26 -07:00
Ygor Souza
47943783e9 Reset on_ceiling state
Previously, the on_ceiling state would remain true for the entire
lifetime of the entity after it touched the ceiling once.
2021-05-30 21:49:11 +02:00
Adam Whitehurst
6263f6de8a wip: impl Stats::attack_speed_modifier 2021-05-30 09:40:11 -07:00
Avi Weinstock
6b0db82ddf Fixed entities with voxel colliders being off by one physics tick for collision. 2021-05-28 20:25:57 -04:00
James Melkonian
9dde9259cd Don't modify position in glide character state 2021-05-23 07:26:11 +00:00
Ludvig Böklin
d7fa4e093d Adjusted masses; less excessive knockbacks; prevent loot shooting off 2021-05-22 17:56:13 +00:00
Sam
1b3e619115 Swapping weapon sets is now functional. (Though very hacky?) 2021-05-15 15:16:39 -05:00
Sam
6f00d556ad Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
holychowders
21867f8a85 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00