932 Commits

Author	SHA1	Message	Date
AdamWhitehurst	1d51f8fc0f	prevent transition if pressing too early & timed	2020-03-27 11:17:34 -07:00
AdamWhitehurst	e4f2bf7ebf	prevent holding to time combo	2020-03-27 11:08:10 -07:00
AdamWhitehurst	02b29efbfc	Undo mistake, axe ability corrected. ... Axe m2 cost 0 -> 100 Axe m2 dmg 8 -> 12	2020-03-27 11:07:21 -07:00
AdamWhitehurst	233595737e	Axe m2 dmg 10 -> 15 ... Axe m2 cost 0 -> 50	2020-03-27 11:03:07 -07:00
AdamWhitehurst	d774091fa4	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
AdamWhitehurst	8eb233bdbc	Add timing window duration to triple strike	2020-03-27 10:43:18 -07:00
AdamWhitehurst	01264ce167	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 10:40:19 -07:00
AdamWhitehurst	2ffac59aa3	add triple strike timing	2020-03-27 10:40:15 -07:00
timokoesters	c6e635c511	Increase movement speed, make npcs slower than players	2020-03-27 18:39:26 +01: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
timokoesters	ad0314b4f5	Projectile hits regenerate energy	2020-03-27 17:07:19 +01:00
AdamWhitehurst	4bfc934772	triples strike knockback 15.0 -> 16.0	2020-03-27 08:26:53 -07:00
AdamWhitehurst	31760d220a	triple_strike knockback 20.0 -> 15.0	2020-03-27 08:17:17 -07:00
AdamWhitehurst	c1647e93f1	make triple strike continue without hits again	2020-03-27 07:03:26 -07:00
Shane Handley	362771be4b	SFX and unit test fixes.	2020-03-27 12:06:25 +11:00
timokoesters	7a9c7628db	Fix triplestrike bug	2020-03-26 23:29:12 +01:00
timokoesters	2b68adff51	Balancing, make fireball not holdable, arrow knockback	2020-03-26 22:56:33 +01:00
timokoesters	8010e5afb4	Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants	2020-03-26 22:56:33 +01:00
timokoesters	e573fbbce5	Better glider physics	2020-03-26 22:56:33 +01:00
timokoesters	b9c85b9beb	Balancing	2020-03-26 22:56:33 +01:00
AdamWhitehurst	8d1f93a2d1	ore responsive oreintating	2020-03-26 14:48:51 -07:00
AdamWhitehurst	7f1a90ae27	Prevent transition if failed hit	2020-03-26 14:44:39 -07:00
Shane Handley	0446a56f00	Regen energy when sitting.	2020-03-26 18:23:57 +11:00
Imbris	e6f50b4032	Replace uses of normalized() to avoid setting ori to NaN values, tweak triple strike code	2020-03-25 18:49:15 -04:00
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