4038 Commits

Author	SHA1	Message	Date
Joshua Barretto	295e3c4109	Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master' ... autodelete of summoned sprites See merge request veloren/veloren!3735	2023-01-15 18:28:38 +00:00
flo	650ef9a5e2	autodelete of summoned sprites	2023-01-15 18:28:38 +00:00
flo	98c1e68209	Fix wall cheese	2023-01-14 15:41:07 +00:00
Marcel	2ff24259be	Merge branch 'zesterer/lod-models' into 'master' ... New LoD model, wind sway pays attention to wind velocity See merge request veloren/veloren!3739	2023-01-02 14:51:00 +00:00
Matas Minelga	3850d3e86e	Inventory sorting MR fixes and slight improvements	2023-01-01 02:36:03 +02:00
Joshua Barretto	f48e1ca951	Make wind sway change according to weather wind velocity	2022-12-31 17:40:40 +00:00
Joshua Barretto	873d3fb7a4	Added dead trees to LoD	2022-12-31 15:32:56 +00: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
Isse	ef2c1633ed	Merge branch 'isse/bridges' into 'master' ... Bridges See merge request veloren/veloren!3680	2022-11-30 15:07:03 +00:00
Marcel Märtens	4a1404cd71	fix leftovers from toolchain update	2022-11-30 15:14:47 +01:00
IsseW	7296843923	simple bridges	2022-11-30 15:13:52 +01:00
Marcel Märtens	225cbf472f	update tag and fix empty maps, other bugs introduced by auto fix	2022-11-29 09:19:10 +01:00
Marcel Märtens	2812729b78	cargo clippy lifetimes	2022-11-28 15:19:57 +01:00
Marcel Märtens	dad73ba2a3	fix clamp clippy errors	2022-11-28 14:26:27 +01:00
Marcel Märtens	0ab7a2543e	fix clippy errors	2022-11-28 14:08:11 +01:00
Marcel Märtens	ba3747a3f0	update toolchain	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
LunarEclipse	32abb59132	Updated some of my personal info	2022-11-08 23:06:32 +01:00
DaforLynx	b2b14e7ab4	Event music can use more than one event at a time. Added test for soundtracks.	2022-11-07 22:39:25 +00:00
holychowders	571b07d54a	Remove dt and multiplication by 30.	2022-11-06 13:10:17 -06:00
Avi Weinstock	372ffe45d7	Add command for debugging ways.	2022-10-29 14:32:48 -04:00
holychowders	641a5c4cda	Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2	2022-10-29 13:21:27 -05:00
Avi Weinstock	08a50afd9f	Mostly working train tracks.	2022-10-28 21:36:42 -04: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	e1f76e0127	Fixed sword AI after contextualized sword 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	172c9e0689	Fixed inability to use abilities while in a stance	2022-10-27 20:07:07 -04:00
Sam	273949369f	Fix unit tests	2022-10-27 20:07:06 -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	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