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,288 Commits 151 Branches 18 Tags 2.1 GiB
871859b09b
Commit Graph

10288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
086097cd56 Better vines and lighting 2021-10-10 13:41:57 +01:00
Joshua Barretto
a5309e1036 Prevented shrooms spawning in water 2021-10-10 13:41:57 +01:00
Joshua Barretto
2ce88ac398 Better grass and lily distribution 2021-10-10 13:41:57 +01:00
Joshua Barretto
353ccc5bce Added new cavern sprites to caverns 2021-10-10 13:41:57 +01:00
Joshua Barretto
7768a22f7f Better moss 2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12 cavern sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
b22029f87c More mushroom sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
d785ecc102 Added vines 2021-10-10 13:41:56 +01:00
Joshua Barretto
46118acef3 Added mushroom inner bevel 2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17 More cavern details 2021-10-10 13:41:56 +01:00
Joshua Barretto
ed40e92801 Better cave water 2021-10-10 13:41:56 +01:00
Joshua Barretto
f9c635c928 Silly GI for water in caves 2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7 Performance improvements for terrain watcher 2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7 Added caverns, fixed chunk load performance issue 2021-10-10 13:41:56 +01:00
Joshua Barretto
0f2afbec8f Fixed clouds and fluids underground 2021-10-10 13:41:56 +01:00
Imbris
4f6eb286e6 Remove dead commented code, updated changelog, commented profiling spans 
(but left in for easy reuse later), fix clippy complaint
 2021-10-10 03:09:03 -04:00
Imbris
57922d9802 Rearrange iteration pattern so that x is in the inner loop in the default for_each_in (no or little perf change) 2021-10-10 02:42:07 -04:00
Imbris
11c8cf19d1 Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change) 2021-10-10 02:42:07 -04:00
Imbris
5777486f5c Remove custom for_each_in from Chonk 2021-10-10 02:42:07 -04:00
Imbris
f65399eb00 Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation 2021-10-10 02:42:07 -04:00
Imbris
2350c08e91 Try marking VolGrid2d::for_each_in and friends as inlineable 2021-10-10 02:42:07 -04:00
Imbris
3a4c45f045 Try marking Chonk::for_each_in and related functions as inlineable 2021-10-10 02:42:07 -04:00
Imbris
7f6ba90f59 simplify water/walls check code, interally iterate in chonks (but not 
chunks)
 2021-10-10 02:42:06 -04:00
Imbris
e7b92789f9 Refactor some of the terrain collision code, failed pre-emptive liquid check experiment 2021-10-10 02:42:06 -04:00
Imbris
8987f6128e Do iteration check for snapping after checking the other conditions 2021-10-10 02:42:06 -04:00
Imbris
798e02b9e5 Convert water/walls check to the new iteration function 2021-10-10 02:42:06 -04:00
Imbris
59bd5b4acd 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
antoniomuso
761ae8f69d Make merchants send the player a trade request when interacted with 2021-10-09 21:14:01 +02:00
Joshua Barretto
4be50b8c56 Merge branch 'ubruntu/group-loot-notifications' into 'master' 
Groups can see what each member picks up

See merge request veloren/veloren!2906
 2021-10-09 10:50:02 +00:00
ubruntu
5fbc0d3a06 Groups can see what each member picks up 2021-10-09 10:50:01 +00:00
Joshua Barretto
a7a9e00a3a Merge branch 'imbris/dedup-chunk-gen-attempt' into 'master' 
More robustly avoid duplicate chunk generation

See merge request veloren/veloren!2912
 2021-10-08 22:00:50 +00:00
Imbris
d8a1f15358 Merge branch 'devrique/add-catalan-catalonia' into 'master' 
Add catalan (Catalonia) language translation

See merge request veloren/veloren!2894
 2021-10-08 20:42:46 +00:00
Imbris
2561f8e79f Merge branch 'CapsizeGlimmer/centering-cursor-error-spam' into 'master' 
Prevent "Error setting/centering cursor position" message spam

See merge request veloren/veloren!2902
 2021-10-08 20:29:25 +00:00
Imbris
8987389e8a 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
Enrique AM
277273ff14 Update CHANGELOG.md 2021-10-08 19:37:46 +02:00
GLawrence29
e7f1260f1d Add catalan (Catalonia) language translation 2021-10-08 19:37:46 +02:00
Imbris
9030fee99f Ensure cancelled chunks are not loaded into the terrain 2021-10-08 13:20:50 -04:00
Joshua Barretto
3a883a3695 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
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