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
Joshua Barretto
5d7197d7d6
Switched to enum-based char creation state
2020-01-20 22:29:14 +00:00
Joshua Barretto
cbd695f880
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
e5fb2e2e76
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
c9372b6301
Merge branch 'timo-balance' into 'master'
...
improvement: enemy balance
See merge request veloren/veloren!738
2020-01-20 19:10:09 +00:00
timokoesters
f46e900b57
improvement: enemy balance
2020-01-20 19:15:12 +01:00
Joshua Barretto
86b9ce182a
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
11a85393c5
fmt
2020-01-20 17:45:28 +00:00
Pfauenauge
f6cf2a7a5e
updated info main menu info
2020-01-20 18:08:05 +01:00
Songtronix
c0c334a9f7
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
bafa6718a4
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
Joshua Barretto
fc8bc83c01
Solved character select body bug
2020-01-20 15:04:53 +00:00
Joshua Barretto
a6cf5a2a3c
Enumerated Body type
2020-01-20 14:21:06 +00:00
Joshua Yanovski
0c97ad8913
Merge branch 'sharp/fix-ci' into 'master'
...
Fix benchmarks and profile overrides.
See merge request veloren/veloren!736
2020-01-20 13:49:48 +00:00
Joshua Barretto
c6651165c2
Updated changelog
2020-01-20 13:40:14 +00:00
Joshua Barretto
894b82bd6b
Added client-side character saving
2020-01-20 13:37:29 +00:00
Joshua Yanovski
93c953a989
Fix benchmarks and profile overrides.
...
This was necessary because Cargo recently deprecated the "overrides"
keyword in favor of "package", and Criterion changed its interface.
This commit also now lists more configurable keys, so if they aren't set
to their defaults the user will be able to find them. This includes the
roll key, which wasn't listed earlier and is different on Windows and
Mac. It does *not* include the respawn key because that key is already
shown when you die.
2020-01-20 14:16:28 +01:00
Joshua Yanovski
a04e0d49b6
Merge branch 'sharp/mac-fixes' into 'master'
...
Fixes for OS X machines.
See merge request veloren/veloren!735
2020-01-20 11:22:51 +00:00
Joshua Yanovski
68210fcf82
Fixes for OS X machines.
...
Handles scroll wheel events in pixels (enabling the scroll wheel) and
sets rolling and wall leaping to use left shift by default on OS X
(instead of middle mouse click, which is absent by default on Apple
trackpads). Also updates the controls UI to show the actual assigned
keys for those controls which are configurable.
2020-01-20 05:12:41 +01:00
Acrimon
0e5a182817
Merge branch 'imbris/light-fix' into 'master'
...
Fix lighting calc bug, lower meshing bench sample size
See merge request veloren/veloren!734
2020-01-19 23:39:43 +00:00
Imbris
abdc524a61
Don't panic if a region can't be found for a deleted entity
2020-01-19 18:22:11 -05:00
Imbris
e323bc79be
Fix lighting calc bug, lower meshing bench sample size
2020-01-19 18:14:07 -05:00
