1568 Commits

Author	SHA1	Message	Date
Sam	4f26e37ae6	Addressed review	2023-01-09 20:18:31 -05:00
Sam	7d42c45fdd	Site2 code is now hot-reloadable with 'hot-site2' feature.	2023-01-09 20:06:35 -05:00
Joshua Barretto	873d3fb7a4	Added dead trees to LoD	2022-12-31 15:32:56 +00:00
Isse	ef2c1633ed	Merge branch 'isse/bridges' into 'master' ... Bridges See merge request veloren/veloren!3680	2022-11-30 15:07:03 +00:00
Marcel Märtens	4a1404cd71	fix leftovers from toolchain update	2022-11-30 15:14:47 +01:00
Isse	02eadc3002	add doc comment	2022-11-30 15:13:52 +01:00
Isse	560d5c3153	fix doc test	2022-11-30 15:13:52 +01:00
Isse	c81fbf50c4	Fix cylinder primitive and better ramp function	2022-11-30 15:13:52 +01:00
Isse	dda54bcb01	small fixes	2022-11-30 15:13:52 +01:00
IsseW	17cd863605	tuning	2022-11-30 15:13:52 +01:00
IsseW	179c6dab8f	better flat	2022-11-30 15:13:52 +01:00
IsseW	6d2b39c254	simple hang bridge	2022-11-30 15:13:52 +01:00
IsseW	df8db713ea	lights	2022-11-30 15:13:52 +01:00
IsseW	91ed3c6a84	draw on map	2022-11-30 15:13:52 +01:00
IsseW	31b56b03b5	desert skin	2022-11-30 15:13:52 +01:00
IsseW	78e227d317	short bridges	2022-11-30 15:13:52 +01:00
IsseW	3bb66cf2ff	add hipped roof	2022-11-30 15:13:52 +01:00
IsseW	7296843923	simple bridges	2022-11-30 15:13:52 +01:00
Marcel Märtens	225cbf472f	update tag and fix empty maps, other bugs introduced by auto fix	2022-11-29 09:19:10 +01:00
Marcel Märtens	2812729b78	cargo clippy lifetimes	2022-11-28 15:19:57 +01:00
Marcel Märtens	dad73ba2a3	fix clamp clippy errors	2022-11-28 14:26:27 +01:00
Marcel Märtens	0ab7a2543e	fix clippy errors	2022-11-28 14:08:11 +01:00
Marcel Märtens	ba3747a3f0	update toolchain	2022-11-28 14:08:11 +01:00
Tormod G. Hellen	44f118c437	Get rid of redundant sources of truth on site locations.	2022-11-20 00:57:05 +01:00
Christof Petig	24aac2d92f	Merge branch 'floppy_savannahpit_merchants' into 'master' ... add merchants to savannah pits See merge request veloren/veloren!3690	2022-11-13 19:14:27 +00:00
flo	6d8f2c8c7b	add merchants to savannah pits	2022-11-13 19:14:26 +00:00
Christof Petig	a820eee289	Merge branch 'floppy-bat-wing-tweaks' into 'master' ... tweak bat wing animation See merge request veloren/veloren!3684	2022-11-12 10:18:11 +00:00
flo	df70381a7c	tweak bat wing animation	2022-11-12 10:18:10 +00:00
Avi Weinstock	f5c1293e9f	Address review comments for MR 3679: ... - Fix normal vectors/lighting for train tracks. - Adjust chat command logging statement. - Remove train tracks when their chunks get unloaded. - Create a struct for the 6-tuple returned from `get_nearest_ways`. - Move code that creates the train tracks into `layers::apply_trains_to`.	2022-11-03 15:20:53 -04:00
Avi Weinstock	2242f7245d	Avoid placing site2 houses on paths (this affects worldgen even with train tracks disabled, since the paths are already there).	2022-10-31 14:55:13 -04:00
Avi Weinstock	f83afcd5a8	Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt.	2022-10-29 14:50:52 -04:00
Avi Weinstock	08a50afd9f	Mostly working train tracks.	2022-10-28 21:36:42 -04:00
flo666	ada9bd8f36	fix unitest error: ... layer::wildlife::tests::test_name_uniqueness' panicked at 'world.wildlife.spawn.calendar.halloween.halloween:	2022-10-25 00:33:36 +02:00
IsseW	9a6a3a05a1	bat config	2022-10-25 00:31:04 +02:00
flo666	586d0f6dd8	add bat (created by Gemu)	2022-10-23 20:05:39 +02:00
flo666	1d98050f28	halloween npcs: ... in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd	2022-10-23 20:05:39 +02:00
Isse	3b2eba1457	autumn leaves	2022-10-23 20:05:39 +02:00
IsseW	9c4736f47b	Make pumpkins more common for Halloween	2022-10-23 20:05:39 +02:00
flo	698a00bae3	savannah_pit	2022-10-22 19:48:50 +00:00
IsseW	2ba5b33868	fmt	2022-10-10 00:15:57 +02:00
IsseW	c8a08b4794	fix warnings	2022-10-09 23:42:38 +02:00
Joshua Barretto	0a6ac5f5f1	sync	2022-10-09 23:25:40 +02:00
Joshua Barretto	68df88a721	Added redwoods	2022-10-09 23:23:43 +02:00
Joshua Barretto	1392a8662f	Added dead trees	2022-10-09 23:23:42 +02:00
Joshua Barretto	0b5d043d8e	Began work on citadel	2022-10-09 23:23:39 +02:00
Marcel	6844094389	Merge branch 'kitswas/worldgen-spawn-fixes' into 'master' ... Spawn fix(es) See merge request veloren/veloren!3579	2022-10-05 07:07:43 +00:00
Marcel	17c940e0f8	Merge branch 'xMAC94x/update_toolchain' into 'master' ... update toolchain to `2022-09-23` See merge request veloren/veloren!3615	2022-09-25 19:44:58 +00:00
Marcel Märtens	1e1ee5031f	remove enum_iterator with strum, fixes #1723	2022-09-25 16:09:46 +02:00
Marcel Märtens	cf6a764aa4	update toolchain to 2022-09-23	2022-09-25 15:58:32 +02:00
Marcel Märtens	c2b453f6f1	update toolchain to 2022-09-08 ... This reverts commit 6c9deee491. This reverts commit a32b269252.	2022-09-24 00:04:40 +02:00