Treeco
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
Treeco
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
Treeco
6409bd1abb
Fix large map loading
2021-10-06 02:26:58 +01:00
Treeco
6ae516e082
Procgen apple trees
2021-10-06 02:26:43 +01:00
Treeco
7fefaaaf7b
Added mottled bark to birch
2021-10-06 02:26:43 +01:00
Treeco
93763c7e43
Procgen birches
2021-10-06 02:26:43 +01:00
Samuel Keiffer
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
Imbris
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
Imbris
7898af73c2
Revert "Merge branch 'ubruntu/par-entity-sync' into 'master'"
...
This reverts merge request !2891
2021-10-05 14:42:39 +00:00
Marcel
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
Samuel Keiffer
e322279f85
Merge branch 'ubruntu/enhance-campfires' into 'master'
...
Interactable campfires
See merge request veloren/veloren!2895
2021-10-05 00:55:29 +00:00
ubruntu
e80079ed99
Interactable campfires
2021-10-05 00:55:29 +00:00
Joshua Barretto
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
Joshua Barretto
fb0325a80e
Fixed water light extinction
2021-10-05 00:02:34 +01:00
Joshua Barretto
4169420328
Handle oceans and steep rivers gracefully, update changelog
2021-10-05 00:02:32 +01:00
Joshua Barretto
6af866ce50
Rebalanced boat speed
2021-10-05 00:02:03 +01:00
Joshua Barretto
28459ae27d
Fixed sail boat thrust, removed dead water code, added comments
2021-10-05 00:02:03 +01:00
Joshua Barretto
631d8c6603
Cleaned up shrub implementation
2021-10-05 00:02:03 +01:00
Joshua Barretto
7c2d35d215
No snow on riverbeds
2021-10-05 00:02:03 +01:00
Joshua Barretto
418aa7af85
Better lake borders and river depth
2021-10-05 00:02:03 +01:00
Joshua Barretto
481b1c0bc5
Added waterfalls and fixed warping issues
2021-10-05 00:02:03 +01:00
Joshua Barretto
24a3ed683d
Improved river and lake banks
2021-10-05 00:02:03 +01:00
Joshua Barretto
bdd04e221b
Better lake entrances and distance
2021-10-05 00:02:03 +01:00
Joshua Barretto
b3fbba6df2
Fixed oceans
2021-10-05 00:02:03 +01:00
Joshua Barretto
4e427a5b9f
Improved river/lake rendering
2021-10-05 00:02:03 +01:00
Joshua Barretto
59c8ee3c70
Added sail boat
2021-10-05 00:02:03 +01:00
Joshua Barretto
9ce37c8a2e
Better shrubs
2021-10-05 00:02:02 +01:00
Joshua Barretto
478ff45684
Tree trunk color differences
2021-10-05 00:02:02 +01:00
Joshua Barretto
061c3e37b3
Improved tree hanging and cedar distribution
2021-10-05 00:02:02 +01:00
Joshua Barretto
8e01bb4bea
Added shrub layer with example shrub
2021-10-05 00:02:02 +01:00
Joshua Barretto
de62d17beb
Improved grass scatter
2021-10-05 00:02:02 +01:00
Imbris
25ec696ad1
Make sure ui draw commands are cleared if the renderer's resolution changes
2021-10-04 18:58:28 -04:00
Imbris
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
Imbris
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
Imbris
a4d7df1c1d
Remove explicit coreaudio-sys version since we no longer rely on having the older version pinned (in fact it was already updated to the latest version)
2021-10-04 11:15:26 -04:00
Joshua Barretto
e027e4b320
Merge branch 'alphyr/update_assets_manager' into 'master'
...
Update `assets_manager` to `0.6.0`
See merge request veloren/veloren!2889
2021-10-04 11:40:41 +00:00
Imbris
88f5ccd305
Merge branch 'ubruntu/par-entity-sync' into 'master'
...
Parallelize EntitySync
See merge request veloren/veloren!2891
2021-10-03 20:30:48 +00:00
Imbris
4ca992b73e
Merge branch 'imbris/credits-tweaks' into 'master'
...
Tweaks to the credits.ron file
See merge request veloren/veloren!2896
2021-10-03 20:21:18 +00:00
Imbris
e5442c3f20
Tweaks to the credits.ron file
2021-10-03 16:06:09 -04:00
Imbris
6f28f80e16
Merge branch 'imbris/credits' into 'master'
...
Add credits screen
Closes #1296
See merge request veloren/veloren!2872
2021-10-03 04:26:58 +00:00
Imbris
d77a0779ca
Add core devs to the contributors list in credits.ron and remove placeholder entries in empty art sections (in favor of displaying nothing)
2021-10-03 00:06:47 -04:00
Sam
35cb46738d
Created csv export tool to get all item drops from an entity
2021-10-02 12:08:40 -04:00
Imbris
d375a04393
Merge branch 'imbris/fix-text-offset' into 'master'
...
Rework scaling to never use the logical size directly from the window as it can end up inconsistent with the size used by the renderer depending on the timing
Closes #1360
See merge request veloren/veloren!2888
2021-10-02 13:20:09 +00:00
Bryant Deters
b2d384b436
using par_join.for_each as if I know what I'm doing
2021-10-01 18:05:52 -05:00
Imbris
2cc2db3186
Merge branch 'ubruntu/trade-fix-part3' into 'master'
...
Trade fix (with hashmap awareness)
See merge request veloren/veloren!2877
2021-10-01 21:17:19 +00:00
ubruntu
241fbc47dd
Trade fix (with hashmap awareness)
2021-10-01 21:17:19 +00:00
Benoît du Garreau
dda54e6ee2
Update assets_manager to 0.6.0
2021-10-01 21:13:01 +02:00
Samuel Keiffer
984ea6008d
Merge branch 'sam/loot' into 'master'
...
Refactored loot table selection on entity death
See merge request veloren/veloren!2879
2021-10-01 07:06:10 +00:00
Imbris
e6e5219104
Rework scaling to never use the logical size directly from the window as it can end up being inconsistent with the rendering target size (depending on timing)
2021-10-01 01:13:15 -04:00
