1bccf3361d
Merge branch 'sharp/worldgen_tweaks' into 'master'
...
Fixes to worldgen and adding a debug command.
See merge request veloren/veloren!462
2019-08-26 10:27:25 +00:00
608685ef36
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
7da4d6c9c5
Merge branch 'sharp/temperature_free_chaos' into 'master'
...
Chaos doesn't depend on temperature anymore.
See merge request veloren/veloren!461
2019-08-25 17:10:15 +00:00
6cb33ba004
Fix clean code lints.
2019-08-25 18:17:51 +02:00
5dfbf86d87
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
dee742bf66
Merge branch 'sharp/humidity_ignores_ocean' into 'master'
...
Make humidity ignore ocean chunks.
See merge request veloren/veloren!460
2019-08-24 19:47:22 +00:00
d926965e7c
fmt
2019-08-24 15:32:07 -04:00
798e8d7e8f
Make humidity ignore ocean chunks.
2019-08-24 21:13:32 +02:00
8ec64ff148
Merge branch 'sharp/jungle' into 'master'
...
Sharp/jungle
See merge request veloren/veloren!447
2019-08-22 23:40:46 +00:00
65a7c725a8
Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-23 00:33:33 +01:00
7ffe8979a2
Better snow noise
2019-08-23 00:31:27 +01:00
27ea09d24e
Remove out of date comment.
2019-08-23 01:16:15 +02:00
ba9c5533dc
Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle
2019-08-23 01:10:48 +02:00
802bb601f3
Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-23 00:09:45 +01:00
1de8132ffb
More interesting terrain chaos
2019-08-23 00:09:14 +01:00
000a200b65
Fine, removing box syntax.
2019-08-23 01:08:47 +02:00
4e0966fa85
Addressing concerns, for real.
2019-08-23 00:57:42 +02:00
f4b13967e4
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-22 23:48:22 +02:00
2d88cd8c8b
Addressing PR issues.
2019-08-22 23:48:13 +02:00
0e001e263b
Better snow, colours, more chaos
2019-08-22 22:25:17 +01:00
9e6862dbbb
Merge branch 'vechro/simpler-debug' into 'master'
...
Simplify debug info
See merge request veloren/veloren!456
2019-08-22 19:35:14 +00:00
1b4187fd30
Small changes to velocity
2019-08-22 22:26:35 +03:00
fbdf7dc235
Closest attempt.
2019-08-22 21:10:04 +02:00
df2eb30898
Total chaos.
2019-08-22 21:03:42 +02:00
9e08f085fd
Simplify debug info
2019-08-22 21:53:46 +03:00
c1eb64c438
Merge branch 'cauthmann/git-lfs-checks' into 'master'
...
Build script: check if git-lfs works
See merge request veloren/veloren!455
2019-08-22 18:18:51 +00:00
77b8744649
Build script: check if git-lfs works
2019-08-22 19:18:47 +02:00
9973c72692
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-22 17:47:10 +02:00
111eac3eda
Fix density computation.
2019-08-22 17:45:47 +02:00
85b3b849bb
Merge branch 'zesterer/instancing' into 'master'
...
Instancing (block sprites)
See merge request veloren/veloren!450
2019-08-22 11:10:57 +00:00
c9e9356b0c
Adding more jungle trees.
2019-08-22 01:33:47 +02:00
861bc567b3
Restore old chaos.
2019-08-22 01:01:13 +02:00
7bb649bda2
Fixing colors.
2019-08-22 00:15:24 +02:00
0104ae7447
Fixing a few visual issues.
2019-08-21 23:36:43 +02:00
dc6f95cc09
Putting back splotchy mud.
2019-08-21 20:59:26 +02:00
7bb74b8905
Get rid of extraneous things.
2019-08-21 20:48:51 +02:00
a0dd7c295a
colour tweaks
2019-08-21 20:43:38 +02:00
58ee11e3d4
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-21 20:41:54 +02:00
a4606143ba
Fixing jungle.
2019-08-21 20:41:32 +02:00
ea8aaf6cae
Added cacti
2019-08-21 19:18:16 +01:00
deabbb8835
Better plant grouping distribution
2019-08-21 18:56:46 +01:00
425ff62fef
Merge branch 'velocity-fix' into 'master'
...
Fix velocity when stuck
See merge request veloren/veloren!453
2019-08-21 17:42:02 +00:00
83c4232279
Fix wielding jump issue
2019-08-21 20:34:21 +03:00
7e924d89a9
Merge branch 'pfauenauge/plants_grass' into 'zesterer/instancing'
...
Pfauenauge/plants grass
See merge request veloren/veloren!452
2019-08-21 17:22:05 +00:00
01eb26206f
Pfauenauge/plants grass
2019-08-21 17:22:05 +00:00
3ec1c7e738
Fix velocity when stuck
2019-08-21 20:17:19 +03:00
59422c8c63
Better wind waving, improved sun ambiance
2019-08-21 17:03:03 +01:00
a5876ece59
Random terrain sprite orientations
2019-08-21 16:22:49 +01:00
e402bd9338
Added per-instance transformation matrix, variable wind swaying
2019-08-21 13:47:29 +01:00
5a39e78557
Distribution "fun."
2019-08-20 22:48:22 +02:00
