1346 Commits

Author	SHA1	Message	Date
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
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
Snowram	79d4ca6fae	Merge branch 'Sarrakitty/OceanFlora' into 'master' ... added coral reefs, kelp forests, and seagrass See merge request veloren/veloren!1819	2021-02-27 01:52:33 +00:00
Sarra	73f966dc63	tweaking coral models and seagrass spawns	2021-02-25 23:39:41 -05:00
Samuel Keiffer	a1ff097987	Merge branch 'aweinstock/coin-item' into 'master' ... Add a coin item and make amounts visible on dropped items. See merge request veloren/veloren!1821	2021-02-26 04:17:12 +00:00
Samuel Keiffer	d4e54217fc	Merge branch 'add-gemu-models' into 'master' ... Add sword and bow models from backlog See merge request veloren/veloren!1818	2021-02-26 02:59:51 +00:00
Avi Weinstock	890aa6fbee	Add a coin item and make amounts visible on dropped items.	2021-02-25 21:31:30 -05:00
Sarra	c965db4420	correcting formatting and removing commented out code that wasn't supposed to be there	2021-02-25 20:41:57 -05:00
Snowram	c77721e8c7	Fixes weapons model and icon offsets	2021-02-26 02:37:59 +01:00
Samuel Keiffer	f608ff9806	Merge branch 'aweinstock/modularforms' into 'master' ... Support modular weapon components made from a tagged material using the material as a multiplier. See merge request veloren/veloren!1815	2021-02-26 00:53:02 +00:00
Avi Weinstock	e58768bc37	Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.	2021-02-25 15:26:49 -05:00
Sarra	07f34e11f9	added coral reefs, kelp forests, and seagrass	2021-02-25 05:33:18 -05:00
Sam	2a5edb41ab	Weapon offsets in humanoid manifest	2021-02-24 21:52:32 -05:00
Sam	f4d25ff5c0	Bows	2021-02-24 20:37:43 -05:00