Commit Graph

10054 Commits

Author SHA1 Message Date
5394ab16bb Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain. 2021-10-08 16:17:31 -04:00
0a589ec255 Update CHANGELOG.md 2021-10-08 19:37:46 +02:00
a60c19667e Add catalan (Catalonia) language translation 2021-10-08 19:37:46 +02:00
8575661d28 Ensure cancelled chunks are not loaded into the terrain 2021-10-08 13:20:50 -04:00
c531ce9fd3 Merge branch 'treeco/too-many-bees' into 'master'
Decrease beehive frequency on apple trees

See merge request veloren/veloren!2911
2021-10-08 17:18:26 +00:00
40f579d5ff Decrease beehive frequency on apple trees 2021-10-08 17:42:01 +01:00
ff570f3c4c Merge branch 'zesterer/exploit-patching' into 'master'
Prevented double-spawning of chunks

See merge request veloren/veloren!2908
2021-10-08 11:36:22 +00:00
afc0fa0ffd Prevented double-spawning of chunks 2021-10-08 12:20:46 +01:00
Sam
e794758dad Csv export entity drops tool now has ability to export all entities at once. 2021-10-07 20:28:18 -04:00
5fa753cf19 Merge branch 'zesterer/exploit-patching' into 'master'
Added minimum server-side chunk loading

See merge request veloren/veloren!2905
2021-10-07 13:56:16 +00:00
fa767246f3 Added minimum server-side chunk loading 2021-10-07 14:23:55 +01:00
b0eb684d31 Prevent "Error setting/centering cursor position" message spam 2021-10-06 21:25:14 +00:00
fe0954cb7d Merge branch 'imbirs/hud-map-tweaks' into 'master'
A few tweaks to the Hud map

See merge request veloren/veloren!2901
2021-10-06 20:04:39 +00:00
58c690f1d2 Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it 2021-10-06 02:13:02 -04:00
2983ab60ed Make map icons fade out quickly when near the edge of the map display 2021-10-06 01:37:11 -04:00
e4c19bb2ec Merge branch 'treeco/new-trees' into 'master'
More procgen trees, large map fixes

See merge request veloren/veloren!2899
2021-10-06 01:53:59 +00:00
fa2486b3d6 Various map UI fixes for large worlds
changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out
2021-10-06 02:26:58 +01:00
6409bd1abb Fix large map loading 2021-10-06 02:26:58 +01:00
6ae516e082 Procgen apple trees 2021-10-06 02:26:43 +01:00
7fefaaaf7b Added mottled bark to birch 2021-10-06 02:26:43 +01:00
93763c7e43 Procgen birches 2021-10-06 02:26:43 +01:00
10cadcd014 Merge branch 'sam/wiki-loot' into 'master'
Created csv export tool to get all item drops from an entity

See merge request veloren/veloren!2892
2021-10-05 15:45:22 +00:00
750f873bf3 Merge branch 'revert-17accd38' into 'master'
Revert "Merge branch 'ubruntu/par-entity-sync' into 'master'"

See merge request veloren/veloren!2900
2021-10-05 15:10:57 +00:00
7898af73c2 Revert "Merge branch 'ubruntu/par-entity-sync' into 'master'"
This reverts merge request !2891
2021-10-05 14:42:39 +00:00
9579acc3ae Merge branch 'imbris/fix-reset-scissor' into 'master'
Make sure ui draw commands are cleared if the renderer's resolution changes

Closes #1362

See merge request veloren/veloren!2898
2021-10-05 06:11:01 +00:00
Sam
8785ecfdeb Now outputs item names instead of item asset paths. 2021-10-04 21:46:19 -04:00
e322279f85 Merge branch 'ubruntu/enhance-campfires' into 'master'
Interactable campfires

See merge request veloren/veloren!2895
2021-10-05 00:55:29 +00:00
e80079ed99 Interactable campfires 2021-10-05 00:55:29 +00:00
ecc7fda80d Merge branch 'zesterer/shrubs' into 'master'
Shrubs (and water fixes)

See merge request veloren/veloren!2796
2021-10-04 23:24:56 +00:00
fb0325a80e Fixed water light extinction 2021-10-05 00:02:34 +01:00
4169420328 Handle oceans and steep rivers gracefully, update changelog 2021-10-05 00:02:32 +01:00
6af866ce50 Rebalanced boat speed 2021-10-05 00:02:03 +01:00
28459ae27d Fixed sail boat thrust, removed dead water code, added comments 2021-10-05 00:02:03 +01:00
631d8c6603 Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
7c2d35d215 No snow on riverbeds 2021-10-05 00:02:03 +01:00
418aa7af85 Better lake borders and river depth 2021-10-05 00:02:03 +01:00
481b1c0bc5 Added waterfalls and fixed warping issues 2021-10-05 00:02:03 +01:00
24a3ed683d Improved river and lake banks 2021-10-05 00:02:03 +01:00
bdd04e221b Better lake entrances and distance 2021-10-05 00:02:03 +01:00
b3fbba6df2 Fixed oceans 2021-10-05 00:02:03 +01:00
4e427a5b9f Improved river/lake rendering 2021-10-05 00:02:03 +01:00
59c8ee3c70 Added sail boat 2021-10-05 00:02:03 +01:00
9ce37c8a2e Better shrubs 2021-10-05 00:02:02 +01:00
478ff45684 Tree trunk color differences 2021-10-05 00:02:02 +01:00
061c3e37b3 Improved tree hanging and cedar distribution 2021-10-05 00:02:02 +01:00
8e01bb4bea Added shrub layer with example shrub 2021-10-05 00:02:02 +01:00
de62d17beb Improved grass scatter 2021-10-05 00:02:02 +01:00
25ec696ad1 Make sure ui draw commands are cleared if the renderer's resolution changes 2021-10-04 18:58:28 -04:00
e677213204 Merge branch 'imbris/small-fixes' into 'master'
Some small fixes

Closes #1155 and #870

See merge request veloren/veloren!2897
2021-10-04 16:46:59 +00:00
dee4f787b9 Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged). 2021-10-04 12:23:42 -04:00