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,004 Commits 151 Branches 18 Tags 2.1 GiB
fb68bb3870
Commit Graph

10004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
fb68bb3870 Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation 2021-10-10 02:42:07 -04:00
Imbris
3e84bb0669 Try marking VolGrid2d::for_each_in and friends as inlineable 2021-10-10 02:42:07 -04:00
Imbris
81d426f7a0 Try marking Chonk::for_each_in and related functions as inlineable 2021-10-10 02:42:07 -04:00
Imbris
685bcb5c62 simplify water/walls check code, interally iterate in chonks (but not 
chunks)
 2021-10-10 02:42:06 -04:00
Imbris
77a1fc26bd Refactor some of the terrain collision code, failed pre-emptive liquid check experiment 2021-10-10 02:42:06 -04:00
Imbris
3f3eb637c4 Do iteration check for snapping after checking the other conditions 2021-10-10 02:42:06 -04:00
Imbris
bfece25bba Convert water/walls check to the new iteration function 2021-10-10 02:42:06 -04:00
Imbris
c22636a4b8 Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet 2021-10-10 02:42:06 -04:00
Joshua Barretto
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
Joshua Barretto
afc0fa0ffd Prevented double-spawning of chunks 2021-10-08 12:20:46 +01:00
Joshua Barretto
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
Joshua Barretto
fa767246f3 Added minimum server-side chunk loading 2021-10-07 14:23:55 +01:00
Imbris
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
Imbris
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
Imbris
2983ab60ed Make map icons fade out quickly when near the edge of the map display 2021-10-06 01:37:11 -04:00
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