Commit Graph

2880 Commits

Author SHA1 Message Date
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
Joshua Yanovski
825ba1b4f4 WIP fixes: more pleasing uplift generation.
Uses the exponential distribution now.
2020-01-23 18:18:07 +01:00
Joshua Yanovski
1b864887e7 Reverting changes except to humidity and temperature
noise.
2020-01-23 18:18:07 +01:00
flyingfryingpan
28d0afbfb6 wahtevermoresharp 2020-01-23 18:18:07 +01:00
flyingfryingpan
a98d4adc27 forsharp 2020-01-23 18:18:07 +01:00
Monty Marz
6a3f979290 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
bfee0a6f9e Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
b8135408a5 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
1365abae99 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
Monty Marz
22b556b480 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
e2707ff24a start menu text 2020-01-21 22:04:39 +00:00
Timo Koesters
c0d2ac3ada 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
28fe73825d feat: fitness stat effects movement speed 2020-01-21 19:24:09 +01:00
Gilbert Röhrbein
4f90e6325e feat: add endurance fitness willpower to stats 2020-01-21 18:49:17 +01:00
Gilbert Röhrbein
c2b99f3a62 Fix panic in case no default audio device found when audio off 2020-01-21 18:09:37 +01:00
Joshua Barretto
dc2c3b0dd7 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
34c88708af Adjusted cloud fuzz factor 2020-01-21 13:14:25 +00:00
Joshua Barretto
8e7a8aa4f9 Shader optimisations 2020-01-21 12:58:20 +00:00
Joshua Barretto
bf1b2d96f5 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
49262c6a80 Fixes Hair Style & Color labels 2020-01-21 12:27:34 +00:00
Joshua Barretto
2ddb6d362e 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
8a0bd9220b Fixed button font 2020-01-20 22:54:51 +00:00
Joshua Barretto
4b5cc272ac sync 2020-01-20 22:51:55 +00:00
Joshua Barretto
397fa7777f Switched to enum-based char creation state 2020-01-20 22:29:14 +00:00
Joshua Barretto
1c922c939d Merge branch 'localization' into 'master'
Localization support for voxygen

See merge request veloren/veloren!731
2020-01-20 21:50:47 +00:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
2020-01-20 21:07:25 +01:00
Timo Koesters
ec0692249a Merge branch 'timo-balance' into 'master'
improvement: enemy balance

See merge request veloren/veloren!738
2020-01-20 19:10:09 +00:00
timokoesters
2e8bf9d212 improvement: enemy balance 2020-01-20 19:15:12 +01:00
Joshua Barretto
0223a60a1e Merge branch 'zesterer/cs-char-saving' into 'master'
Client-side character saving

See merge request veloren/veloren!737
2020-01-20 18:03:28 +00:00
Joshua Barretto
6f26f2afb1 fmt 2020-01-20 17:45:28 +00:00
Pfauenauge
caa5abf183 updated info main menu info 2020-01-20 18:08:05 +01:00
Songtronix
da6b209753 Merge branch 'shandley/audio-assets-cleanup' into 'master'
Remove currently unused audio assets

See merge request veloren/veloren!710
2020-01-20 15:07:30 +00:00
S Handley
b44955ba30 Remove currently unused audio assets
This clears out about 56MB of unused audio files.

There were also some unused methods in the audio modules which
referenced a file, which has also been removed.
2020-01-20 15:07:30 +00:00