140 Commits

Author	SHA1	Message	Date
Justin Shipsey	f983295318	Merge branch 'swilliams/jewellery' into 'master' ... Gem Rings and small change to trading. See merge request veloren/veloren!2500	2021-06-26 02:44:04 +00:00
Scott Williams	8d0a1ad7b4	Gem Rings and small change to trading.	2021-06-26 02:44:02 +00:00
Snowram	58b95d12d4	Adds alpaca and llama npcs	2021-06-24 19:30:15 +02:00
Marcel	4cafdb3bfd	Merge branch 'aweinstock/mining-skill-tree' into 'master' ... Mining skill tree. See merge request veloren/veloren!2406	2021-06-14 14:19:06 +00:00
Avi Weinstock	0e394029de	Mining skill tree.	2021-06-13 14:34:42 -04:00
Monty	c17e3ad996	Cactus Colada ... Made cacti lootable Cactus colada recipe and item price balance fmt "make it 8 and drop it to 20 or 25? Not really sure tbh"	2021-06-13 13:52:56 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	9034d0f25d	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	8acd3832e3	more loot tables, overworld ores, more items	2021-06-07 11:00:00 +02:00
jshipsey	05de96c94b	ore deposits, flower drops	2021-06-07 10:59:50 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
jshipsey	58bd51a9e8	icon work, more models	2021-06-07 10:58:27 +02:00
jshipsey	18e9b5b890	recipes, re-organization, cleanup	2021-06-07 10:58:05 +02:00
jshipsey	74fbe9a123	cloth/metallic armor	2021-06-07 10:56:54 +02:00
jshipsey	ffc9a0ae22	more drops, armors	2021-06-07 10:56:16 +02:00
jshipsey	f387b8d259	hides/leathers	2021-06-07 10:56:04 +02:00
jshipsey	451ccf8d73	more meat	2021-06-07 10:55:50 +02:00
jshipsey	ca907f1b87	added some meat	2021-06-07 10:55:34 +02:00
Monty Marz	30bcc6aaa3	Ferocious armour for t5-dungeon minibosses	2021-05-22 10:55:36 +00:00
Monty Marz	fab3794bf3	Fix 1h-axes	2021-05-10 20:44:09 +00:00
Snowram	831bfd0be9	Snowram/craft mats	2021-05-07 17:03:45 +00:00
Sam	91bb6392bb	Removed old 2h variants of 1h weapons.	2021-04-29 13:18:04 -04:00
Monty	a1b4e0bdaf	remove old craftsman hammer, add migration	2021-04-20 03:34:11 +02:00
Monty	a4d56e7843	more sprite stuff and crafting UI update ... fix item images fix CR display	2021-04-20 02:46:06 +02:00
Vincent Foulon	7128c3d3f6	Asset reorganization + removed some unused and duplicates + reduce size of some images	2021-04-11 16:35:17 +02:00
Monty Marz	6772e71aaa	UI fixes and more	2021-04-11 03:49:47 +00:00
Monty Marz	06bbb7f0ff	Crafting Tabs and more item tags	2021-04-04 13:02:27 +00:00
Vincent Foulon	62b2ad80fb	Refine Sewing Set	2021-04-02 18:19:39 +02:00
Snowram	606dd64741	Fix a staff icon, some offset fixes, lower wolf spawn rate	2021-03-30 00:27:03 +02:00
Snowram	5295894105	Add new batch of starves and scepter (by Gemu)	2021-03-29 01:27:55 +02:00
Joshua Barretto	347e1022a0	Initial implementation of pickaxe	2021-03-21 16:09:16 +00:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Monty Marz	e9cbac387e	new loading bg, staff models ... item images fix paths loot tables, adjustments Update main.ron	2021-03-16 23:23:24 +00:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Snowram	2b7b9f887b	Fixes leather sets	2021-03-02 19:28:29 +01:00
jshipsey	308045cfc9	final asset corrections, fix glider anim	2021-03-01 17:37:47 -05:00
jshipsey	8944115f8e	more asset organization	2021-02-28 22:18:43 -05:00
jshipsey	16720a6826	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
Snowram	1172c2f2c3	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
Samuel Keiffer	8e07174c1d	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
Avi Weinstock	7d2e8f72eb	Add a coin item and make amounts visible on dropped items.	2021-02-25 21:31:30 -05:00
Sarra	1d4b8d4d99	correcting formatting and removing commented out code that wasn't supposed to be there	2021-02-25 20:41:57 -05:00
Snowram	2bab3cdced	Fixes weapons model and icon offsets	2021-02-26 02:37:59 +01:00
Sarra	f39f5ab5d3	added coral reefs, kelp forests, and seagrass	2021-02-25 05:33:18 -05:00
Sam	017e037e69	Weapon offsets in humanoid manifest	2021-02-24 21:52:32 -05:00
Sam	b0b4a07b9e	Bows	2021-02-24 20:37:43 -05:00
Sam	84a5b3dcc5	Axes	2021-02-24 19:11:41 -05:00