Marcel Märtens
3a19669d53
use workspace dependencies to make our life easier maintaining them :)
2023-05-10 18:16:25 +02:00
Isse
a6665ed988
some comments
2023-05-09 19:43:10 +02:00
Isse
192356f6c5
use interpolated pos and ori
2023-05-09 19:43:09 +02:00
Isse
e39790e9e4
make sprites work on multiple ships at once
2023-05-09 19:43:09 +02:00
Isse
134d0f0c04
varius fixes
2023-05-09 19:43:09 +02:00
Isse
a35a1a34c4
more sprites on airships
2023-05-09 19:43:09 +02:00
Isse
6674cce2cc
intercat with sprites on ships
2023-05-09 19:43:09 +02:00
Isse
d292234c47
lod for sprites on volumes
2023-05-09 19:43:09 +02:00
Isse
fcb7011cde
sprites on volumes
2023-05-09 19:43:09 +02:00
Isse
2928eb8d15
sit on sprites
2023-05-09 19:43:08 +02:00
Joshua Barretto
1cc221f653
Merge branch 'zesterer/rtsim-tweaks' into 'master'
...
Started adding wandering rtsim monsters
See merge request veloren/veloren!3908
2023-05-09 14:51:15 +00:00
Marcel Märtens
377787e3c8
avoid:
...
```
PHI nodes not grouped at top of basic block!
%246 = phi <4 x float> [ <float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00>, %114 ], [ %241, <badref> ], !dbg !961029
label %243
in function _ZN14veloren_common4comp9inventory4item7modular11ModularBase4kind17h0950571ff74739d8E
LLVM ERROR: Broken function found, compilation aborted!
```
2023-05-08 18:58:54 +02:00
Marcel Märtens
95bca5418a
update toolchain to nightly-2023-04-20
2023-05-08 18:58:54 +02:00
Sam
a38f336c9e
Added dual wielding sword contextual abilities.
2023-05-07 20:43:51 -04:00
Sam
0ecf4fbe87
Dual wielding weapons of the same kind added as a context
2023-05-07 20:43:51 -04:00
Sam
9cedf854de
Abilities can now be activated from multiple contexts
2023-05-07 20:43:50 -04:00
Marcel Märtens
6a8f10bf41
fix master fmt
2023-05-05 18:26:14 +02:00
Isse
eed613a50f
change other value parsers
2023-05-05 15:05:57 +02:00
Marcel
223ae7ee98
Merge branch 'xMAC94x/update_deps' into 'master'
...
update further dependencies
See merge request veloren/veloren!3913
2023-05-05 08:42:43 +00:00
Marcel Märtens
d90ea8c1da
get rid of structop and update clippy in common test, now only criterion is left with version 2
2023-05-05 09:46:46 +02:00
Joshua Barretto
8d9625d6ee
Addressed comments
2023-05-04 23:18:40 +01:00
Joshua Barretto
ee971e4056
Added item merging
2023-05-04 22:12:25 +01:00
Joshua Barretto
a5b1e41d8b
Make NPC interaction go via rtsim
2023-05-04 11:23:46 +01:00
Joshua Barretto
2ff0118df0
More rtsim monsters
2023-05-04 10:13:02 +01:00
Joshua Barretto
0f92f38967
Started adding wandering rtsim monsters
2023-05-01 18:29:32 +01:00
Isse
ab4076518f
Add multiloot
2023-04-23 19:17:39 +00:00
Imbris
cd02b3a172
Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list
2023-04-22 11:37:52 -04:00
Sam
4f991190d3
Removed 3rd to_owned call
2023-04-19 18:43:43 -04:00
Sam
e819cd2309
Updated hashbrown, removed some to_owned calls in handling recently unequipped items
2023-04-19 18:43:40 -04:00
Sam
63bf8f3ac7
Responded to review comments and fixed tests
2023-04-19 18:34:17 -04:00
Sam
7fdfc0e71b
Addressed review
2023-04-19 18:34:17 -04:00
Sam
c1a64e1d69
Recently unequipped items are now tracked and durability loss on death is applied to them
2023-04-19 18:34:16 -04:00
Sam
9d503d1e1f
Debug items no longer have durability
2023-04-14 18:25:24 -04:00
Isse
2208a3037e
improve flying goto
2023-04-14 11:23:17 +02:00
Isse
d1f6e6bef6
somewhat fix airships
2023-04-14 11:22:10 +02:00
Joshua Barretto
504ea158d2
Merge branch 'zesterer/towns' into 'master'
...
Improvements to towns and NPCs
See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
daacadaedb
Made NPCs give directions to nearby towns, fixed player death propagation
2023-04-13 14:34:31 +01:00
Samuel Keiffer
7aa43e9e8a
Merge branch 'taoist/better-dullahan' into 'master'
...
taoist&floppy/cyclops&dullahan
See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee
taoist&floppy/cyclops&dullahan
2023-04-12 22:53:38 +00:00
Joshua Barretto
9e17042bf6
Merge branch 'rtsim2' into 'master'
...
Initial implementation of rtsim2
Closes #1476
See merge request veloren/veloren!3517
2023-04-12 16:17:52 +00:00
Joshua Barretto
16e3227f78
Correct localisation of numeric values, use coordinate conversions in rtsim
2023-04-12 10:36:11 +01:00
Joshua Barretto
3582d86c70
Simplified localisation logic
2023-04-11 23:51:07 +01:00
Joshua Barretto
3484e156d1
Allowed localisation content to be recursive
2023-04-11 23:18:34 +01:00
Joshua Barretto
cf701fb604
Localised rtsim NPC speech
2023-04-11 17:00:08 +01:00
Joshua Barretto
edcc2f1870
Overhauled chat message representation to allow for more exhaustive localisation
2023-04-11 15:46:36 +01:00
Imbris
4ea635cc8d
Merge branch 'imbris/random-tweaks-35902u8' into 'master'
...
Some misc tweaks
See merge request veloren/veloren!3861
2023-04-11 02:07:35 +00:00
Isse
efe2eb046c
add comment about a pure-proportional controller
2023-04-10 22:22:50 +02:00
Joshua Barretto
3e0f5295c0
Added CharacterActivity, made NPCs look at the player when speaking to them
2023-04-09 19:25:57 +01:00
Joshua Barretto
082bcdb755
Don't hunt friendly animals
2023-04-09 19:25:57 +01:00
Joshua Barretto
364255c7fe
Allowed rtsim NPCs to greet nearby actors
2023-04-09 19:25:55 +01:00
Joshua Barretto
8d91ebb23e
Don't aim character when drinking
2023-04-09 19:25:55 +01:00
Isse
1a117f1331
rtsim vehicles
2023-04-09 19:25:54 +01:00
Isse
a7588e274d
clean up mounting
2023-04-09 19:25:54 +01:00
Joshua Barretto
587996abb7
Correctly scale glider physics
2023-04-09 19:25:52 +01:00
Imbris
3ef4af0195
Various tweaks:
...
* Store result of large condition expression in a variable before using
in if statement (improves readability of code).
* Buff doc comment improvements. Adding periods is neccessary since
these will be merged into one line in the generated docs.
* Add note on AbilityContext that AbilityContext::None is intended to be
used rather than AbilityContext::Stance(Stance::None) perhaps in the
future we can add some serde shenanigans to make this work better, but
it is probably best to wait to see how this type evolves first.
2023-04-07 23:56:55 -04:00
Imbris
2cc2aa86f4
Synchronize DiveMelee checks
2023-04-07 01:59:41 -04:00
Imbris
e20cf5f14f
Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs
2023-04-07 01:59:41 -04:00
Sam
d523d31056
Fixed possible crash in crafting UI
2023-04-06 10:57:18 -04:00
Sam
132f26dbc0
Addressed review
2023-04-06 10:57:16 -04:00
Sam
e4ebd17363
Addressed feedback
2023-04-06 10:57:12 -04:00
Sam
ca879173be
Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist.
2023-04-06 10:56:55 -04:00
Sam
52a62420db
Changed durability persistence to a NonZeroU32
2023-04-06 10:54:49 -04:00
Sam
011b6c3feb
Changed how durability was persisted so that a more general system can be used for future item properties.
2023-04-06 10:54:49 -04:00
Sam
0966753699
Added repair recipes
2023-04-06 10:54:48 -04:00
Sam
c3f5bc13f1
Equipment can now be repaired at sprites in town.
2023-04-06 10:54:48 -04:00
Sam
a555e08d0b
Added durability to item tooltips
2023-04-06 10:54:47 -04:00
Sam
c586db8feb
Item durability is now persisted
2023-04-06 10:54:47 -04:00
Sam
a07e042fa2
Items now lose durability on death
2023-04-06 10:54:46 -04:00
Sam
df13741be9
Durability system in place
2023-04-06 10:54:46 -04:00
Christof Petig
9205da2298
cargo fmt
2023-04-04 23:46:20 +02:00
Christof Petig
9b3bf4c3c8
initial support for multiple models in one vox file
2023-04-04 23:46:20 +02:00
Sam
6849f9fc21
Fix function name typo
2023-04-01 18:11:16 -04:00
Sam
352d34557e
Fix modular crafting window showing an item output when it is not possible to craft two components together.
2023-04-01 17:22:01 -04:00
Sam
09f600bc1e
Buffs can have variable tick times
2023-03-30 21:23:41 -04:00
Isse
c34e5ad4ed
Small fixes
2023-03-29 23:11:59 +00:00
Sam
cdaf9e5c0e
Ability changes
2023-03-26 21:41:22 -04:00
Sam
ef7b400cca
Number tweaking
2023-03-26 19:50:42 -04:00
Sam
e5c9f92269
Fix clippy from rebase
2023-03-21 20:23:46 -04:00
Sam
1337525987
Review comment
2023-03-21 20:18:35 -04:00
Sam
5c675fdbe2
Addressed review
2023-03-21 20:18:34 -04:00
Sam
bd7f33eae5
Fixed unit test
2023-03-21 20:16:59 -04:00
Sam
610d47f787
Effect power now affects more than just poise
2023-03-21 20:16:55 -04:00
Sam
c295506ef9
Removed buffered inputs
2023-03-21 20:13:45 -04:00
Sam
868a42ba39
Addressed UX feedback
2023-03-21 20:10:40 -04:00
Sam
acde417ca7
Abilities that require a particular stance will be greyed out when not in that stance.
2023-03-21 20:08:21 -04:00
Sam
07c3e30a95
Fixed blade fever reducing damage instead of increasing it
2023-03-21 20:08:18 -04:00
Sam
7386257854
Appease CI
2023-03-21 20:07:37 -04:00
Sam
c9db227e43
Various things can cause one to naturally leave a stance. Also mildly buffed cultists.
2023-03-21 20:07:34 -04:00
Sam
3caa9dc529
Stances can now be left by interacting with the buff bar.
2023-03-21 20:03:22 -04:00
Sam
34168d9c76
Advanced AI for every stance.
2023-03-21 20:03:21 -04:00
Sam
387ea16598
Non-attack potion of sword AI
2023-03-21 20:03:18 -04:00
Sam
99f6312e59
Sword AI structure
2023-03-21 20:03:17 -04:00
Sam
7365fcb530
Rolls cancel recover at the cost of additional energy, sitting ends active stances.
2023-03-21 20:03:15 -04:00
Sam
39b30b3458
Decontextualized some sword abilities, added UI for sword skill tree.
2023-03-21 19:59:05 -04:00
Sam
27463758e5
Finisher abilities
2023-03-21 19:59:03 -04:00
Sam
86dfa34ec9
Cleaving stance required abilities
2023-03-21 19:59:00 -04:00
Sam
fed96b2e15
Crippling stance required abilities
2023-03-21 19:58:13 -04:00
Sam
c3026d388a
Defensive stance required abilities
2023-03-21 19:58:11 -04:00
Sam
a3d655970e
Heavy stance required abilities
2023-03-21 19:56:32 -04:00
Sam
e0a7449a99
Crescent slash
2023-03-21 19:39:40 -04:00
Sam
fce9211d49
Secondaries for all stances
2023-03-21 19:39:39 -04:00
Sam
596fe715b8
Cleaving stance skill abilities.
2023-03-21 19:39:39 -04:00
Sam
ed0de15a5a
Heavy stance skill abilities.
2023-03-21 19:39:35 -04:00
Sam
57806d7be9
Sword M1 abilities
2023-03-21 19:39:22 -04:00
Sam
61f0b424b9
Old sword mostly torn out, new sword framework in place
2023-03-21 19:39:22 -04:00
Sam
5f126bb5c6
Queued inputs are now culled after a period of time if they are not actively held
2023-03-21 19:39:19 -04:00
Sam
7ec9a7677f
Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability.
2023-03-21 19:38:18 -04:00
Sam
b376228d45
Primary and secondary abilities can now be contextual. BasicStance character state added.
2023-03-21 19:38:15 -04:00
Sam
9875008efa
Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement).
2023-03-21 19:29:34 -04:00
Sam
d0a46ed82b
Inputs now remain queued even when the input is released, until the input is used.
2023-03-21 19:26:06 -04:00
Imbris
61cb0ad39b
Merge branch 'imbris/small-tweaks' into 'master'
...
Various small tweaks / fixes
Closes #1475
See merge request veloren/veloren!3817
2023-03-18 00:52:20 +00:00
Samuel Keiffer
8febcf6b3d
Merge branch 'sam/buffs' into 'master'
...
Auras and buffs no longer need to tick every tick
See merge request veloren/veloren!3814
2023-03-12 22:06:48 +00:00
Sam
42388976d7
Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.
2023-03-12 16:37:02 -04:00
flo
704af5ef7b
bird_medium_scale
2023-03-12 18:08:21 +00:00
Sam
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
Sam
663db06844
Made auras no longer need to be mutably accessed every tick.
2023-03-11 16:45:12 -05:00
Sam
8a6a60d5bb
Buffs from auras no longer need to be mutably accessed every tick in aura system to prevent applying a buff every tick and ensure duration only starts after leaving aura
2023-03-11 16:45:12 -05:00
Sam
9efac9957d
Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component.
2023-03-11 16:45:11 -05:00
Sam
b1b41e95f6
Queueable buffs now work with buffs without using a timer, tests too
2023-03-11 16:45:11 -05:00
Sam
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
Imbris
0d8aa16d89
Avoid duplicate searches in the inventory for required items when
...
interacting with sprites and rustfmt decides to format a bunch of
stuff...
* Add PartialEq impls between ItemDefinitionId<'_> and
ItemDefinitionIdOwned.
* Remove unused Serialize and Deserialize derives from
ItemDefinitionId<'_>
* Add Inventory::get_slot_of_item_by_def_id which acts like
Inventory::get_slot_of_item but accepts a ItemDefinitionIdOwned
reference instead of an Item reference.
* Add some TODOs for some potential optimizations
* Rustfmt decided now was the time to format some random stuff I didn't
touch. Maybe I fixed something it was getting stuck on???? But some
files I didn't make any changes (although might have inadvertantly saved
them when viewing in editor (with fmt on save)).
* InvSlotId passed to SpriteInteract character state instead of
refinding the item in the inventory (if it moved we simply give up on
the state as if the requirements weren't met). (overall in this change
3 searches for the item in the inventory are reduced to a single one)
2023-03-11 10:24:30 -05:00
Imbris
93eab4791d
Remove ComponentKey TODO in Inventory::get_slot_of_item since item_definition_id contains component IDs!
2023-03-11 10:23:16 -05:00
Imbris
fe38b9b92b
Add documentation to bool field
2023-03-11 10:21:39 -05:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
flo
98e93d1a1c
spawn and loot tweaks, tursus and werewolf anims
2023-02-22 01:32:05 +00:00
flo
bf81ffc029
frost_gigas
2023-02-15 00:10:37 +00:00
flo
0531b40fae
bird_medium_2
2023-02-14 23:17:20 +00:00
Marcel
ea15cdcfe3
Merge branch 'james/sitting-stamina-regen' into 'master'
...
Refactor energy and poise regen
See merge request veloren/veloren!3792
2023-02-07 18:02:27 +00:00
James Melkonian
21a2a4ac46
Refactor energy and poise regen
2023-02-07 18:02:26 +00:00
James Melkonian
87f5a3345d
Fix sword sfx
2023-02-07 16:57:22 +00:00
flo666
d219cdd97c
spawns & hitboxes
2023-01-31 20:34:41 +01:00
flo666
9c09000256
- change bristlemane to bristleback
...
- axebeak tweaks
2023-01-31 20:34:41 +01:00
flo666
e109f5c377
axebeak, tursus
2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3
bristlemane
2023-01-31 20:34:40 +01:00
flo666
271b80b832
seal
2023-01-31 20:34:40 +01:00
Marcel
c165d28e7d
Merge branch 'wyvern_wings' into 'master'
...
wyverns
See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095
wyverns
2023-01-28 21:25:17 +00:00
Ellen Sun
d774319cf0
cleanup and fixes + added change to CHANGELOG.md
2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094
move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command
2023-01-27 20:31:56 -05:00
Joseph Donofry
74ee861dde
Add glow to dropped lanterns
2023-01-23 16:13:43 +00:00
Avi Weinstock
aba6f6654e
Add a new particle mode for potion sickness.
2023-01-19 15:06:14 -05:00
Avi Weinstock
adaf8ef6f4
Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs.
2023-01-19 15:06:13 -05:00
Avi Weinstock
1b00b18a7b
Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness.
2023-01-19 15:06:13 -05:00
Avi Weinstock
a871d3880b
Address MR 3756 review comments.
2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73
Implement potion sickness, which causes diminishing returns on healing from potions.
2023-01-19 15:06:12 -05:00
Marcel
a537d52f48
Merge branch 'james/fix-bats' into 'master'
...
Make bats easier to combat and fix hitbox scaling bug
See merge request veloren/veloren!3759
2023-01-16 11:34:09 +00:00
Corvella
ef5737360b
Improve Projectile/Entity Hit Detection
2023-01-16 05:58:28 +00:00
James Melkonian
9d31baf500
Make bats easier to combat and fix hitbox scaling bug
2023-01-15 16:25:43 -08:00
flo
650ef9a5e2
autodelete of summoned sprites
2023-01-15 18:28:38 +00:00
Matas Minelga
3850d3e86e
Inventory sorting MR fixes and slight improvements
2023-01-01 02:36:03 +02:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category
2022-12-31 02:32:41 +02:00
Benoît du Garreau
4fbb0b9a0b
Update to `assets_manager 0.9
2022-12-14 00:54:34 +01:00
Marcel Märtens
0ab7a2543e
fix clippy errors
2022-11-28 14:08:11 +01:00
Marcel
2f990fb06e
Merge branch 'holychowders/store_last_known_pos' into 'master'
...
Store Target's Last Known Position
See merge request veloren/veloren!3698
2022-11-20 22:38:14 +00:00
holychowders
61aa49fa66
Add last_known_pos to Target struct.
2022-11-16 18:26:07 -06:00
Samuel Keiffer
5709427e63
Merge branch 'sam/small-fixes' into 'master'
...
Small fixes for sword
See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Marcel
997c5a4e61
Merge branch 'ythern/more_unique_abilities' into 'master'
...
Ythern/roshwalr kit
See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Eternalisime
71e59e4b81
combat: tweaks and modified shockwave animation
2022-11-13 22:04:00 +01:00
Sam
4784b61656
Small fixes
2022-11-13 14:03:37 -05:00
Samuel Keiffer
1173c8257f
Merge branch 'holychowders/agent_awareness2' into 'master'
...
Rework internal representation of agent awareness
See merge request veloren/veloren!3661
2022-11-12 18:48:32 +00:00
holychowders
95fd092e26
Fix awareness changes.
2022-11-12 12:12:32 -06:00
flo
0351bf1d63
Moss Drake
2022-11-12 13:00:42 +00:00
Eternalisime
8f4863be28
combat: balance tweaks on roshwalr
2022-11-11 10:22:23 +01:00
Eternalisime
f1b77e27fe
combat: lowered flee_health on roshwalr
2022-11-10 16:57:29 +01:00
Eternalisime
918d5eb345
combat: added a unique kit to roshwalr
2022-11-10 13:53:12 +01:00
holychowders
571b07d54a
Remove dt and multiplication by 30.
2022-11-06 13:10:17 -06:00
holychowders
641a5c4cda
Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2
2022-10-29 13:21:27 -05:00
holychowders
3d4ad29d1d
Flee if attacked even if attacker is not close.
2022-10-28 21:31:49 +00:00
holychowders
3f3f8605af
Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2
2022-10-28 15:16:44 -05:00
holychowders
4426972057
Refer to the fully aware state of an agent as "alert".
2022-10-28 15:03:11 -05:00
Sam
0fe073fcdc
Addressed feedback from testing
2022-10-27 20:07:10 -04:00
Sam
b5682c4682
Addressed review comments
2022-10-27 20:07:09 -04:00
Sam
a44c36432e
Fixed that equipping weapons by using them from hotbar would bypass equipping animation.
2022-10-27 20:07:09 -04:00
Sam
1782408676
Address UX issues of contextual abilities.
2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc
Activated abilities can now be contextualized
2022-10-27 20:07:07 -04:00
Sam
07d273aa09
Removed unneccessary term in skill point cost calculation
2022-10-27 20:07:07 -04:00
Sam
5674923a54
Changed exp/sp progression for sword skill tree
2022-10-27 20:07:06 -04:00
Sam
38ce87d80b
Initial balance pass on sword ability stats
2022-10-27 20:07:05 -04:00
Sam
2e8ad96121
Stances now require a small amount of time to enter them
2022-10-27 20:07:05 -04:00
Sam
df9ef691fd
Cleaving stance AI
2022-10-27 20:07:03 -04:00
Sam
c97bfdfb94
Defensive stance AI
2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6
Sword AI for offensive abilities
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
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
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
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
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
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
Timothy Finnegan
5e5e1066eb
Added support for multiple timers, conditions, and counters in a single action node.
2022-10-23 18:31:09 -07: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
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
Monty Marz
2d8627c29b
Add gnarling chieftain mask
2022-10-15 11:05:21 +00: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
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +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
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
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00: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
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
juliancoffee
34c5e95d8a
Add Energy regen buff
...
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef
Merge branch 'creature_model_updates' into 'master'
...
Creature model updates
See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345
Creature model updates
2022-09-06 10:35:10 +00:00
juliancoffee
2b3cfe690d
Adress review
...
* Make compatible_handndess check its own function and get back to
`match`
2022-09-06 00:59:15 +03:00
juliancoffee
421aa44d5f
Make kit generate all possible modulars
2022-09-05 00:24:58 +03:00
juliancoffee
0c5a33b031
Add functions to generate collection of modulars
2022-09-05 00:24:58 +03:00
flo
6c89cd8fbf
put Organ under Toolkind Instrument
2022-08-30 16:55:02 +00:00
Samuel Keiffer
52ce12f383
Merge branch 'floppy-music-instruments' into 'master'
...
Music Instruments
See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032
Music Instruments
2022-08-28 18:48:18 +00:00
