3550 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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	3ec2cc08b3	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00
Pfauenauge90	68192738ee	placement fix	2020-03-20 14:55:31 +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
Marcel	0c9ef6d5d9	Merge branch 'xMAC94x/update-toolchain' into 'master' ... update toolchain to `nightly-2020-03-05` See merge request veloren/veloren!853	2020-03-20 10:49:12 +00:00
Marcel	4ab646900a	Merge branch 'xMAC94x/temp-macos' into 'master' ... temp allow failure in macos See merge request veloren/veloren!844	2020-03-20 10:27:02 +00:00
timokoesters	835f3f5fe3	Arrows shouldn't turn into loot, staff shoots fireballs again	2020-03-20 11:25:53 +01:00
Acrimon	763d68fb96	Merge branch 'songtronix/include-version-in-crash' into 'master' ... Mention the game version in panic See merge request veloren/veloren!852	2020-03-20 09:24:51 +00:00
Songtronix	b940cde501	change(panic): mention the game version in panic	2020-03-20 09:47:00 +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	bb76cc37bd	Oops	2020-03-19 16:14:04 -07:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	3a55ae5848	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 22:36:45 +01:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01:00
timokoesters	208245e82e	Make orientation not dependend on camera dir while wielded	2020-03-19 22:03:17 +01:00
Acrimon	8c2c2cb430	Merge branch 'shandley/fix-dropped-pickup-range' into 'master' ... Fix: Make the dropped item collection range match the world item range limit. See merge request veloren/veloren!848	2020-03-19 20:30:09 +00: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	ce5eb2e2ab	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 19:34:05 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
timokoesters	83be1226ef	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
Pfauenauge90	e16bb66fb3	fix	2020-03-19 18:19:05 +01:00
Pfauenauge90	b9b2833e97	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 18:11:48 +01:00
Pfauenauge90	466b80e8a8	added const tweaker	2020-03-19 18:11:45 +01:00
timokoesters	49b0af10a9	Regular naming scheme for armor assets	2020-03-19 17:47:37 +01:00
timokoesters	bb1b3ceabc	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	22652cfa37	Restore old boost stick behavior	2020-03-19 17:01:58 +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
Pfauenauge90	d863e12235	swift leather armour parts	2020-03-19 14:17:53 +01:00
timokoesters	2b22b84a33	Give bandits and travelers different armor	2020-03-19 11:21:37 +01:00
Pfauenauge90	509615c15b	npc armour	2020-03-18 23:09:58 +01:00
Imbris	1a484410ca	Delete Vel and Ori on the client when they are removed on the server	2020-03-18 17:01:51 -04:00
timokoesters	038f655269	fix pfau's broken commit	2020-03-18 21:12:55 +01:00
Pfauenauge90	4d9327cef5	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	87c276b292	Add hard coded loot	2020-03-18 20:37:42 +01:00