Commit Graph

12149 Commits

Author SHA1 Message Date
Joshua Yanovski
233e12d279 Boost tree performance by ~70%.
Turns out inlining matters!
2022-07-27 21:47:47 -07:00
Joshua Yanovski
9ebf07c6e1 Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen 2022-07-27 15:30:37 -07:00
Joshua Yanovski
bc4600cf14 Rivers (hack, not great). 2022-07-25 18:28:27 -07:00
Marcel
34ae5b9df7 Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.13

See merge request veloren/veloren!3490
2022-07-23 13:15:01 +00:00
Marcel Märtens
bfcc2cb802 Change the version number to 0.13 2022-07-23 14:06:08 +02:00
Marcel
72b0b26004 Merge branch 'pfau/bg_new' into 'master'
new bg

See merge request veloren/veloren!3488
2022-07-22 11:49:57 +00:00
Marcel
79dc450e1e Merge branch 'CaribouJohn/fix-untranslated-perc' into 'master'
fix for #1604 : use correct values in calculation

See merge request veloren/veloren!3489
2022-07-21 18:29:18 +00:00
John Heath
edc10519c6 fix for #1604 : use correct values in calculation 2022-07-21 18:34:06 +01:00
Marcel
7f94580b20 Merge branch 'DaforLynx/thunder-fix' into 'master'
Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout

See merge request veloren/veloren!3487
2022-07-21 08:27:35 +00:00
DaforLynx
d2710635d8 Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout 2022-07-21 08:27:35 +00:00
Marcel
fae619eb2c Merge branch 'xMAC94x/buff_campfire_speedup' into 'master'
put light_emitters in par_loop to improve the runtime of the campfire lit out loop

See merge request veloren/veloren!3486
2022-07-20 10:01:05 +00:00
Monty Marz
6571068623 new bg 2022-07-19 20:53:06 +02:00
Marcel Märtens
ffe7b2158d put light_emitters in par_loop to improve the runtime of the campfire lit out loop 2022-07-18 20:56:28 +02:00
Joshua Yanovski
0b91f5ba90 Fix paths (sorta) and rock moss. 2022-07-18 09:19:20 -07:00
Joshua Yanovski
a3491d5073 Faster falloff, some performance optimizations. 2022-07-17 23:43:40 -07:00
Joshua Yanovski
fcb192d849 Fast density approximation. 2022-07-17 22:23:44 -07:00
Joshua Yanovski
7e9291fb4d Larger areas and wavelengths. 2022-07-17 20:31:55 -07:00
Joshua Yanovski
09a5e49c25 Scatter testing (not complete) 2022-07-17 20:11:36 -07:00
Marcel
e2188dac63 Merge branch 'fix-cursor-with-multiple-subwindows' into 'master'
Closing a subwindow (such as inventory or the list of online players) only...

Closes #1116

See merge request veloren/veloren!3484
2022-07-17 21:16:58 +00:00
Marcel
56416f52d8 Merge branch 'xMAC94x/adjust_coverage_regex' into 'master'
fix deprecated coverage setting:

See merge request veloren/veloren!3485
2022-07-17 20:18:43 +00:00
Marcel Märtens
9a45ad28c1 fix deprecated coverage setting:
https://docs.gitlab.com/ee/ci/pipelines/settings.html#add-test-coverage-results-using-project-settings-removed
https://github.com/xd009642/tarpaulin#gitlab-pipelines
2022-07-17 21:47:54 +02:00
Marcel
ed4d70ac5b Merge branch 'juliancoffee/add_cache_load_map' into 'master'
Add FileOpts::CacheLoad and a bit of refactoring

See merge request veloren/veloren!3472
2022-07-17 19:28:35 +00:00
Avi Weinstock
7f6ba8e492 Closing a subwindow (such as inventory or the list of online players) only regrabs the cursor if no other subwindow requires it.
Fixes #1116.
2022-07-17 14:58:02 -04:00
Marcel
c85819f03c Merge branch 'angel/fix-master-code-clean' into 'master'
Reverted removal of msg

See merge request veloren/veloren!3483
2022-07-17 18:03:06 +00:00
Forest Anderson
9d67deeeb7 Reverted removal of msg 2022-07-17 13:32:53 -04:00
Forest Anderson
67534488b3 Merge branch 'tygyh/CleanUp' into 'master'
Tygyh/clean up

See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Marcel
35883c61cb Merge branch 'mckol/update-polish-translation' into 'master'
Update the Polish translation

See merge request veloren/veloren!3399
2022-07-17 11:50:50 +00:00
juliancoffee
fac67a40a1 Make worldgen panic if loaded map has invalid size 2022-07-17 14:49:42 +03:00
juliancoffee
9d67d80a63 Only ovewrite LoadOrGenerate map if it's fresh map 2022-07-17 14:38:29 +03:00
juliancoffee
5079c0007f Remove prefix map_ for LoadOrGenerate maps 2022-07-17 14:38:29 +03:00
juliancoffee
d2962d544b Add overwrite option to LoadOrGenerate 2022-07-17 14:38:29 +03:00
juliancoffee
60a9cce57f Change map_path to inslude map directory 2022-07-17 14:38:29 +03:00
juliancoffee
a437d31205 Checking options from loaded map instead of hash 2022-07-17 14:38:29 +03:00
juliancoffee
6d9c7a5645 Adressing review 2022-07-17 14:38:29 +03:00
juliancoffee
6faba8a1e9 Use hashable wrapper around gen opts 2022-07-17 14:38:29 +03:00
juliancoffee
ddf2c43c18 Make hacky hash for gen opts 2022-07-17 14:38:29 +03:00
juliancoffee
1a21dfbc5b Add FileOpts::CacheLoad
Add map setting that allows both generating (if not exists) and loading map
2022-07-17 14:38:29 +03:00
juliancoffee
85cee14643 Refactoring, extract FileOpts dependent methods 2022-07-17 14:38:29 +03:00
Joshua Yanovski
2f42a7b011 Merge branch 'sharp/caves-hotfix' into 'master'
Temporarily remove waypoints in caves as people are getting stuck.

See merge request veloren/veloren!3482
2022-07-17 06:33:04 +00:00
Joshua Yanovski
ef4b190ad9 Temporarily remove waypoints in caves as people are getting stuck. 2022-07-16 23:08:05 -07:00
Joshua Barretto
7e27d33632 Merge branch 'zesterer/small-fixes' into 'master'
Performance Improvements

See merge request veloren/veloren!3481
2022-07-16 15:17:16 +00:00
Joshua Barretto
79ad06ab60 Early light filter 2022-07-16 15:54:12 +01:00
Joshua Barretto
cda6c031b8 Limit number of minor lights applied to entities to solve performance problems 2022-07-16 15:39:06 +01:00
Joshua Barretto
0b16baf46a Improved rain performance 2022-07-16 14:44:58 +01:00
Treeco
7efddc33f7 Merge branch 'more_humanoid_models' into 'master'
Humanoid Model Overhaul

See merge request veloren/veloren!3478
2022-07-16 11:13:24 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Mckol
8861e12e70 Updated the Polish translation 2022-07-16 13:07:45 +02:00
Joshua Barretto
d41e13c7b0 Merge branch 'zesterer/caves2' into 'master'
Cave Overhaul

See merge request veloren/veloren!3454
2022-07-16 10:40:44 +00:00
Joshua Barretto
ea39f78dfd Minimised rain occlusion problems 2022-07-16 11:14:12 +01:00
Joshua Barretto
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00