1945 Commits

Author	SHA1	Message	Date
flo	dc688bccb9	fix_salamander_and_elbst	2022-09-13 17:32:53 +00:00
Joshua Yanovski	aea4aca057	Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master' ... Xmac94x/steal sharps clippy improvements See merge request veloren/veloren!3612	2022-09-11 19:56:35 +00:00
flo	e43608ce80	add guitar & instrument sample edits	2022-09-10 17:23:38 +00:00
Joshua Yanovski	986d104faa	Update Rust toolchain.	2022-09-08 15:43:53 -07:00
juliancoffee	34c5e95d8a	Add Energy regen buff ... * Fix broken i18n keys for health and energy increases * Better handle buff descriptions Calculate infobox lines for item stats to set correct infobox frame dimensions	2022-09-06 15:50:04 +03:00
Isse	7ea720b2ef	Merge branch 'creature_model_updates' into 'master' ... Creature model updates See merge request veloren/veloren!3584	2022-09-06 10:35:11 +00:00
flo	e4a3671345	Creature model updates	2022-09-06 10:35:10 +00:00
juliancoffee	2b3cfe690d	Adress review ... * Make compatible_handndess check its own function and get back to `match`	2022-09-06 00:59:15 +03:00
juliancoffee	421aa44d5f	Make kit generate all possible modulars	2022-09-05 00:24:58 +03:00
juliancoffee	0c5a33b031	Add functions to generate collection of modulars	2022-09-05 00:24:58 +03:00
flo	6c89cd8fbf	put Organ under Toolkind Instrument	2022-08-30 16:55:02 +00:00
Samuel Keiffer	52ce12f383	Merge branch 'floppy-music-instruments' into 'master' ... Music Instruments See merge request veloren/veloren!3535	2022-08-28 18:48:18 +00:00
flo	9339971032	Music Instruments	2022-08-28 18:48:18 +00:00
flo666	1876d169c8	- Dagon, SeaCrocodile hitboxes	2022-08-27 08:06:33 +02:00
flo	e882e62c08	seachapel	2022-08-24 21:50:53 +00:00
Joshua Barretto	51d90707b5	Relaxed automod somewhat	2022-08-23 10:03:06 +01:00
Imbris	275b17be57	Merge branch 'imbris/misc_fix' into 'master' ... Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks See merge request veloren/veloren!3555	2022-08-21 16:35:16 +00:00
DaforLynx	656727ecbd	Miscellaneous audio fixes	2022-08-21 05:32:02 +00:00
Imbris	ca66a9f79b	Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true	2022-08-20 18:47:09 -04:00
juliancoffee	69cea513ee	Make comments to be doc-comments	2022-08-20 22:30:25 +03:00
juliancoffee	6319dcfc22	Add more components in /body ... * Add mass * Add density * Add collider. This one is strange as always, I don't know what's wrong, but debug hitbox changes only after death. Real one seems to work.	2022-08-20 17:02:08 +03:00
Tormod Gjeitnes Hellen	e306b3bfe3	Have the ambushers say something. ... Very unsure about the way I did this...	2022-08-17 23:50:09 +02:00
Samuel Keiffer	a1b5f53d15	Merge branch 'craft-all' into 'master' ... Craft all See merge request veloren/veloren!3525	2022-08-12 00:47:48 +00:00
Julio Cezar Silva	9315482fc4	Craft all	2022-08-12 00:47:48 +00:00
Joshua Barretto	602de267b1	Perform validation on all kinds of chat message	2022-08-11 11:11:33 +01:00
IsseW	87821d5c1d	force update counter	2022-08-09 19:22:09 +02:00
Imbris	d5b59c2bb7	Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage	2022-08-08 00:38:20 -04:00
Sam	28a4ce9be1	Various tweaks	2022-07-26 19:44:49 -04:00
Forest Anderson	67534488b3	Merge branch 'tygyh/CleanUp' into 'master' ... Tygyh/clean up See merge request veloren/veloren!3480	2022-07-17 14:04:45 +00:00
Youssef Fahmy	91c85dea22	Humanoid Model Overhaul	2022-07-16 11:13:24 +00:00
tygyh	120ee6b6c0	Fix typos	2022-07-15 18:59:37 +02:00
tygyh	cbe4d9d807	Remove unused imports	2022-07-15 16:00:27 +02:00
tygyh	fefe745508	Reorder impl member order to match trait member order	2022-07-15 15:54:32 +02:00
tygyh	5e5698249b	Remove unnecessarily qualified paths	2022-07-15 14:49:46 +02:00
Christof Petig	bb952fe755	rustfmt the last cleanup	2022-07-13 23:38:11 +02:00
Christof Petig	edfe6d887e	final polish	2022-07-13 23:32:20 +02:00
Christof Petig	eab062450a	clippy helped to get rid of one level of indirection	2022-07-13 23:27:17 +02:00
Christof Petig	d2aa9028ec	clippy is right about this flat_map	2022-07-13 23:17:22 +02:00
Christof Petig	197f84a360	returning a vec creates much more readable code	2022-07-13 23:03:58 +02:00
Christof Petig	3bdeb77268	Full support for modular weapon in loot table read	2022-07-13 22:56:52 +02:00
Christof Petig	a0749ac9bc	test passes, not happy with implementation yet	2022-07-13 20:15:28 +02:00
Christof Petig	5bbb73bc17	changelog + remove dead code, but the test still fails	2022-07-13 20:15:28 +02:00
Christof Petig	5ee72f8a5e	fix test; add tusk, crest, pincer	2022-07-13 20:15:28 +02:00
Christof Petig	8c5901516e	clean up	2022-07-13 20:15:28 +02:00
Christof Petig	7a1218cf2f	make a recipe of all modular weapons	2022-07-13 20:15:28 +02:00
Christof Petig	3a7835c6d0	replace one Owned reference by the normal Reference type	2022-07-13 20:15:28 +02:00
Avi Weinstock	cea2550dde	Add Item::new_from_item_definition_id.	2022-07-13 20:15:28 +02:00
Christof Petig	7e5ebada2d	still incomplete but looks surprisingly usable	2022-07-13 20:15:28 +02:00
Christof Petig	33a01a0dab	fix compilation of example	2022-07-13 20:15:28 +02:00
Christof Petig	2b2ac20403	use ItemDefintionId across trade_pricing	2022-07-13 20:15:27 +02:00