1938 Commits

Author	SHA1	Message	Date
Monty	fe86ef1e96	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
Marcel	b9347332ed	Merge branch 'juliancoffee/item_price_split_consumables' into 'master' ... Split consumables to different tables in trading See merge request veloren/veloren!2415	2021-06-13 11:29:47 +00:00
Forest Anderson	f8dae445aa	Merge branch 'juliancoffee/small_fixes' into 'master' ... Ranged, Tidal Warrior, spears, assets See merge request veloren/veloren!2416	2021-06-11 17:46:56 +00:00
juliancoffee	d122c2e9cb	revert bow to almost master values	2021-06-11 17:20:46 +03:00
juliancoffee	44cda79992	Nerf recover duration for animal dashes	2021-06-11 16:18:59 +03:00
juliancoffee	60068f161d	Make bow more snipy	2021-06-11 15:56:16 +03:00
juliancoffee	9a8ae64f4c	adjust staff firebomb	2021-06-11 15:41:38 +03:00
Justin Shipsey	01379ca6dc	Update simple_leather.ron	2021-06-11 08:32:49 +00:00
juliancoffee	0940fe6ef5	Balanse fixes ... - Make bow charge time even smaller and reduce damage/enery reward a little - Buff staff firebomb - Nerf spear dash - Longer recover time of Tidal shockwaves and less knockback - Nerf Tidal bubbles	2021-06-11 01:34:33 +03:00
juliancoffee	2764dfbdc8	add new armour and legendary weapons to /kit	2021-06-11 01:33:18 +03:00
juliancoffee	67a03d9cd1	add temporary "middle" skill preset	2021-06-11 01:31:46 +03:00
juliancoffee	fb76c2a4c7	Split consumables to different tables in trading	2021-06-10 16:04:59 +03:00
João Victor Cardoso Kdouk	38ab1e20dc	Small fixes to pt_br language.	2021-06-09 14:36:10 +00:00
jshipsey	7c1798d71a	small tweaks ... t	2021-06-09 01:58:08 -04:00
Sam	c7fbe0580b	Fix	2021-06-08 20:12:42 -05:00
jshipsey	9d03211a1a	various fixes to items	2021-06-07 21:21:12 -04:00
Christof Petig	a2f12c94bb	Enable spinning flax (recipe got overwritten by linen from linen items)	2021-06-07 23:40:25 +02:00
Marcel Märtens	2aea36227f	fix swedish ron files	2021-06-07 12:02:02 +02:00
Marcel	69593c234f	Merge branch 'master' into 'master' ... Update Swedish translation See merge request veloren/veloren!2380	2021-06-07 09:42:09 +00:00
jshipsey	9817bc59d7	changelog	2021-06-07 11:06:39 +02:00
Sam	58bcf27105	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	6ee751a9c6	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	0c550516a1	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	b03af3b712	finalize stats ... t	2021-06-07 11:02:03 +02:00
jshipsey	1892554b21	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	5883c8248e	tooltip work	2021-06-07 11:01:32 +02:00
jshipsey	63f6f313d0	migration	2021-06-07 11:01:04 +02:00
Snowram	afd43ba3d9	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	44ba95a836	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	44cd8c1bf6	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	7da7c56260	armor stats on chest	2021-06-07 11:00:05 +02:00
jshipsey	287ec0ffe9	more loot tables, overworld ores, more items	2021-06-07 11:00:00 +02:00
jshipsey	df3fa8b073	ore deposits, flower drops	2021-06-07 10:59:50 +02:00
jshipsey	ab09814bd9	cave changes	2021-06-07 10:59:44 +02:00
jshipsey	9c96a8d941	crafting stations	2021-06-07 10:59:35 +02:00
Sam	868b5b00aa	Removed armor stat hackery. ... Added new armor stats to remaining armor items. Fixed broken tests.	2021-06-07 10:59:26 +02:00
Sam	26f101b994	Added default values to every armor item.	2021-06-07 10:59:15 +02:00
Sam	ae60bbf683	Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used.	2021-06-07 10:58:42 +02:00
Sam	4b91bea700	Energy recovery stat functional.	2021-06-07 10:58:32 +02:00
jshipsey	9379c2a2e7	icon work, more models	2021-06-07 10:58:27 +02:00
Sam	1a4b39e283	Recipe book fix	2021-06-07 10:58:07 +02:00
jshipsey	edd9e447ff	recipes, re-organization, cleanup	2021-06-07 10:58:05 +02:00
jshipsey	7e6c01c9e9	cloth/metallic armor	2021-06-07 10:56:54 +02:00
jshipsey	b55bc7b003	crafting item partial re-organization, armor recipes, some specific animal drops	2021-06-07 10:56:35 +02:00
jshipsey	6d2e3e6f8c	more drops, armors	2021-06-07 10:56:16 +02:00
jshipsey	77a1f779be	hides/leathers	2021-06-07 10:56:04 +02:00
jshipsey	04bec5f7f3	more meat	2021-06-07 10:55:50 +02:00
jshipsey	d0134ebf82	added some meat	2021-06-07 10:55:34 +02:00
Monty	82440de48f	new bgs	2021-06-06 19:30:37 +02:00
Marcel	3182724b66	Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371	2021-06-06 16:56:21 +00:00