3911 Commits

Author	SHA1	Message	Date
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
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