Commit Graph

3985 Commits

Author SHA1 Message Date
Sam
4ab3abfc07 Balanced stance AI 2022-10-27 20:07:01 -04:00
Sam
221b0aff5f Sword AI can now choose their abilities 2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2 Made combo melee more ergonomic to use when it is a stance 2022-10-27 20:06:59 -04:00
Sam
21aabb5663 Parries now correctly return to their stance. 2022-10-27 20:06:58 -04:00
Sam
21dedb54b9 Fixed bug where you couldn't properly exit an ability if you had a return ability but lacked the requirements to return 2022-10-27 20:06:58 -04:00
Sam
b3a15f61aa Fixed issue where you could cancel combo melee 2 mid strike 2022-10-27 20:06:58 -04:00
Sam
5757b0bdf0 Abilities are now more expensive when in a mismatched stance if that stance is not the balanced stance. 2022-10-27 20:06:57 -04:00
Sam
5974646a3c You can now leave a stance by using the corresponding ability input 2022-10-27 20:06:57 -04:00
Sam
a2242b28f4 If you were in a stance when you used an ability, return to that stance after the ability is complete. 2022-10-27 20:06:56 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed.
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
9091d46554 Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge. 2022-10-27 20:06:53 -04:00
Sam
7c22847009 Animation for parrying parry 2022-10-27 20:06:48 -04:00
Sam
e03e137793 Combo melee tweaks 2022-10-27 20:06:40 -04:00
Sam
da21e1cb02 Removed air slash stance and abilities 2022-10-27 20:06:40 -04:00
Sam
2116842d30 Bin program to generate dot files for skill trees 2022-10-27 20:06:37 -04:00
Sam
eacbdefb75 Skill point prerequisites and costs 2022-10-27 20:06:37 -04:00
Sam
2fcd876e3f Air slash abilities 2022-10-27 20:06:35 -04:00
Sam
7a8653e8f8 Reaching abilities 2022-10-27 20:06:35 -04:00
Sam
5d643f430a Mobility abilities 2022-10-27 20:06:35 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6 Parrying abilities 2022-10-27 20:06:34 -04:00
Sam
d99eddb483 Defensive abilities 2022-10-27 20:06:33 -04:00
Sam
ec03bd7032 Cleaving abilities 2022-10-27 20:06:33 -04:00
Sam
2051d45d2f Offensive abilities 2022-10-27 20:06:32 -04:00
Sam
c37925d1e2 Changed logic for entering combo melee state depending on whether or not it was a stance 2022-10-27 20:06:31 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
Sam
014a8cce61 Combo melee can now optionally not function as a stance 2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc Balanced abilities and insert ability id into animations. 2022-10-27 20:06:30 -04:00
Sam
aea4a43b65 Placeholder abilities 2022-10-27 20:06:30 -04:00
Sam
38094b6ba2 Finisher melee 2022-10-27 20:06:29 -04:00
Sam
057b1a4ad6 Added capability for attacks to be interrupted by dodging or blocking 2022-10-27 20:06:29 -04:00
Sam
c09e858cba Single target melee attacks now hit the closest target instead of a random target. 2022-10-27 20:06:28 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
7b27b63122 Melee attacks now only hit a single target by default 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master'
Halloween event

See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
Samuel Keiffer
f676e732f6 Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master'
ActionState extensions to allow for multiple concurrent state variables And More Complex AI

See merge request veloren/veloren!3659
2022-10-25 03:21:46 +00:00
Timothy Finnegan
1922d69154 Ran Cargo fmt 2022-10-24 19:52:37 -07:00
flo666
9b1efe1bee clippy, fmt, remove leftover file, fix sitenames in soundtrack 2022-10-25 00:33:23 +02:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
c83ec87d6a Code cleanup 2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36 Colour reflects old poise state 2022-10-24 22:05:11 +05:30
kitswas
b21764c99f Added tick mark for the upcoming threshold 2022-10-24 22:05:11 +05:30
kitswas
be586aa84f Extracted hard-coded poise thresholds to a constant 2022-10-24 22:05:11 +05:30
Tim Finnegan
a21a674ed1 Merge branch 'master' into 'flaffwaffle/action_state_concurrent_states'
# Conflicts:
#   CHANGELOG.md
2022-10-24 01:35:25 +00:00
James Melkonian
6bacb487f3 Bat AI 2022-10-23 20:05:39 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo666
79e6fd58fe - make tricksters spawn in groups and play instruments
- remove defunct draugr flee
2022-10-23 20:05:39 +02:00
flo666
e1bd385408 make draugrs Npcs flee at health below 100%,
trickster gear,
single spawns (trickster, dullahan),
2022-10-23 20:05:39 +02:00
IsseW
1d6b7d6a03 Add Halloween event 2022-10-23 20:05:39 +02:00
flo
698a00bae3 savannah_pit 2022-10-22 19:48:50 +00:00
holychowders
7502cd664a Have agents update awareness of targets.
This is preliminary and has no visible effect.
2022-10-21 20:25:54 -05:00
holychowders
f45c465c75 Add new Awareness struct. 2022-10-20 11:36:29 -05:00
holychowders
bc20744cd3 Remove old unused awareness stuff. 2022-10-20 11:36:16 -05:00
Timothy Finnegan
a9add7012e Added support for multiple timers, conditions, and counters in a single action node. 2022-10-16 19:48:27 -07:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
Joshua Barretto
3c54e63592 Various minor optimisations 2022-10-12 13:57:14 +01:00
Isse
536bb9b71c Merge branch 'zesterer/citadel' into 'master'
Two new tree types and disabled citadel site.

See merge request veloren/veloren!3652
2022-10-10 16:19:48 +00:00
James Melkonian
99d547c7c6 Add unit test to validate recipe keys 2022-10-09 20:50:09 -07:00
Joshua Barretto
0b5d043d8e Began work on citadel 2022-10-09 23:23:39 +02:00
Avi Weinstock
e6576f0cf3 Make the trading AI for pets only accept food. 2022-09-30 15:11:03 -04:00
Avi Weinstock
60f5383f8b Address comments for MR 3633. 2022-09-30 14:51:49 -04:00
Avi Weinstock
c62bc0dd0d Allow pets to be traded with. 2022-09-30 14:51:49 -04:00
Marcel Märtens
0fe0192a2d get rid of string replacements in template strings 2022-09-29 17:33:53 +02:00
Marcel Märtens
a0ef3be9ac remove hardcoded localisation from client 2022-09-27 13:46:12 +02:00
Marcel
17c940e0f8 Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `2022-09-23`

See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f remove enum_iterator with strum, fixes #1723 2022-09-25 16:09:46 +02:00
Marcel Märtens
cf6a764aa4 update toolchain to 2022-09-23 2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1 update toolchain to 2022-09-08
This reverts commit 6c9deee491.
This reverts commit a32b269252.
2022-09-24 00:04:40 +02:00
Marcel Märtens
29d0f5b25d update dependencies 2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master'
seachapel npc work

See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff Merge branch 'sharp/parallel-ingame' into 'master'
Parallelize ingame messages.

See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1 Parallelize ingame messages. 2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet.
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Samuel Keiffer
188db01a7b Merge branch 'sam/hot-agent' into 'master'
Agent combat tactics hot reloading

See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c Merge branch 'Couls/TestBed' into 'master'
Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
Sam
3d6c9a780d Removed redundant package parameter from init function of hot reloading 2022-09-17 00:55:28 -04:00
Sam
cfeb197f85 Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead. 2022-09-17 00:50:59 -04:00
Sam
23c51af437 Consolidated voxygen and server dynlibs into a common dynlib 2022-09-16 23:43:26 -04:00
Christof Petig
5d8a708d6b Merge branch 'juliancoffee/loot_export_fix' into 'master'
Make loot export display all modulars

See merge request veloren/veloren!3598
2022-09-16 21:55:59 +00:00
Joshua Yanovski
e9a463d459 Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
cafdcad8ce Merge branch 'sharp/improve-msg' into 'master'
Improve some server system performance

See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56 Reduce overhead of messaging systems. 2022-09-14 21:04:53 -07:00
Marcel
725fd09ed7 Merge branch 'yusdacra/nix' into 'master'
!2951 with fixed runtime panic

See merge request veloren/veloren!3605
2022-09-14 10:12:07 +00:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
juliancoffee
be1638e2e7 Remove csv_import of loot table 2022-09-12 18:30:17 +03:00
juliancoffee
97900b109f Make loot export display all modulars 2022-09-12 18:30:17 +03:00
Joshua Yanovski
aea4aca057 Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
Marcel Märtens
a32b269252 steal sharps clippy improvements to the old nightly 2022-09-11 16:10:56 +02:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
Joshua Yanovski
986d104faa Update Rust toolchain. 2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688 update dependencies 2022-09-08 23:29:08 +02:00
Yusuf Bera Ertan
812298cb63
fix: default to build detected git version / tag if we can't get runtime variables 2022-09-08 12:29:17 +03:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
This reverts commit f170da4da6, reversing
changes made to aa7569061b.
2022-09-08 12:28:56 +03:00
Joshua Yanovski
e55b541bcc Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Samuel Keiffer
aa7569061b Merge branch 'juliancoffee/more-buffs' into 'master'
Add Golden Cheese debug potion

See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00