2910 Commits

Author SHA1 Message Date
Acrimon
a220aed985
Added sponsorship section to readme. 2020-01-25 01:46:06 +01:00
Monty Marz
c45c7d4713 Merge branch 'hotfix' into 'master'
Fixes number spam in console

See merge request veloren/veloren!748
2020-01-24 15:42:36 +00:00
Pfauenauge90
b262bf3b07 fixed numbers spam 2020-01-24 16:10:38 +01:00
Imbris
9cbe2137f6 Merge branch 'imbris/vg3d-fix' into 'master'
Fix overflow in VolGrid3d

See merge request veloren/veloren!747
2020-01-24 06:27:26 +00:00
Imbris
38f854c6bb fix: overflow in VolGrid3d 2020-01-24 00:11:22 -05:00
Joshua Yanovski
323bc7b715 Merge branch 'ffp/world-colors' into 'master'
Ffp/world colors

See merge request veloren/veloren!740
2020-01-24 03:17:44 +00:00
Joshua Yanovski
2301c94d2b Addressing MR comments. 2020-01-24 03:45:29 +01:00
Joshua Yanovski
26dccdb544 Fix asset caching issue in CI. 2020-01-23 18:18:54 +01:00
Joshua Yanovski
fe580c9223 Resolving spurious Cargo.lock differences. 2020-01-23 18:18:46 +01:00
Joshua Yanovski
8e3fcee157 Updating CHANGELOG. 2020-01-23 18:18:44 +01:00
Joshua Yanovski
4a6a41e31d Erosion cleanup, part 3.
Covers world/src/sim/erosion.rs.
2020-01-23 18:18:18 +01:00
Joshua Yanovski
7391e8ae79 Make changing Alt/Compute to f32 work again. 2020-01-23 18:18:18 +01:00
Joshua Yanovski
3a868b9c92 Erosion cleanup, part 2.
Covers all remaining files touched by MR except
world/src/sim/erosion.rs.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
0b7f428310 Erosion cleanup, part 1.
Covers all files touched by MR that are not in world/src/sim.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
78c411d944 Fixing Cargo.lock after rebase. 2020-01-23 18:18:17 +01:00
Joshua Yanovski
88566f22f2 Minor fix to map generation.
Also fixes some typos and makes formatting easier for changes needed to
produce large maps.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
78093a6479 Screenshots with F4 in the map, that will have the full resolution of
the displayed map (hopefully).
2020-01-23 18:18:16 +01:00
Joshua Yanovski
3c26342dba Fix warnings in examples and benchmarks. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
3ba86c7b12 Fix all warnings. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
d81218a114 Fixes to enable loading (relatively) large maps.
With these changes, we can successfully open, map, and play maps thare
are 16x the size of a standard (1024 x 1024 chunk) map, 4x larger in
each direction.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
81306ad31f Add a default world map.
Also adds map versioning, proper scaling, and updates sediment
rendering.  It also tones down warp.
2020-01-23 18:18:15 +01:00
Joshua Yanovski
f527206e9d Updating Cargo.lock. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
6a33254518 Changes to worldgen, adding more sedmient etc. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
d79b0202e8 Send client 3D rendered map.
Also shares configurable rendering between map generator and server.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
4b78597fb4 Code restructuring for performance.
Turned a lot of for loops into for_each loops, which should be easier
for LLVM to optimize currently.  Also updated almost all the non-erosion
stuff in WorldGen to run in parallel (and take advantage of the cache,
in the case of TownGen), and hopefully improved performance somewhat for
chunk generation as well.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
c9857869c7 Revert to master for main background. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
cc14c9166f Re-fix map orientation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
3c9e2a7f4e Updating Cargo.lock for sanity. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
11ee4389dc Weight flux twice as much as beforein humidity calculation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
1ea8c1360b Adding many new types of geomorphic laws:
- soil production (currently disabled).
- debris flow erosion (combined with regular stream power law).
- flow computation using multiple receivers.
- filling strategy during drainage network calculations.

Also tweaks a variety of other aspects of erosion.
2020-01-23 18:18:12 +01:00
Joshua Yanovski
4f863470e1 Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
982b538a37 Gentler warp, especially for high chunk size. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
0e88be716d Fix overflow issue with basement. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
b5b017b4c6 Fix colors on map being transferred to client. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
558a80f099 Fixes for nonstandard chunk and map sizes.
Also fixes a longstanding map rendering issue.
2020-01-23 18:18:11 +01:00
Joshua Yanovski
b988b27d31 Implement sending world map across the network. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
5439f432e9 Soil production should use ground, not basement, slope. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
675ad06cfe Map saving, soil production, speedup attempts. 2020-01-23 18:18:10 +01:00
Pfauenauge90
f28ff935f3 birch models 2020-01-23 18:18:10 +01:00
Pfauenauge90
793694ebf7 birches and "Acalok" Trees 2020-01-23 18:18:10 +01:00
Joshua Yanovski
1be2dbef9f Fix sediment transport, add hack for sediment. 2020-01-23 18:18:09 +01:00
Joshua Yanovski
95fdfe37e2 Sediment transport, plus many other things. 2020-01-23 18:18:09 +01:00
Joshua Yanovski
6be770a4e1 Use Worley noise for uplift. 2020-01-23 18:18:09 +01:00
Joshua Yanovski
d2096f540d Implement carving strategy for lake connections.
Also fix mapgen slopes and make a much more pleasing world.
2020-01-23 18:18:08 +01:00
Joshua Yanovski
1e02025ca8 Render sediment differently. 2020-01-23 18:18:08 +01:00
Joshua Yanovski
8f2a751bf4 Map fixes. 2020-01-23 18:18:08 +01:00
Joshua Yanovski
5f112fb41f Seed elements. 2020-01-23 18:18:08 +01:00
Joshua Yanovski
1e159b8278 Adding hillslope diffusion. 2020-01-23 18:18:07 +01:00
Joshua Yanovski
f8ede56e7a WIP fixes: more pleasing uplift generation.
Uses the exponential distribution now.
2020-01-23 18:18:07 +01:00
Joshua Yanovski
515222b126 Reverting changes except to humidity and temperature
noise.
2020-01-23 18:18:07 +01:00