252 Commits

Author	SHA1	Message	Date
timokoesters	c4879307af	Update to github vek repo	2019-08-26 13:12:45 +02:00
Joshua Yanovski	c02f2a7f9e	Fixes to worldgen and adding a debug command. ... Humidity and temperature are now indexed to uniform altitude *over land chunks* (and water chunks adjacent to land) rather than over the whole range of altitude. This is necessary in order to satisfy the uniformity conditions of the formula for weighted sum CDF. Additionally, fixes the computation of whether a tree should be generated or not. Previously, it was using a source of randomness scaled to use much less than the full 0-1 range; this has been resolved. This makes for much nicer and more gradual transitions between densities and reduces the amount of completely barren landscapes, while also making forests larger. Finally, this commit adds a server command, debug_column, which returns some useful debug information about a column given an x and y coordinate. This is useful for debugging worldgen.	2019-08-26 11:52:25 +02:00
Joshua Yanovski	958a40b8c0	Fix clean code lints.	2019-08-25 18:17:51 +02:00
Joshua Yanovski	6f12a240de	Chaos doesn't depend on temperature anymore. ... Also fix some things to use a consistent coordinate system and bump up tree density and variation around tree density in hopes of creating more aesthetically pleasing jungles. However, this does change worldgen a bit, so please make sure you look through it before merging.	2019-08-25 17:49:33 +02:00
jshipsey	f02b571f7f	fmt	2019-08-24 15:32:07 -04:00
Joshua Yanovski	25a02ae6e0	Make humidity ignore ocean chunks.	2019-08-24 21:13:32 +02:00
Joshua Barretto	8635982173	Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle	2019-08-23 00:33:33 +01:00
Joshua Barretto	0db797744b	Better snow noise	2019-08-23 00:31:27 +01:00
Joshua Yanovski	f687c591ca	Remove out of date comment.	2019-08-23 01:16:15 +02:00
Joshua Yanovski	d7f567a862	Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle	2019-08-23 01:10:48 +02:00
Joshua Barretto	6136edd631	Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle	2019-08-23 00:09:45 +01:00
Joshua Barretto	b6cfc84810	More interesting terrain chaos	2019-08-23 00:09:14 +01:00
Joshua Yanovski	b69020b68e	Fine, removing box syntax.	2019-08-23 01:08:47 +02:00
Joshua Yanovski	398c18359d	Addressing concerns, for real.	2019-08-23 00:57:42 +02:00
Joshua Yanovski	2ff192021c	Addressing PR issues.	2019-08-22 23:48:13 +02:00
Joshua Barretto	ba1a146cd5	Better snow, colours, more chaos	2019-08-22 22:25:17 +01:00
Joshua Yanovski	40192da977	Closest attempt.	2019-08-22 21:10:04 +02:00
Joshua Yanovski	dbeec66b2d	Total chaos.	2019-08-22 21:03:42 +02:00
Joshua Yanovski	38443c173c	Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle	2019-08-22 17:47:10 +02:00
Joshua Yanovski	5caed42e4f	Fix density computation.	2019-08-22 17:45:47 +02:00
Joshua Yanovski	aa4464d8f4	Adding more jungle trees.	2019-08-22 01:33:47 +02:00
Joshua Yanovski	139933194c	Restore old chaos.	2019-08-22 01:01:13 +02:00
Joshua Yanovski	16ad7ba042	Fixing colors.	2019-08-22 00:15:24 +02:00
Joshua Yanovski	d174dd99b4	Fixing a few visual issues.	2019-08-21 23:36:43 +02:00
Joshua Yanovski	bd8a0be0fb	Putting back splotchy mud.	2019-08-21 20:59:26 +02:00
Joshua Yanovski	91ea62a5c9	Get rid of extraneous things.	2019-08-21 20:48:51 +02:00
Joshua Yanovski	05d501632e	Fixing jungle.	2019-08-21 20:41:32 +02:00
Joshua Barretto	7ceccfecc3	Added cacti	2019-08-21 19:18:16 +01:00
Joshua Barretto	6ff264d982	Better plant grouping distribution	2019-08-21 18:56:46 +01:00
Monty Marz	fade04d44e	Pfauenauge/plants grass	2019-08-21 17:22:05 +00:00
Joshua Yanovski	8c644e2bb1	Distribution "fun."	2019-08-20 22:48:22 +02:00
Joshua Barretto	60544531dd	More grass	2019-08-20 12:06:41 +01:00
Joshua Barretto	245c9af2e8	Patchier plants, wind swaying	2019-08-20 11:05:01 +01:00
Joshua Barretto	5f09ab3a4f	Added multiple sprite block kind support	2019-08-20 00:31:11 +01:00
Joshua Barretto	7960e6ea6d	Sprite distance fading, grass	2019-08-19 22:54:16 +01:00
Joshua Barretto	b31cca4bb3	Added wheat and sprite rendering	2019-08-19 21:09:35 +01:00
Joshua Yanovski	405f55d725	Smoother blending into sand.	2019-08-19 19:46:47 +02:00
Joshua Yanovski	97eaeddd78	t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle	2019-08-19 19:21:05 +02:00
Joshua Yanovski	5919f63516	Fixing visual issues.	2019-08-19 19:20:54 +02:00
Acrimon	a41cf1a83d	Disabled unsafe using lint level.	2019-08-19 14:39:23 +02:00
Joshua Yanovski	fa35f9932e	Smoothed some things out.	2019-08-19 05:22:39 +02:00
Joshua Yanovski	1c9be67516	Billow tweaks.	2019-08-19 03:41:32 +02:00
Joshua Yanovski	c5ffb232d4	Fixing some colors.	2019-08-19 03:01:11 +02:00
Joshua Yanovski	d8c864cf3a	Making jungles work.	2019-08-19 01:52:26 +02:00
Joshua Yanovski	680b81a5e6	WIP for humidity.	2019-08-18 18:35:27 +02:00
Joshua Barretto	49426565dc	Renamed normal StructureBlock variant	2019-08-18 15:33:16 +01:00
Joshua Barretto	75dbebbd05	More interesting waves	2019-08-18 10:33:18 +01:00
Vechro	71710fb091	Dungeon fixes	2019-08-18 10:33:18 +01:00
Joshua Barretto	e535537106	Added default block kind to structure loading	2019-08-18 10:33:18 +01:00
Vechro	6cf5b99857	Add water-based dungeons	2019-08-18 10:33:18 +01:00