1420 Commits

Author	SHA1	Message	Date
AdamWhitehurst	d3b99fc026	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-29 13:40:08 -07:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -07:00
jshipsey	ff56e5f9f9	fireball damage tweaks/staff shooting anim	2020-03-29 14:00:05 -04:00
jshipsey	fa54c90558	cleanup, tweak to triplestrike stage 1	2020-03-29 03:53:52 -04:00
Pfauenauge90	e3a5051b52	small fix	2020-03-28 18:06:00 +01:00
Imbris	d3b5b1e637	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
Imbris	f551c4a2c5	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
jshipsey	8fd774f21a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 23:59:45 -04:00
jshipsey	49ba196671	proper bow animation	2020-03-27 23:59:05 -04:00
Imbris	ba3fa16c33	Create Dir type for better enforcement of non NaN, normalized representations of directions	2020-03-27 22:02:07 -04:00
AdamWhitehurst	d774091fa4	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
Pfauenauge90	0b3fb2dd3c	fire bolt visuals	2020-03-27 18:31:45 +01:00
timokoesters	6fe5c5724c	Fix char selection not showing tools	2020-03-27 18:17:41 +01:00
Pfauenauge90	c3a4f897da	update help screen	2020-03-27 17:50:34 +01:00
Pfauenauge90	11be9c10b2	remapped default look key, removed unused keys	2020-03-27 16:09:51 +01:00
jshipsey	0ffff86e25	third attack for triple strike	2020-03-27 01:57:30 -04:00
jshipsey	1c3d1d260c	small animation tweaks	2020-03-26 23:51:55 -04:00
Pfauenauge90	50b7206577	asset cleanup, map visuals	2020-03-27 04:06:27 +01:00
Shane Handley	362771be4b	SFX and unit test fixes.	2020-03-27 12:06:25 +11:00
timokoesters	fe2aa7da7b	Merge remote-tracking branch 'origin/master' into combat	2020-03-26 23:43:33 +01:00
jshipsey	7692f1d354	fixed wield feet while jumping, tweaked charge anim	2020-03-26 18:26:23 -04:00
Capucho	03396eb77e	Implement #505	2020-03-26 21:22:21 +00:00
jshipsey	175fea98ef	more cleanup, WIP fake swimming	2020-03-26 01:35:25 -04:00
Pfauenauge90	5f10cdf0c6	adjusted foot step sounds, inventory space above bag	2020-03-25 21:06:01 +01:00
Pfauenauge90	8b05dda1d9	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01:00
Imbris	3889ec7292	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> ... not registered	2020-03-25 02:05:28 -04:00
Imbris	6ba158b7e1	Input handling changes	2020-03-25 01:38:37 -04:00
Adam Whitehurst	37ec191021	update controller tick fn	2020-03-25 01:38:25 -04:00
jshipsey	c7d9b5ae0f	fixed critter animation	2020-03-25 01:29:55 -04:00
jshipsey	047f6b8a01	fixed swimming, better charge	2020-03-25 01:22:07 -04:00
jshipsey	a6537ed69b	starting foot movement with attacks, clearing some dead code	2020-03-25 00:15:06 -04:00
Pfauenauge90	550dd144bc	new icon art	2020-03-25 01:41:43 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
jshipsey	7a4f0fa9ac	climb fix, const tweak update, trying equip anims	2020-03-24 00:24:31 -04:00
Pfauenauge90	7f30ec3d55	colors for inventory space counter	2020-03-24 01:31:14 +01:00
timokoesters	43d4e8aad2	Better inventory counter	2020-03-24 00:38:00 +01:00
timokoesters	1c145e8d3a	Add inventory counter	2020-03-24 00:23:21 +01:00
timokoesters	c01cd62f5f	Move meta.dat to ron, so we don't create memory allocation errors	2020-03-23 14:18:05 +01:00
timokoesters	fb16106960	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
jshipsey	eddf3ec658	raised run anim speed 20%	2020-03-22 21:32:34 -04:00
Capucho	0358caa173	Fix the wrong logs directory being displayed on panic	2020-03-22 22:06:05 +00:00
jshipsey	9cbbe0311f	rewrote the whole stupid skeleton to work much smarter	2020-03-22 16:06:53 -04:00
jshipsey	3baa0471ec	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 11:55:35 -04:00
jshipsey	0773524031	wield idle, wield run	2020-03-22 11:55:28 -04:00
Pfauenauge90	662f5b1037	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Adam Whitehurst	db8d89a4d9	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
jshipsey	eafd761d5a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 00:14:11 -04:00
jshipsey	32c85d1bab	axe attack	2020-03-22 00:11:24 -04:00