Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,450 Commits 151 Branches 18 Tags 2.1 GiB
a314afdf04
Commit Graph

10450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treeco
e48c13e140 Decrease beehive frequency on apple trees 2021-10-08 17:42:01 +01:00
Joshua Barretto
d73ec09d83 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
Joshua Barretto
6d33e0d183 Prevented double-spawning of chunks 2021-10-08 12:20:46 +01:00
Sam
53c9dfcd92 Csv export entity drops tool now has ability to export all entities at once. 2021-10-07 20:28:18 -04:00
Joshua Barretto
84b563a7b6 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
Joshua Barretto
8dc8aeace5 Added minimum server-side chunk loading 2021-10-07 14:23:55 +01:00
CapsizeGlimmer
a723406df7 Prevent "Error setting/centering cursor position" message spam 2021-10-06 21:25:14 +00:00
Imbris
fd181d008a 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
Imbris
26c028975e 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
Imbris
66076db7bb Make map icons fade out quickly when near the edge of the map display 2021-10-06 01:37:11 -04:00
Treeco
daa921bc6b 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
305bdf94ef 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
4ab6336d11 Fix large map loading 2021-10-06 02:26:58 +01:00
Treeco
719fce1c89 Procgen apple trees 2021-10-06 02:26:43 +01:00
Treeco
dafa1327d0 Added mottled bark to birch 2021-10-06 02:26:43 +01:00
Treeco
c502bc177a Procgen birches 2021-10-06 02:26:43 +01:00
Samuel Keiffer
aaaf59d672 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
8744b69f24 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
c9d2501336 Revert "Merge branch 'ubruntu/par-entity-sync' into 'master'" 
This reverts merge request !2891
 2021-10-05 14:42:39 +00:00
Marcel
a48b99560c 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
b7e2e27000 Now outputs item names instead of item asset paths. 2021-10-04 21:46:19 -04:00
Samuel Keiffer
86bab8616d Merge branch 'ubruntu/enhance-campfires' into 'master' 
Interactable campfires

See merge request veloren/veloren!2895
 2021-10-05 00:55:29 +00:00
ubruntu
0e2808a8fd Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
38ecfe7c8b 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
f13a8a643b Fixed water light extinction 2021-10-05 00:02:34 +01:00
Joshua Barretto
96e23ae2d4 Handle oceans and steep rivers gracefully, update changelog 2021-10-05 00:02:32 +01:00
Joshua Barretto
2ae7bca9c0 Rebalanced boat speed 2021-10-05 00:02:03 +01:00
Joshua Barretto
c6d3137612 Fixed sail boat thrust, removed dead water code, added comments 2021-10-05 00:02:03 +01:00
Joshua Barretto
e8021fab2c Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
Joshua Barretto
c399fe9a39 No snow on riverbeds 2021-10-05 00:02:03 +01:00
Joshua Barretto
6c6b3e1244 Better lake borders and river depth 2021-10-05 00:02:03 +01:00
Joshua Barretto
22f48b1977 Added waterfalls and fixed warping issues 2021-10-05 00:02:03 +01:00
Joshua Barretto
3b66af468a Improved river and lake banks 2021-10-05 00:02:03 +01:00
Joshua Barretto
826aff2ea4 Better lake entrances and distance 2021-10-05 00:02:03 +01:00
Joshua Barretto
f118d15745 Fixed oceans 2021-10-05 00:02:03 +01:00
Joshua Barretto
87c7d6e982 Improved river/lake rendering 2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517 Added sail boat 2021-10-05 00:02:03 +01:00
Joshua Barretto
4aa8a6bb42 Better shrubs 2021-10-05 00:02:02 +01:00
Joshua Barretto
6284fa0ecd Tree trunk color differences 2021-10-05 00:02:02 +01:00
Joshua Barretto
4267a7b7dd Improved tree hanging and cedar distribution 2021-10-05 00:02:02 +01:00
Joshua Barretto
3f7e0a5e52 Added shrub layer with example shrub 2021-10-05 00:02:02 +01:00
Joshua Barretto
263f02dc11 Improved grass scatter 2021-10-05 00:02:02 +01:00
Imbris
645bd03142 Make sure ui draw commands are cleared if the renderer's resolution changes 2021-10-04 18:58:28 -04:00
Imbris
84e4e17ff5 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
c8b55d3dcb 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
bb26008074 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
4dca33a31f 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
17accd3839 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
67a1f4669f 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
86bb6f8ef5 Tweaks to the credits.ron file 2021-10-03 16:06:09 -04:00