1921 Commits

Author	SHA1	Message	Date
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
hqurve	8da6cbe414	Widened recipe list in crafting menu and added quality indicators to names in the list	2021-06-06 15:55:11 +00:00
Filip Bengtsson	f2dd0d0297	Missed strings	2021-06-06 17:48:09 +02:00
Snowram	b1a2d0b698	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00
Filip Bengtsson	52fa777b12	Strings in various files	2021-06-06 01:05:08 +02:00
Filip Bengtsson	b17a54558f	Translate trade.ron	2021-06-06 00:42:50 +02:00
Filip Bengtsson	de7269c6cc	Translate social.ron	2021-06-06 00:42:07 +02:00
Filip Bengtsson	ebdb750b9a	Translate sct.ron	2021-06-06 00:40:30 +02:00
Filip Bengtsson	68c44055c6	Translate misc.ron	2021-06-06 00:39:55 +02:00
Filip Bengtsson	f8dee5d03e	Translate hud/map.ron	2021-06-06 00:34:06 +02:00
Filip Bengtsson	353160619e	Translate hud/hud_setting.ron	2021-06-06 00:32:16 +02:00
Snowram	29d1d127d3	Yeti combat anims	2021-06-06 00:17:23 +02:00
Sam	a73e7c78e0	Balance tweaks.	2021-06-05 17:15:04 -05:00
Filip Bengtsson	83561f78be	Translate hud/group.ron	2021-06-06 00:07:53 +02:00
Filip Bengtsson	5a43080d5b	Translate hud/crafting.ron	2021-06-06 00:07:03 +02:00
Filip Bengtsson	0e82ea1299	Translate hud/chat.ron	2021-06-06 00:06:05 +02:00
Filip Bengtsson	9c3f6c5c9a	Translate hud/char_window.ron	2021-06-06 00:00:51 +02:00
Filip Bengtsson	8006f0033c	Translate hud/bag.ron	2021-06-05 23:39:24 +02:00