1028 Commits

Author	SHA1	Message	Date
AdamWhitehurst	7897008ec3	batter loadout swap logic	2020-03-25 07:58:26 -07:00
AdamWhitehurst	9f984998c9	Update triple_strike: ... * add knockback * prevent infinite repeat * more dashes	2020-03-25 07:24:55 -07:00
Imbris	e1b0206740	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> ... not registered	2020-03-25 02:05:28 -04:00
Imbris	a1cf04fb22	Input handling changes	2020-03-25 01:38:37 -04:00
Adam Whitehurst	4bfbdf7c84	update controller tick fn	2020-03-25 01:38:25 -04:00
Imbris	a5887bae8e	move character state component to section reflecting its current sync strategy	2020-03-25 01:37:56 -04:00
timokoesters	eb89507782	Npcs can't be healed anymore	2020-03-24 23:03:57 +01:00
timokoesters	f9668943e9	Healing staff	2020-03-24 22:03:11 +01:00
timokoesters	2465d7acf2	Add lights and gravity again	2020-03-24 20:31:54 +01:00
timokoesters	2b65e631f6	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	5960a807bf	Add minimum prepare duration to fireball and bow	2020-03-24 14:42:31 +01:00
timokoesters	2e33254db7	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
Pfauenauge90	7f269fe62a	healing sceptre	2020-03-24 01:11:14 +01:00
timokoesters	559d0e3b28	Better inventory counter	2020-03-24 00:38:00 +01:00
timokoesters	608cd345fc	Add inventory counter	2020-03-24 00:23:21 +01:00
timokoesters	7ec211ddab	Even better fireballs	2020-03-23 22:52:35 +01:00
timokoesters	ab9fdbd75e	Glowing fireballs, no gravity	2020-03-23 13:55:52 +01:00
timokoesters	e7c370d03b	Easier swimming, better damage calculation for explosions	2020-03-23 12:50:08 +01:00
timokoesters	71a8671a4a	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
Adam Whitehurst	79f6f1331b	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 12:50:55 -07:00
Adam Whitehurst	fb9c832284	update triple_strike	2020-03-22 12:50:52 -07:00
timokoesters	5767d31190	feat: fireball explosions	2020-03-22 20:40:16 +01:00
timokoesters	cd0bf0084f	Better staff M1, random +1 damage, better attackrange,angle impl	2020-03-22 16:26:32 +01:00
Pfauenauge90	15dc5ebbb8	added new stuff to chests	2020-03-22 16:19:30 +01:00
Pfauenauge90	e1222fdf02	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Pfauenauge90	44379f9159	item images	2020-03-22 14:38:21 +01:00
Adam Whitehurst	e2a26a432c	consistent naming	2020-03-22 05:49:48 -07:00
Adam Whitehurst	b110efef34	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Adam Whitehurst	eb0176a7c3	* remove Component Trait from CharacterAbility	2020-03-22 05:45:39 -07:00
Imbris	90b2a0fa1f	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
Pfauenauge	2d369298aa	cloth armor	2020-03-22 00:21:11 +01:00
Adam Whitehurst	7d01d16ff9	remove CharacterAbility ecs component sync	2020-03-21 16:04:45 -07:00
Adam Whitehurst	7f82dae1a0	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:55:23 -07:00
Adam Whitehurst	650f53eaeb	clean up based on pr review comment	2020-03-21 15:55:20 -07:00
Imbris	12af35a3b9	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04:00
Adam Whitehurst	72278d0c07	Reset vel on triple_strike	2020-03-21 15:06:42 -07:00
Adam Whitehurst	9f84d8ea92	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	f93d1add44	* move swap loadout to handle_swap_loadout util fn ... * impl From<JoinData> for StateUpdate	2020-03-21 14:16:26 -07:00
timokoesters	9a40b5b957	fix sfx	2020-03-21 21:01:50 +01:00
Adam Whitehurst	3cf281e504	Remove excess code	2020-03-21 10:32:32 -07:00
Adam Whitehurst	e967c44e6c	add SwapLoadout	2020-03-21 10:26:38 -07:00
Adam Whitehurst	00d6736e3a	Fix water swimming jump velocity	2020-03-21 09:45:26 -07:00
Adam Whitehurst	96f66f5997	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 07:08:14 -07:00
Adam Whitehurst	de90eb600c	swim now uses handle_orientation fn	2020-03-21 07:06:35 -07:00
Imbris	a6a1a08ec9	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
Adam Whitehurst	48bb8bb21f	Tweaking consts	2020-03-20 15:20:14 -07:00
Adam Whitehurst	0276e38aa3	better triple_strike	2020-03-20 15:03:29 -07:00
timokoesters	897f925c18	Go to idle state when picking items up	2020-03-20 20:23:04 +01:00
timokoesters	d28b5669aa	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	358469311a	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00