738 Commits

Author	SHA1	Message	Date
jshipsey	6a744eed82	anims	2020-10-14 21:06:32 -05:00
Sam	1c21362bc3	Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles.	2020-10-14 20:56:23 -05:00
Sam	7ef73f5981	Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.	2020-10-14 20:56:22 -05:00
Sam	cbb72363af	Reworked explosions. Tweaked staff fireball.	2020-10-14 20:56:21 -05:00
Sam	04dcd012da	Flamethrower particles.	2020-10-14 20:56:21 -05:00
Sam	c80f16ae74	Started to add particles.	2020-10-14 20:56:20 -05:00
Sam	256846a669	Initial implementation of new staff abilities.	2020-10-14 20:56:16 -05:00
jshipsey	521ffd64ba	cleanup	2020-10-14 12:50:33 -07:00
jshipsey	28eb58ddfa	anims	2020-10-14 12:50:33 -07:00
jshipsey	281155186f	hammer leap melee anim	2020-10-14 12:50:33 -07:00
jiminycrick	ae4b259250	Fix what broke during rebase	2020-10-14 12:50:32 -07:00
jiminycrick	431f99a791	Reducing the amount of data in character state	2020-10-14 12:50:32 -07:00
jiminycrick	05623eb8bd	Addressed comments	2020-10-14 12:50:32 -07:00
jiminycrick	04175bab09	Add skillbar stuff for 3rd skills	2020-10-14 12:50:32 -07:00
Imbris	308cca0dc9	Put server-cli specific settings in their own structure, serde_derive -> serde	2020-10-10 02:10:32 -04:00
Imbris	ef74d395a6	Improve figure and sprite highlighting	2020-10-10 02:10:31 -04:00
Monty Marz	2b800a2b63	make clippy happy ... Delete glider.ron	2020-10-07 02:23:20 +00:00
Sam	207586cfab	Beam particles fixed/tweaked.	2020-09-29 19:48:17 -05:00
Sam	51141b2c1a	Changelog line, final balance tweaks.	2020-09-29 19:48:16 -05:00
Sam	56d2afc0dc	Added keyframe support to basic beam state. Addressed some comments.	2020-09-29 19:48:15 -05:00
Sam	de45784596	Addressed round of testing feedback.	2020-09-29 19:48:09 -05:00
Sam	095433abcc	Addressed comments.	2020-09-29 19:48:06 -05:00
Sam	46563e7008	Added beam system. Added collision code for spherical wedge/cylinder detection.	2020-09-29 19:48:04 -05:00
Sam	ddbe871b50	Placeholder animation for beam attack.	2020-09-29 19:48:03 -05:00
Sam	36762be2a7	Fixed explosion color of sceptre M2.	2020-09-29 19:47:59 -05:00
Sam	6b23af6e0b	Tweaked particles. Added skill icons.	2020-09-29 19:47:58 -05:00
Sam	8b9202710f	New sceptre M2 is functional.	2020-09-29 19:47:57 -05:00
Sam	921d224ef6	Lifesteal now works. Added particles to healing beam.	2020-09-29 19:47:57 -05:00
Joshua Yanovski	938039a56e	Remove spurious uses of Vox. ... In the process, also try to address a few edge cases related to block detection, such as adding back previously solid sprites and removing filters that may be vestiges of earlier logic.	2020-09-26 16:30:40 +02:00
Sam	2ff59c9f60	Addressed comments	2020-09-21 17:55:29 -05:00
jshipsey	e79cef4824	dash animation	2020-09-21 17:38:55 -05:00
Sam	a8e834e754	Initial implementation of spin attack for sword.	2020-09-21 17:38:54 -05:00
Sam	b06ab250cc	Addressed first round of feedback on sword overhaul.	2020-09-21 17:38:52 -05:00
Sam	c99e4c3c18	Added swing duration to dash melee. Added framework for animation to be added.	2020-09-21 17:38:51 -05:00
Sam	04af75bf8d	Initial implementation of new dash melee.	2020-09-21 17:38:48 -05:00
jshipsey	a18c23025e	stage 2 and 3 anim	2020-09-21 17:38:46 -05:00
Sam	847bddbd89	Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.	2020-09-21 17:38:46 -05:00
Sam	2ba9d1e54f	Added support for different swings in the combo melee having differnt fractions of time buildup duration is split.	2020-09-21 17:38:45 -05:00
jshipsey	2451a64b97	stage 2 animation	2020-09-21 17:38:44 -05:00
Sam	0ba5740265	Added enum for stage section instead of using 4 bools.	2020-09-21 17:38:43 -05:00
Sam	440e45f2bc	Did stuff to support addition of keyframes for combo melee animation.	2020-09-21 17:38:43 -05:00
Sam	aab56ea636	Animation time for combo melee now resets between stages.	2020-09-21 17:38:42 -05:00
Sam	cf573a42bd	Initial implementation of combo melee attack.	2020-09-21 17:38:41 -05:00
Joshua Barretto	ece4a01867	Improved representation of Block for better performance, more features, and better backwards-compatibility	2020-09-20 11:46:12 +01:00
Samuel Keiffer	b2f42a117c	Merge branch 'sam/boss' into 'master' ... Boss Closes #769 See merge request veloren/veloren!1364	2020-09-19 20:47:07 +00:00
Joshua Yanovski	7b43752785	Merge branch 'droogmic/scene_terrain_refator' into 'master' ... Voxygen scene terrain - minor refactor See merge request veloren/veloren!1392	2020-09-19 20:29:02 +00:00
Sam	6deeb7fcfe	Addressed another comment.	2020-09-19 14:40:22 -05:00
Sam	45fef87f32	Addressed comments	2020-09-19 14:40:21 -05:00
Sam	e39770d1d9	Golem now spawns in dungeon.	2020-09-19 14:40:20 -05:00
Sam	6327dd18b6	Moved knockback to a server event so that it would actually be applied to the player.	2020-09-19 14:40:17 -05:00