1517 Commits

Author	SHA1	Message	Date
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
Marcel	3490600ca0	Merge branch 'xMAC94x/update-deps2' into 'master' ... update_deps_2 - now with more expirmental stuff See merge request veloren/veloren!3634	2022-09-23 21:44:50 +00:00
flo	cfbadd36ea	fix_desert_rock_animals	2022-09-22 18:42:34 +00:00
Marcel Märtens	29d0f5b25d	update dependencies	2022-09-22 11:57:55 +02:00
flo	a37e1f8d99	seachapel npc work	2022-09-22 01:04:01 +00:00
Joshua Yanovski	e9a463d459	Revert "Merge branch 'xMAC94x/update-deps' into 'master'" ... This reverts merge request !3608	2022-09-15 18:51:48 +00:00
Joshua Yanovski	cafdcad8ce	Merge branch 'sharp/improve-msg' into 'master' ... Improve some server system performance See merge request veloren/veloren!3614	2022-09-15 04:30:31 +00:00
Joshua Yanovski	2c15d0af56	Reduce overhead of messaging systems.	2022-09-14 21:04:53 -07:00
flo	dc688bccb9	fix_salamander_and_elbst	2022-09-13 17:32:53 +00:00
Marcel Märtens	a32b269252	steal sharps clippy improvements to the old nightly	2022-09-11 16:10:56 +02:00
Joshua Yanovski	986d104faa	Update Rust toolchain.	2022-09-08 15:43:53 -07:00
Marcel Märtens	d9e6f10688	update dependencies	2022-09-08 23:29:08 +02:00
Christof Petig	863f9857b5	cargo fmt	2022-08-30 00:37:38 +02:00
Christof Petig	04b7090197	handle terrain more correctly	2022-08-30 00:37:38 +02:00
Christof Petig	fbe0aee40d	move trading good properties (decay, transportation) from hard coded to ron file	2022-08-30 00:37:38 +02:00
flo666	87bac7c24a	- remove barriers in chapel tube & tower tube ... - change pitfall entry	2022-08-26 17:40:46 +02:00
flo	e882e62c08	seachapel	2022-08-24 21:50:53 +00:00
Isse	14aad5fde7	Merge branch 'campfires_for_clifftown_and_desertcity' into 'master' ... add campfires to clifftown and desertcity See merge request veloren/veloren!3538	2022-08-14 20:22:31 +00:00
flo	4c49cb933e	add campfires to clifftown and desertcity	2022-08-14 20:22:30 +00:00
DaforLynx	daadf3abdb	Gnarling Fort music; more specific sites; fix music spacing; new sfx	2022-08-14 01:57:58 +00:00
flo	4ccec12dc7	DesertCity small fix	2022-08-12 11:34:40 +00:00
IsseW	0cd4d71d00	Add town music to cliff towns and desert cities	2022-08-10 11:03:22 +02:00
flo	5dd9991311	DesertCity	2022-08-08 09:58:18 +00:00
Marcel	ed4d70ac5b	Merge branch 'juliancoffee/add_cache_load_map' into 'master' ... Add FileOpts::CacheLoad and a bit of refactoring See merge request veloren/veloren!3472	2022-07-17 19:28:35 +00: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
juliancoffee	fac67a40a1	Make worldgen panic if loaded map has invalid size	2022-07-17 14:49:42 +03:00
juliancoffee	9d67d80a63	Only ovewrite LoadOrGenerate map if it's fresh map	2022-07-17 14:38:29 +03:00
juliancoffee	5079c0007f	Remove prefix map_ for LoadOrGenerate maps	2022-07-17 14:38:29 +03:00
juliancoffee	d2962d544b	Add overwrite option to LoadOrGenerate	2022-07-17 14:38:29 +03:00
juliancoffee	60a9cce57f	Change map_path to inslude map directory	2022-07-17 14:38:29 +03:00
juliancoffee	a437d31205	Checking options from loaded map instead of hash	2022-07-17 14:38:29 +03:00
juliancoffee	6d9c7a5645	Adressing review	2022-07-17 14:38:29 +03:00
juliancoffee	6faba8a1e9	Use hashable wrapper around gen opts	2022-07-17 14:38:29 +03:00
juliancoffee	ddf2c43c18	Make hacky hash for gen opts	2022-07-17 14:38:29 +03:00
juliancoffee	1a21dfbc5b	Add FileOpts::CacheLoad ... Add map setting that allows both generating (if not exists) and loading map	2022-07-17 14:38:29 +03:00
juliancoffee	85cee14643	Refactoring, extract FileOpts dependent methods	2022-07-17 14:38:29 +03:00
Joshua Yanovski	ef4b190ad9	Temporarily remove waypoints in caves as people are getting stuck.	2022-07-16 23:08:05 -07:00
Joshua Barretto	b08a501aef	Cleaned up ready for merge	2022-07-16 11:09:35 +01:00
tygyh	120ee6b6c0	Fix typos	2022-07-15 18:59:37 +02:00
Joshua Barretto	26202c294f	Better biome distribution	2022-07-15 17:53:24 +01:00
tygyh	abdd5e3906	Lift return out of if-statements	2022-07-15 16:36:11 +02:00
tygyh	fb7bdd8bf8	Fix deprecated imports	2022-07-15 16:17:19 +02:00
tygyh	cbe4d9d807	Remove unused imports	2022-07-15 16:00:27 +02:00
tygyh	997a572647	Simplify assertions	2022-07-15 15:52:52 +02:00
Joshua Barretto	5b8bdb9c9c	Cave entity spawns	2022-07-15 14:15:42 +01:00
tygyh	5e5698249b	Remove unnecessarily qualified paths	2022-07-15 14:49:46 +02:00
Joshua Barretto	4ca1c9ddf4	Gems and ores	2022-07-15 08:43:35 +01:00
Joshua Barretto	1a3b1e48da	Better cave shape variety	2022-07-15 08:43:35 +01:00
Joshua Barretto	f4e50d18df	Better ice	2022-07-15 08:43:35 +01:00