Imbris
166aba61f0
Make nametages etc fixed size and only display within limited range
2020-01-24 22:09:45 -05:00
Acrimon
029f16a916
Merge branch 'acrimon/do-credit' into 'master'
...
Added sponsorship section to readme.
See merge request veloren/veloren!751
2020-01-25 01:15:17 +00:00
Acrimon
5596e144d7
Added sponsorship section to readme.
2020-01-25 01:46:06 +01:00
Monty Marz
f175947a91
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
c08c545474
fixed numbers spam
2020-01-24 16:10:38 +01:00
Imbris
605eb7c6ec
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
b6235d51cf
fix: overflow in VolGrid3d
2020-01-24 00:11:22 -05:00
Joshua Yanovski
d496080d84
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
02f9c9490b
Addressing MR comments.
2020-01-24 03:45:29 +01:00
Joshua Yanovski
3a0483e8ee
Fix asset caching issue in CI.
2020-01-23 18:18:54 +01:00
Joshua Yanovski
53474a215a
Resolving spurious Cargo.lock differences.
2020-01-23 18:18:46 +01:00
Joshua Yanovski
f39cc0b8bb
Updating CHANGELOG.
2020-01-23 18:18:44 +01:00
Joshua Yanovski
2908843448
Erosion cleanup, part 3.
...
Covers world/src/sim/erosion.rs.
2020-01-23 18:18:18 +01:00
Joshua Yanovski
64d19a80e3
Make changing Alt/Compute to f32 work again.
2020-01-23 18:18:18 +01:00
Joshua Yanovski
756cc0aab4
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
3383e991e7
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
133ba29293
Fixing Cargo.lock after rebase.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
55a96bce09
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
ba043b91a2
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
49e7e55cd6
Fix warnings in examples and benchmarks.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
1d6d0ea03d
Fix all warnings.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
ccd85e8907
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
d54f22c9fa
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
7f2573c561
Updating Cargo.lock.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
1358f1dffa
Changes to worldgen, adding more sedmient etc.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
ebe0d14eab
Send client 3D rendered map.
...
Also shares configurable rendering between map generator and server.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
9ee0cd82d0
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
2a6ed4351d
Revert to master for main background.
2020-01-23 18:18:13 +01:00
Joshua Yanovski
14e4dfb53f
Re-fix map orientation.
2020-01-23 18:18:13 +01:00
Joshua Yanovski
16c24e86b3
Updating Cargo.lock for sanity.
2020-01-23 18:18:13 +01:00
Joshua Yanovski
53ac7c0eb1
Weight flux twice as much as beforein humidity calculation.
2020-01-23 18:18:13 +01:00
Joshua Yanovski
597bb3c526
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
e91578ffdb
Cargo fmt most things (except erosion.rs).
2020-01-23 18:18:12 +01:00
Joshua Yanovski
5fd8b009a6
Gentler warp, especially for high chunk size.
2020-01-23 18:18:12 +01:00
Joshua Yanovski
8d5a5af2cb
Fix overflow issue with basement.
2020-01-23 18:18:12 +01:00
Joshua Yanovski
d0cfdb34aa
Fix colors on map being transferred to client.
2020-01-23 18:18:11 +01:00
Joshua Yanovski
2b38927345
Fixes for nonstandard chunk and map sizes.
...
Also fixes a longstanding map rendering issue.
2020-01-23 18:18:11 +01:00
Joshua Yanovski
9520ef4f6d
Implement sending world map across the network.
2020-01-23 18:18:11 +01:00
Joshua Yanovski
bacc5271d4
Soil production should use ground, not basement, slope.
2020-01-23 18:18:11 +01:00
Joshua Yanovski
ee5d383c46
Map saving, soil production, speedup attempts.
2020-01-23 18:18:10 +01:00
Pfauenauge90
33b0063e2c
birch models
2020-01-23 18:18:10 +01:00
Pfauenauge90
5fc34081bd
birches and "Acalok" Trees
2020-01-23 18:18:10 +01:00
Joshua Yanovski
c92ff34e15
Fix sediment transport, add hack for sediment.
2020-01-23 18:18:09 +01:00
Joshua Yanovski
e71f145b71
Sediment transport, plus many other things.
2020-01-23 18:18:09 +01:00
Joshua Yanovski
067429d13e
Use Worley noise for uplift.
2020-01-23 18:18:09 +01:00
Joshua Yanovski
72287f2041
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
e01bb8a8c9
Render sediment differently.
2020-01-23 18:18:08 +01:00
Joshua Yanovski
e289849c87
Map fixes.
2020-01-23 18:18:08 +01:00
Joshua Yanovski
cc58101540
Seed elements.
2020-01-23 18:18:08 +01:00
Joshua Yanovski
69a8d5039b
Adding hillslope diffusion.
2020-01-23 18:18:07 +01:00
