991 Commits

Author	SHA1	Message	Date
Monty Marz	50701620e6	Temporary invincible merchants	2022-08-16 12:16:45 +00:00
Sam	b572c32a4d	Tweaks	2022-07-30 00:18:10 -04:00
Sam	28a4ce9be1	Various tweaks	2022-07-26 19:44:49 -04:00
Youssef Fahmy	91c85dea22	Humanoid Model Overhaul	2022-07-16 11:13:24 +00:00
Christof Petig	5ee72f8a5e	fix test; add tusk, crest, pincer	2022-07-13 20:15:28 +02:00
Marcel	fddc97bc77	Merge branch 'tweaks' into 'master' ... tweaks entity stats See merge request veloren/veloren!3437	2022-06-29 19:29:38 +00:00
runrobdog	7a40ae2db7	tweak entity stats adlet/tracker.ron	2022-06-23 17:48:28 +02:00
runrobdog	16d5ea1e3c	Set stats of entities movesets under the Object(body) tag to pre-modular and change all entities found within dungeons, to pre-modular stats	2022-06-23 06:45:22 +02:00
runrobdog	8c1d4359a8	tweak stats quadmedquick, blackwidow and throped	2022-06-20 14:12:04 +02:00
runrobdog	1dc89fbc58	tweak stats theropodbasic	2022-06-19 19:04:30 +02:00
runrobdog	25eed55ca9	stat tweaks to theropod, arthropods and basilisk	2022-06-19 01:35:18 +02:00
Sam	1f60bdd452	Removed sticky thread requirement from bow limbs.	2022-06-18 15:19:37 -04:00
runrobdog	10023b0759	tweak entity stats	2022-06-18 12:33:19 +02:00
Sam	4a5ef6dce3	Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage. ... Instead poise damage is only converted to health damage when its source is mitigated crushing damage. Fixed 'Long Pole' -> 'Longpole'	2022-06-17 21:13:45 -04:00
runrobdog	1e289e6335	tweaks entity stats	2022-06-17 21:48:09 +02:00
runrobdog	1e19f5541b	tweak entity stats	2022-06-17 21:41:04 +02:00
runrobdog	95148a9968	tweaks entity stats	2022-06-17 12:35:06 +02:00
Sam	2de831cf38	Converted asset files of other armors.	2022-05-30 20:25:33 -04:00
Sam	8b384fd63e	Converted asset files of set armors.	2022-05-30 20:25:33 -04:00
Sam	5e57eabd11	Code changes and msm	2022-05-30 20:25:31 -04:00
Makselord	4a2cdd08d4	modular weapon modifier costs changed to 1, 2, 5, 10, 15, 25	2022-05-30 09:56:17 -04:00
Makselord	f10b868dbf	modular weapon modifier costs changed to 1, 5, 10, 15, 20, 30	2022-05-29 19:50:26 -04:00
Christof Petig	2bf8e1865f	Skiing and ice skating	2022-05-27 17:19:52 +00:00
Makselord	5c8c88b786	fixed silver, gold, copper, tin ingots not showing correctly in crafting	2022-05-26 17:08:39 -04:00
Euryn	88eaef3145	Add Thai translation	2022-05-22 10:06:36 +00:00
Chase Rozon	7dcee3eb23	Multiple Balance Tweaks & Miscellaneous Changes	2022-05-19 22:46:31 +00:00
Youssef Fahmy	080d8ef8b1	Tweaks for this week	2022-05-19 19:35:31 +00:00
Sam	aeca67443b	Simplified item key (assets)	2022-05-18 16:28:10 -04:00
Sam	ba0846d6c7	Addressed more feedback	2022-05-16 15:11:46 -04:00
UncomfySilence	ac124b67a0	minor loot table tweaks and removal of yellow weapon components from caves	2022-05-16 15:11:45 -04:00
Sam	cbf5336343	Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets).	2022-05-16 15:11:45 -04:00
Sam	ad48b634ab	Address feedback (assets)	2022-05-16 15:11:44 -04:00
Sam	254b7964e1	Balance tweaks (assets)	2022-05-16 15:11:43 -04:00
Sam	d6ac9c43d7	More feedback addressed (assets).	2022-05-16 15:11:41 -04:00
Sam	13ea6dee93	Addressed second round of balance feedback (assets).	2022-05-16 15:11:40 -04:00
Sam	9b078c3383	Addressed playtest feedback (assets).	2022-05-16 15:11:38 -04:00
UncomfySilence	1c626da66b	loot tables and adding models	2022-05-16 15:11:36 -04:00
Sam	528b62c59a	Rebase commit	2022-05-16 15:11:36 -04:00
Sam	efc0189548	Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (assets).	2022-05-16 15:11:34 -04:00
Sam	49ff094286	Addressed most review comments (assets).	2022-05-16 15:11:33 -04:00
Bryant Deters	075fee5190	modular component tooltips	2022-05-16 15:11:25 -04:00
Sam	558e2aefb7	Bow models	2022-05-16 15:11:23 -04:00
Sam	eec0ba18a9	Fixed eldwood recipes returning frostwood components.	2022-05-16 15:11:22 -04:00
Sam	d436362a8d	Consolidated crafting UI for the primnary component of modular weapons.	2022-05-16 15:11:21 -04:00
Sam	3702952f99	Added recipes for each material kind.	2022-05-16 15:11:20 -04:00
Sam	ef5b2e4a1e	Added method of differing names for 1h and 2h variants of a modular wepaon. ... Added all 1h melee weapon models.	2022-05-16 15:11:19 -04:00
Sam	1c0154487a	Rebase fixes.	2022-05-16 15:11:18 -04:00
Sam	94c19735ca	Fixed broken stuff during rebase.	2022-05-16 15:11:16 -04:00
Sam	5c28e3cb25	Items with components can now have their name modified by the components. Also addressed more review. ONLY ASSETS	2022-05-16 15:11:16 -04:00
Sam	524845b661	Addressed more comments on MR.	2022-05-16 15:11:15 -04:00