1358 Commits

Author	SHA1	Message	Date
Justin Shipsey	c9e8302cda	Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835	2021-03-02 01:29:46 +00:00
jshipsey	8a82e1aa37	final asset corrections, fix glider anim	2021-03-01 17:37:47 -05:00
heydabop	839f599c49	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
Sam	803c7d81dc	Fix a few asset paths for armors.	2021-03-01 00:58:43 -05:00
Samuel Keiffer	c06e36fe6b	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
Sam	0ec709bf17	Migration for armor re-organization.	2021-03-01 00:42:35 -05:00
jshipsey	f4a10912b0	more asset organization	2021-02-28 22:18:43 -05:00
Samuel Keiffer	a2c19cd047	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	7837f480cd	Buff icon	2021-02-28 17:31:35 -05:00
Sam	45c739da02	Factored formatting of buff text out to a single function.	2021-02-28 16:04:33 -05:00
Imbris	0db3b6a74c	Merge branch 'Lerg/Issue_#976' into 'master' ... Issue #976 Some inputs are missing the ability to be rebound See merge request veloren/veloren!1832	2021-02-28 18:23:30 +00:00
Justin Shipsey	2c397f63cc	Merge branch 'heydabop/966-controller-y-invert' into 'master' ... #966 - Setting to invert controller Y axis See merge request veloren/veloren!1817	2021-02-28 18:02:04 +00:00
Lerg	56cae542ec	Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator	2021-02-28 19:02:32 +03:00
Avi Weinstock	1831efd8e4	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
jshipsey	079f1e7dc0	re-org armor, common	2021-02-27 22:02:05 -05:00
Monty Marz	7d366aa09a	reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button	2021-02-27 19:02:26 +00:00
jshipsey	77c89d732b	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
Sam	8db54e9b53	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	4aaef35d1d	address comments	2021-02-27 01:42:47 -05:00
Snowram	cf228c7642	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	b32aab5a26	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	8f463921f8	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	7feb00f7e4	balance pass 2	2021-02-27 01:42:47 -05:00
jshipsey	c44a542fab	rebase, yeti in dungeon	2021-02-27 01:42:47 -05:00
jshipsey	9fdba83b03	initial balance	2021-02-27 01:42:47 -05:00
Snowram	7d9d66709c	Adds yeti npc	2021-02-27 01:42:46 -05:00
jshipsey	c9b9d81003	dash, spin, jump changes	2021-02-27 01:42:46 -05:00
Snowram	ba18f1fab3	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	56acb6a5f0	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00
jshipsey	befa6b3a21	theropod retrofit, some more moves	2021-02-27 01:42:46 -05:00
jshipsey	0ffcd62d12	some new moves, combine biped weapons into one file	2021-02-27 01:42:46 -05:00
jshipsey	ce8b4d27a2	full bipedsmall armor swaps	2021-02-27 01:42:46 -05:00
Sam	8721f053f9	Fixed particles.	2021-02-27 01:42:46 -05:00
jshipsey	7e2794c234	anim tweaks, more loadout setup	2021-02-27 01:42:46 -05:00
jshipsey	fa1f2b0880	golem retrofit	2021-02-27 01:42:46 -05:00
Timo Kösters	ef2cc3082a	Improve particles	2021-02-27 01:42:46 -05:00
jshipsey	d8eeffeacd	speedier weapons initial testing	2021-02-27 01:42:45 -05:00
jshipsey	f8a6a48b41	BL improvements, various fixes	2021-02-27 01:42:45 -05:00
jshipsey	6f49e0b94e	rebase	2021-02-27 01:42:45 -05:00
jshipsey	749fc13882	rendering	2021-02-27 01:42:45 -05:00
jshipsey	fc80fff924	new dungeon setups, new npcs, weapon specific loadouts, anims	2021-02-27 01:42:45 -05:00
jshipsey	fbaaa60513	bow	2021-02-27 01:42:45 -05:00
jshipsey	4e3bf62732	the stabs	2021-02-27 01:42:45 -05:00
jshipsey	36711e8885	wielding	2021-02-27 01:42:45 -05:00
jshipsey	2a908d5638	run anim tweaks	2021-02-27 01:42:45 -05:00
unknown	aa4f68d72b	More npcs work	2021-02-27 01:42:45 -05:00
unknown	917afb3f0d	Add new quadmeds npcs with rough offsets	2021-02-27 01:42:44 -05:00
Snowram	39b76036b1	Sahagin, Adlet npcs	2021-02-27 01:42:43 -05:00
jshipsey	37a4bb4bef	gnome	2021-02-27 01:42:43 -05:00
jshipsey	fd96357775	biped_small setup	2021-02-27 01:42:43 -05:00