1373 Commits

Author	SHA1	Message	Date
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
Imbris	f399085974	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04: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
jshipsey	a861f6ad26	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:47:28 -04:00
jshipsey	14f560f21b	proper hammer smash, small tweaks	2020-03-21 15:47:16 -04:00
jshipsey	221f675217	spin attack	2020-03-21 14:54:29 -04: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
jshipsey	49986a0e09	bow work	2020-03-21 03:40:14 -04:00
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
jshipsey	514d65eb7c	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 18:54:54 -04:00
jshipsey	a0785e693a	shooting anim state, cast anim, small tweaks	2020-03-20 18:54:27 -04:00
Adam Whitehurst	0cdb80427d	better triple_strike	2020-03-20 15:03:29 -07:00
Pfauenauge90	4153df66ea	stat icons, frame colours	2020-03-20 20:52:32 +01:00
timokoesters	44ec09a8e7	Go to idle state when picking items up	2020-03-20 20:23:04 +01:00
timokoesters	df858cb370	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	c630df7f9a	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
Pfauenauge90	6836a043af	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 13:02:35 +01:00
Pfauenauge90	4f1104a417	new loading screen bg	2020-03-20 13:01:31 +01:00
jshipsey	50e96efe6b	hammer go smash	2020-03-20 02:38:53 -04:00
jshipsey	93bea033d9	axe, hammer proper wields	2020-03-20 01:27:54 -04:00
Pfauenauge90	6094e4b017	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01:00
timokoesters	1e1ce2adbf	Fix weapon not updating after swapping to a weapon of the same type	2020-03-19 20:57:36 +01:00
timokoesters	26674390ab	Hide player body after death	2020-03-19 20:36:19 +01:00
Pfauenauge90	44d3f4c4ac	fix	2020-03-19 20:01:31 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
Pfauenauge90	e16bb66fb3	fix	2020-03-19 18:19:05 +01:00
Pfauenauge90	466b80e8a8	added const tweaker	2020-03-19 18:11:45 +01:00
timokoesters	6c129c9b8d	Fix amounts out of range	2020-03-19 16:51:50 +01:00
Pfauenauge90	0bb0d5e7a6	Update bag.rs	2020-03-19 16:43:11 +01:00
Pfauenauge90	041277917b	Update bag.rs	2020-03-19 15:49:32 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
timokoesters	87c276b292	Add hard coded loot	2020-03-18 20:37:42 +01:00
Pfauenauge90	1cb2022d35	UI visuals	2020-03-18 19:51:48 +01:00
Pfauenauge90	43bae55961	coin/currency visuals	2020-03-18 12:05:36 +01:00
Pfauenauge90	70511e0f4e	background images	2020-03-18 01:43:55 +01:00
Pfauenauge90	04c8ed9a3c	armour slot bgs	2020-03-17 19:48:15 +01:00
Pfauenauge90	d752501db1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-17 19:04:11 +01:00
Pfauenauge90	c9d09b8cdd	more slots	2020-03-17 19:04:06 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Pfauenauge90	431974cf8e	test armor slot	2020-03-17 17:02:50 +01:00
timokoesters	d6929ae0ea	Select newly created character automatically	2020-03-17 16:22:34 +01:00
timokoesters	08b44db1fc	Stop first person bounce in air	2020-03-17 16:08:53 +01:00