931 Commits

Author	SHA1	Message	Date
timokoesters	ae0a3076e3	Allow holding ability keys again	2020-03-25 23:10:50 +01:00
timokoesters	74eacbe27c	fix "Npcs can't be healed anymore"	2020-03-25 22:57:14 +01:00
Pfauenauge90	8b05dda1d9	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01:00
AdamWhitehurst	964256541e	batter loadout swap logic	2020-03-25 07:58:26 -07:00
AdamWhitehurst	857652ee23	Update triple_strike: ... * add knockback * prevent infinite repeat * more dashes	2020-03-25 07:24:55 -07: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
Imbris	2897e898c2	move character state component to section reflecting its current sync strategy	2020-03-25 01:37:56 -04:00
timokoesters	7f02f5e7d2	Npcs can't be healed anymore	2020-03-24 23:03:57 +01:00
timokoesters	2117bb05d0	Healing staff	2020-03-24 22:03:11 +01:00
timokoesters	f0ce088810	Add lights and gravity again	2020-03-24 20:31:54 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	ea2500e7ab	Add minimum prepare duration to fireball and bow	2020-03-24 14:42:31 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
Pfauenauge90	060ebbc861	healing sceptre	2020-03-24 01:11: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	fbb24e7c8a	Even better fireballs	2020-03-23 22:52:35 +01:00
timokoesters	0eebf945fe	Glowing fireballs, no gravity	2020-03-23 13:55:52 +01:00
timokoesters	5194cef03a	Easier swimming, better damage calculation for explosions	2020-03-23 12:50:08 +01:00
timokoesters	fb16106960	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
Adam Whitehurst	68e3e36c6a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 12:50:55 -07:00
Adam Whitehurst	a510283277	update triple_strike	2020-03-22 12:50:52 -07:00
timokoesters	f3ca06aa71	feat: fireball explosions	2020-03-22 20:40:16 +01:00
timokoesters	0456d3cbed	Better staff M1, random +1 damage, better attackrange,angle impl	2020-03-22 16:26:32 +01:00
Pfauenauge90	387ab4a57e	added new stuff to chests	2020-03-22 16:19:30 +01:00
Pfauenauge90	662f5b1037	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Pfauenauge90	61e2a986f2	item images	2020-03-22 14:38:21 +01:00
Adam Whitehurst	5016b8da3a	consistent naming	2020-03-22 05:49:48 -07:00
Adam Whitehurst	db8d89a4d9	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Adam Whitehurst	afa6e43dd5	* remove Component Trait from CharacterAbility	2020-03-22 05:45:39 -07:00
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
Pfauenauge	f6731dc770	cloth armor	2020-03-22 00:21:11 +01:00
Adam Whitehurst	366978f16e	remove CharacterAbility ecs component sync	2020-03-21 16:04:45 -07:00
Adam Whitehurst	68ae715a9e	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:55:23 -07:00
Adam Whitehurst	862efb147c	clean up based on pr review comment	2020-03-21 15:55:20 -07:00
Imbris	f399085974	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04:00
Adam Whitehurst	b96d71a8c7	Reset vel on triple_strike	2020-03-21 15:06:42 -07:00
Adam Whitehurst	c5378b7065	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	819c2767bc	* move swap loadout to handle_swap_loadout util fn ... * impl From<JoinData> for StateUpdate	2020-03-21 14:16:26 -07:00
timokoesters	5361705ca7	fix sfx	2020-03-21 21:01:50 +01:00
Adam Whitehurst	3ae2b8de2e	Remove excess code	2020-03-21 10:32:32 -07:00
Adam Whitehurst	180ec89060	add SwapLoadout	2020-03-21 10:26:38 -07:00
Adam Whitehurst	7eaf6f664b	Fix water swimming jump velocity	2020-03-21 09:45:26 -07:00
Adam Whitehurst	79de60d791	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 07:08:14 -07:00
Adam Whitehurst	cb04df7736	swim now uses handle_orientation fn	2020-03-21 07:06:35 -07:00
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
Adam Whitehurst	ae175e57f3	Tweaking consts	2020-03-20 15:20:14 -07:00
Adam Whitehurst	0cdb80427d	better triple_strike	2020-03-20 15:03:29 -07:00