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
8,338 Commits 151 Branches 18 Tags 2.1 GiB
afeedb412e
Commit Graph

8338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Märtens
afeedb412e change cidb settings 2021-06-03 17:26:09 +02:00
Imbris
73ce406640 Merge branch 'imbris/fix-macos' into 'master' 
Add missing userdata strategy env var to macos builds

See merge request veloren/veloren!2366
 2021-06-02 23:56:16 +00:00
Samuel Keiffer
8e278a2124 Merge branch 'aweinstock/price-equality' into 'master' 
Add a manifest for making different items count as the same item for the purpose of pricing.

See merge request veloren/veloren!2360
 2021-06-02 23:48:45 +00:00
Samuel Keiffer
92f150bf5b Merge branch 'tygyh/default-loadout' into 'master' 
LoadoutBuilder refactoring

See merge request veloren/veloren!2361
 2021-06-02 23:42:39 +00:00
Samuel Keiffer
a3ee98cfb9 Merge branch 'aweinstock/agent-pid' into 'master' 
Implement PID controllers and use them to stabilize Agent airship flight.

See merge request veloren/veloren!2356
 2021-06-02 23:15:08 +00:00
Avi Weinstock
489fe930ac Add a manifest for making different items count as the same item for the purpose of pricing. 2021-06-02 19:12:51 -04:00
juliancoffee
adbe17dfd7 Move warning-supressing from global onto function 2021-06-03 01:58:34 +03:00
Imbris
857eb98632 Add missing userdata strategy env var to macos builds 2021-06-02 16:50:42 -04:00
juliancoffee
2ec161aec9 Implement Choice of Choice in loadout files 2021-06-02 18:35:22 +03:00
juliancoffee
eeab9aa5bb Using clippy::pedantic and improve asset tests 
- Turned clippy::pedantic on for loadout_builder.rs and applied some
proposition
- Check for invalid weights in loadout files
 2021-06-02 17:54:14 +03:00
Marcel
35980f82a6 Merge branch 'revert-c6e200a3' into 'master' 
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2318
 2021-06-02 14:27:13 +00:00
juliancoffee
d2a580b0d0 Add ability to override weapon in loadout assets 2021-06-02 17:17:19 +03:00
juliancoffee
3e88df129f Decompose LoadoutBuilder::from_asset_expect 
- Introduce apply_asset_expect() to mutate passed builder and complete it
from asset
- Remove runtime panic from choosing item
- Rewrite defaults() to load from asset
 2021-06-02 17:17:19 +03:00
Dr. Dystopia
d67d6773f0 Replace object initialization with read from file 2021-06-02 17:17:19 +03:00
Dr. Dystopia
bc6192b457 Create 'default.ron' file 2021-06-02 17:17:19 +03:00
Imbris
38fdef6c28 Merge branch 'aweinstock/dungeonmap' into 'master' 
Add voxel data to the minimap (for visualizing trees and houses and dungeons)

See merge request veloren/veloren!2301
 2021-06-02 05:06:24 +00:00
Avi Weinstock
9af2557f9c Address further MR 2301 comments. 2021-06-02 00:39:58 -04:00
Avi Weinstock
ebeeb7e3bf Address many of Imbris's comments on MR 2301. 2021-06-02 00:39:58 -04:00
Avi Weinstock
5834a9da4b Depend on crossbeam-utils and crossbeam-channel instead of crossbeam in voxygen. 2021-06-02 00:39:58 -04:00
Avi Weinstock
4b5688fa03 Use a single HashMap with the entry API and a KeyedJobTask enum for KeyedJobs. 2021-06-02 00:39:58 -04:00
Avi Weinstock
75cca1c02e Address MR 2301 review comments. 
- Replace tabs with spaces in map-related i18n.
- Use `retain` in `remove_unloaded_chunks`.
 2021-06-02 00:39:58 -04:00
Avi Weinstock
0fdd84dc9c Make the minimap UI not exposed via checkbox yet (still configurable via settings.ron). 2021-06-02 00:39:58 -04:00
Avi Weinstock
8a347c0978 Make the chunks above dungeons/caves default to black when the ceiling is below them. 2021-06-02 00:39:58 -04:00
Avi Weinstock
82a83b2944 Fix memory leak in KeyedJobs threadpool helper. 2021-06-02 00:39:58 -04:00
Avi Weinstock
64801eeb32 Performance and aesthetic improvements to the voxel minimap. 
Performance:
- don't do anything when it's inactive
- only process chunks within minimap-VD
- remove chunks outside of VD
- higher thread pool fraction specified

Aesthetics:
- different water color
- wood and leaves no longer count as ceilings
 2021-06-02 00:39:58 -04:00
Avi Weinstock
d637250501 Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry. 2021-06-02 00:39:04 -04:00
Avi Weinstock
f86c4a52d4 Use a threadpool to speed up minimap chunk rendering. Also fix ceiling height calculations and color water blue. 2021-06-02 00:39:04 -04:00
Avi Weinstock
f1b6e0d3c2 Improve ceiling detection for the voxel minimap. 2021-06-02 00:39:04 -04:00
Avi Weinstock
c75ef514ed Composite the layers on chunk load, and try to add an overhead mode. 2021-06-02 00:39:04 -04:00
Avi Weinstock
4490737405 Improve the efficiency of the voxel minimap by only updating it when crossing a chunk boundary or changing z-level. Allows making the 9 chunks nearest to the player fancier by compositing multiple z levels. 2021-06-02 00:39:04 -04:00
Avi Weinstock
c366100a8c Make all the offsets for voxel minimap work properly for arbitrary sizes, and fix the memory leak. 2021-06-02 00:39:04 -04:00
Avi Weinstock
98b34a0340 Add a minimap overlay based on voxel data. 2021-06-02 00:39:04 -04:00
Imbris
8f7834b3de Merge branch 'imbris/fix-bench' into 'master' 
Fix benchmarks by removing the rest of the incremental folder

See merge request veloren/veloren!2364
 2021-06-02 03:33:27 +00:00
Imbris
92c6ea9017 Fix benchmarks by removing the rest of the incremental folder 2021-06-01 17:32:31 -04:00
Imbris
18a064c855 Merge branch 'imbris/fix-pages' into 'master' 
Fix pages by specifying a docker image

See merge request veloren/veloren!2363
 2021-06-01 21:07:57 +00:00
Imbris
e5a6ae3e57 Merge branch 'imbris/macos-ci' into 'master' 
Use native macos runner for builds

See merge request veloren/veloren!2362
 2021-06-01 20:34:07 +00:00
Imbris
988f2eae25 Fix pages by specifying a docker image 2021-06-01 16:26:41 -04:00
Imbris
82788716e0 Use native macos runner for builds 2021-06-01 16:08:47 -04:00
Imbris
b365b9a54b Merge branch 'imbris/update-toolchain' into 'master' 
Update toolchain

See merge request veloren/veloren!2322
 2021-06-01 18:49:30 +00:00
Imbris
72136103d7 delete all incremental things for clippy CI 2021-06-01 14:15:01 -04:00
Imbris
e9940371b7 Re-disable incremental for veloren-network-protocol, switch back to 
`veloren-docker` tagged runners
 2021-06-01 13:35:03 -04:00
Imbris
82b0ed1ab0 Remove stabilized or_patterns feature 2021-06-01 13:19:20 -04:00
Imbris
1cc565a32f Use new multi image cache scheme in the CI and consolidate runner tag specification so that it is easier to modify 2021-06-01 13:19:12 -04:00
Imbris
5caf8b6b55 Re-disable incremental just for common-systems, small fix in plugin 
crate, more new clippy fixes
 2021-05-31 20:44:57 -04:00
Imbris
5985584c5c Update toolchain 2021-05-31 20:44:57 -04:00
Samuel Keiffer
db8ea7c84f Merge branch 'adam/frozen-debuff' into 'master' 
Frozen Debuff

See merge request veloren/veloren!2357
 2021-05-30 22:39:11 +00:00
Adam Whitehurst
7f2fa4181d fix: commas 2021-05-30 14:47:42 -07:00
Samuel Keiffer
e4d2d08e7d Merge branch 'ygor/fix-glider-stuck-inside-wall' into 'master' 
Reset on_ceiling when not on ceiling

See merge request veloren/veloren!2247
 2021-05-30 21:09:31 +00:00
Adam Whitehurst
0baf16704d fix: remove limit 2021-05-30 13:42:47 -07:00
Adam Whitehurst
e3364d1bf4 refactor: variable names 2021-05-30 13:40:25 -07:00