994 Commits

Author	SHA1	Message	Date
Songtronix	c9c169e486	Merge branch 'ElXreno/proper-assets-path-finding' into 'master' ... Find assets by using other environment variables See merge request veloren/veloren!912	2020-04-15 10:38:00 +00:00
Imbris	75dc6bd455	Clarify todo comment	2020-04-12 15:35:43 -04:00
ElXreno	af5476b672	Find assets by using other environment variables ... By using HOME, XDG_DATA_HOME and XDG_DATA_DIRS we can build potentially proper paths for finding assets folder.	2020-04-12 20:25:29 +03:00
Imbris	215d7f2803	Fix selecting and remove amount text when dragging	2020-04-12 18:41:06 +02:00
Imbris	330b7f3c93	Enable unequipping as well as equipping to specific slots	2020-04-12 18:41:06 +02:00
Pfauenauge90	249746abd2	7 dwarf accessories	2020-04-12 18:41:03 +02:00
Pfauenauge90	59766b4cb6	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge90	086e09ff58	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge90	1ea5019715	tooltips	2020-04-12 18:40:58 +02:00
Pfauenauge90	c9b8059f2e	item types	2020-04-12 18:40:57 +02:00
Pfauenauge90	d51858c875	more armour types	2020-04-12 18:40:56 +02:00
Pfauenauge90	1af1b1cf35	cape item	2020-04-12 18:40:56 +02:00
Pfauenauge90	edc0ba0f75	cape item	2020-04-12 18:40:55 +02:00
Imbris	ce619c2aff	Use new slot widget for armor slots	2020-04-12 18:40:53 +02:00
Piotr Korgól	9c96e6fb3b	Prevent projectiles from hitting their owners	2020-04-06 23:08:54 +02:00
Imbris	a8fff80b0c	Show errors loading individual files during glob asset loading	2020-04-01 20:37:23 -04:00
Imbris	053ec2d874	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
Imbris	baf973a32a	Merge branch 'master' into 'combat' ... # Conflicts: # CHANGELOG.md	2020-04-01 20:42:27 +00:00
Imbris	7f45873ff6	fmt	2020-04-01 11:52:44 -04:00
AdamWhitehurst	6f4736b179	better timing const name, ... timing_delay 400 -> 350	2020-04-01 08:40:25 -07:00
AdamWhitehurst	cb8a49a5e3	refactor transition logic (thx imbris)	2020-04-01 08:39:18 -07:00
Imbris	29672a00e0	Point to newly released vek, add todo to reconsider empty item, remove uneeded ori slerp, remove agent from character behavior, add todos to combat sys, check if entities still exist before possessing & if possessed entity has a loadout move the active item into the second item space	2020-04-01 11:15:14 -04:00
AdamWhitehurst	bf870b357e	Remove unused KnockUp LocalEvent (use ApplyForce)	2020-04-01 07:30:06 -07:00
AdamWhitehurst	15d30d061c	remove unnecessary line	2020-04-01 07:10:35 -07:00
AdamWhitehurst	ce9716c97a	expose and use blocking consts	2020-04-01 07:07:10 -07:00
AdamWhitehurst	43cf27434e	triple_strike combo timing window 600 -> 400	2020-04-01 06:43:28 -07:00
AdamWhitehurst	0b324993bc	Roll move_dir handling 1.5 -> 0.25	2020-04-01 06:42:56 -07:00
AdamWhitehurst	3f0bcb3d9c	Roll duration 500 -> 700ms	2020-04-01 06:24:02 -07:00
AdamWhitehurst	626427770b	Roll speed 15.0 -> 25.0	2020-04-01 06:23:26 -07:00
Imbris	2a126fff83	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00
AdamWhitehurst	1b2b0786e6	remove unused timed_combo	2020-03-29 13:40:03 -07:00
AdamWhitehurst	46e8658525	triple_strike orientation	2020-03-28 13:50:42 -07:00
Imbris	26c4341b97	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
Imbris	8a71452135	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
Imbris	4f3bb291a1	Combine dir and force in KnockUp and ApplyForce events	2020-03-27 22:19:23 -04:00
Imbris	94f44b0b32	Create Dir type for better enforcement of non NaN, normalized representations of directions	2020-03-27 22:02:07 -04:00
Imbris	8edbea5587	split toggle events	2020-03-27 21:32:30 -04:00
AdamWhitehurst	94ec0cab41	prevent transition if pressing too early & timed	2020-03-27 11:17:34 -07:00
AdamWhitehurst	a4cdafc6f5	prevent holding to time combo	2020-03-27 11:08:10 -07:00
AdamWhitehurst	53c01a8572	Undo mistake, axe ability corrected. ... Axe m2 cost 0 -> 100 Axe m2 dmg 8 -> 12	2020-03-27 11:07:21 -07:00
AdamWhitehurst	5f2ac7885d	Axe m2 dmg 10 -> 15 ... Axe m2 cost 0 -> 50	2020-03-27 11:03:07 -07:00
AdamWhitehurst	298e28b7d9	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
AdamWhitehurst	07c35765f0	Add timing window duration to triple strike	2020-03-27 10:43:18 -07:00
AdamWhitehurst	ecbadc3ba9	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 10:40:19 -07:00
AdamWhitehurst	e0f567dbb7	add triple strike timing	2020-03-27 10:40:15 -07:00
timokoesters	14b3d8970a	Increase movement speed, make npcs slower than players	2020-03-27 18:39:26 +01:00
Pfauenauge90	38eae21ade	fire bolt visuals	2020-03-27 18:31:45 +01:00
timokoesters	d32ec6ea40	Fix char selection not showing tools	2020-03-27 18:17:41 +01:00
timokoesters	431bc8a069	Projectile hits regenerate energy	2020-03-27 17:07:19 +01:00
AdamWhitehurst	f2fdb028a7	triples strike knockback 15.0 -> 16.0	2020-03-27 08:26:53 -07:00