1801 Commits

Author	SHA1	Message	Date
Samuel Keiffer	5d6824aace	Merge branch 'haniwa' into 'master' ... haniwa See merge request veloren/veloren!4234	2024-01-20 17:45:23 +00:00
flo	48a79b3e78	haniwa	2024-01-20 17:45:23 +00:00
Benoît du Garreau	b6ffb3a146	Update assets_manager to v0.11	2024-01-20 15:46:16 +00:00
juliancoffee	1347a31108	Deprecation step of Item::name/description ... - Mark Item::name() and Item::description() deprecated, along with corresponding ItemDesc methods. - Dummify dialogue code that uses items, as it's not used anyway. In the future it should use common_i18n::Content. - Allow usage of deprecated .name() for Inventory ordering, for now. - Allow usage of deprecated .name() for Inventory ordering for merchants, for now.	2024-01-14 21:25:15 +02:00
Isse	f8cb4369be	clamp cave alt base at terrain alt	2024-01-07 13:14:44 +01:00
DaforLynx	0b62898060	Audio fixes and new music	2023-12-29 00:25:08 +00:00
Christof Petig	055e11f10e	reintroduce underwater plants	2023-12-26 16:48:23 +01:00
Christof Petig	5af8c4687e	Merge branch 'christof/christmas23' into 'master' ... Christmas theme revival See merge request veloren/veloren!4209	2023-12-20 17:02:01 +00:00
Uniior	737b5761f6	Crate and Barrel sprites	2023-12-17 16:17:14 +00:00
Christof Petig	4b7f3d07d2	add hirdrasil ornament variants and fix clippy	2023-12-16 12:10:17 +01:00
Christof Petig	611b55b279	PRNG experiments	2023-12-15 17:27:15 +01:00
Christof Petig	9c9c8e6873	lights over the door	2023-12-14 23:29:48 +01:00
Christof Petig	c0b56671ec	hang wreaths at the fireplace	2023-12-14 23:29:32 +01:00
Christof Petig	9b485456eb	Calendar based gear for villagers	2023-12-14 16:31:48 +01:00
Isse	b654c2f923	expect instead of unwrap	2023-12-12 20:20:03 +01:00
Isse	96a3c81cbb	fix captain dismounting and don't panic in RandomField::choose	2023-12-12 20:14:39 +01:00
Isse	850112bd72	typo fix and add some adjectives to tavern namegen	2023-12-12 19:28:12 +01:00
Isse	5361b290df	make vec2 make more sense	2023-12-12 19:25:06 +01:00
Isse	57bf7cfdac	place rooms at correct alt, remove walls between gardens	2023-12-07 22:34:58 +01:00
Isse	1000b7b73f	better colors for tavern	2023-12-07 20:08:03 +01:00
Isse	96a70d760c	clippyyyyy	2023-12-07 20:08:03 +01:00
Isse	7a1612aa8a	small fixes	2023-12-07 20:08:03 +01:00
Isse	ee4c6d006f	More advanced roofs	2023-12-07 20:08:03 +01:00
Isse	5a31b17bc3	Add simple roofs	2023-12-07 20:08:03 +01:00
Isse	a9191b96a9	better stairs	2023-12-07 20:08:03 +01:00
Isse	6e19abd7ec	stairs	2023-12-07 20:08:03 +01:00
Isse	e8f8f20ad0	somewhat 3d layouting	2023-12-07 20:08:03 +01:00
Isse	a3a19ecc3a	tavern rtsim	2023-12-07 20:08:03 +01:00
Isse	c1aa9bd1b6	move some details to generate	2023-12-07 20:08:03 +01:00
Isse	4fa52db71d	more work on tavern	2023-12-07 20:08:03 +01:00
Isse	9903b53105	working rooms	2023-12-07 20:08:03 +01:00
Isse	ecb85a0534	Tavern room layout	2023-12-07 20:08:02 +01:00
flo	daff899f37	clifftown_relocation	2023-11-25 20:58:05 +00:00
flo	756ac0eefe	troll_caves_and_camps_into_sites	2023-11-24 07:53:15 +00:00
Christof Petig	424006e000	Merge branch 'site_rock_circle' into 'master' ... site_rock_circle See merge request veloren/veloren!4175	2023-11-10 00:31:04 +00:00
flo	9d52110a49	site_rock_circle	2023-11-10 00:31:03 +00:00
Joshua Barretto	5418f49ecb	Fixed broken savannah pit altitude	2023-11-08 23:19:02 +01:00
Joshua Barretto	23e239275c	Better mesa basement	2023-11-08 23:19:02 +01:00
Joshua Barretto	05863eb1ef	Better mesa layer colours	2023-11-08 23:17:34 +01:00
Joshua Barretto	48ebe004c0	Added mesa generation	2023-11-08 23:17:34 +01:00
flo	a39dda80b4	jungle_ruin_chest_and_npc_fix	2023-11-04 21:12:15 +00:00
flo	e88d61eb44	npc_spawn_fixes	2023-11-01 18:39:24 +00:00
Joshua Barretto	eddbd86f1f	Moved dullahan to stone ring	2023-10-19 19:26:25 +01:00
Joshua Barretto	922759a83e	Make dullahan a rare spawn in dusty caves	2023-10-19 18:26:31 +01:00
Joshua Barretto	321cc030ad	Better LoD giant trees	2023-10-18 09:58:00 +01:00
jshipsey	0d1b9ee4f6	rotation, better bottom bits	2023-10-13 15:39:28 -04:00
jshipsey	567b6535af	airship dock	2023-10-11 22:37:17 -04:00
Marcel Märtens	8e95cb944d	cargo fmt after updating new toolchain	2023-10-06 09:13:01 +02:00
Marcel Märtens	cb25a409d5	more clippy fixes in all binaries	2023-10-06 09:12:31 +02:00
Marcel Märtens	631f3ab8ee	fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support	2023-10-05 23:23:27 +02:00