2890 Commits

Author SHA1 Message Date
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
flyingfryingpan
b62820b887 wahtevermoresharp 2020-01-23 18:18:07 +01:00
flyingfryingpan
21e725df89 forsharp 2020-01-23 18:18:07 +01:00
Monty Marz
02fd4c4c96 Merge branch 'pfau/pulsating-inv-slot' into 'master'
Character stats displayed in char window, pulsating active slot in inventory

See merge request veloren/veloren!746
2020-01-23 17:14:02 +00:00
Monty Marz
fd2107a256 Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
f229d24d03 Merge branch 'pfau/asset-cleanup' into 'master'
Clean up unused UI assets

See merge request veloren/veloren!745
2020-01-22 21:56:03 +00:00
Monty Marz
7e7cedb686 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
Monty Marz
9a2541a502 Merge branch 'pfau/fix-info' into 'master'
start menu text

See merge request veloren/veloren!744
2020-01-21 22:04:40 +00:00
Monty Marz
6b78f0b4a0 start menu text 2020-01-21 22:04:39 +00:00
Timo Koesters
32fd326b06 Merge branch 'payload1/add-endurance-fitness-willpower' into 'master'
endurance, fitness, willpower stats and improve movement speed based on fitness

Closes #402 and #400

See merge request veloren/veloren!723
2020-01-21 19:15:07 +00:00
timokoesters
d75a160b59 feat: fitness stat effects movement speed 2020-01-21 19:24:09 +01:00
Gilbert Röhrbein
e1dbdf6a20 feat: add endurance fitness willpower to stats 2020-01-21 18:49:17 +01:00
Gilbert Röhrbein
4cd63114c4 Fix panic in case no default audio device found when audio off 2020-01-21 18:09:37 +01:00
Joshua Barretto
5e844d6b61 Merge branch 'zesterer/shader-perf' into 'master'
Shader optimisations

See merge request veloren/veloren!742
2020-01-21 14:40:49 +00:00
Joshua Barretto
b028290659 Adjusted cloud fuzz factor 2020-01-21 13:14:25 +00:00
Joshua Barretto
e8c8f2ce61 Shader optimisations 2020-01-21 12:58:20 +00:00
Joshua Barretto
c5cddd2deb Merge branch 'treeco/fix-char-creation-labels' into 'master'
Fix Hair Style & Color labels

See merge request veloren/veloren!741
2020-01-21 12:57:02 +00:00
Treeco
b32abbac95 Fixes Hair Style & Color labels 2020-01-21 12:27:34 +00:00
Joshua Barretto
b2e40b34a4 Merge branch 'pfau/fix-char-creation' into 'master'
Fixed char select bugs, improved code quality

See merge request veloren/veloren!739
2020-01-20 23:20:22 +00:00
Joshua Barretto
f008fabba9 Fixed button font 2020-01-20 22:54:51 +00:00
Joshua Barretto
437b438f73 sync 2020-01-20 22:51:55 +00:00