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
806f240eb5
Commit Graph

8338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Capucho
806f240eb5 Started the report of wgpu 2021-06-02 23:55:59 -04:00
Imbris
ab5f0df06b 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
4b359b8ca4 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
9a31d77f0a 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
d235e98efe 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
054fb1d763 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
1fc3fce970 Move warning-supressing from global onto function 2021-06-03 01:58:34 +03:00
Imbris
f07c2e8dab Add missing userdata strategy env var to macos builds 2021-06-02 16:50:42 -04:00
juliancoffee
00714db492 Implement Choice of Choice in loadout files 2021-06-02 18:35:22 +03:00
juliancoffee
674a7f41bd 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
f988584337 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
952156ad99 Add ability to override weapon in loadout assets 2021-06-02 17:17:19 +03:00
juliancoffee
3c66e62fe0 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
641ccd5282 Replace object initialization with read from file 2021-06-02 17:17:19 +03:00
Dr. Dystopia
35d5e3379e Create 'default.ron' file 2021-06-02 17:17:19 +03:00
Imbris
2af6cb07f8 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
42dc86788e Address further MR 2301 comments. 2021-06-02 00:39:58 -04:00
Avi Weinstock
9c4453508e Address many of Imbris's comments on MR 2301. 2021-06-02 00:39:58 -04:00
Avi Weinstock
5aa98d18e3 Depend on crossbeam-utils and crossbeam-channel instead of crossbeam in voxygen. 2021-06-02 00:39:58 -04:00
Avi Weinstock
8b21ed540c Use a single HashMap with the entry API and a KeyedJobTask enum for KeyedJobs. 2021-06-02 00:39:58 -04:00
Avi Weinstock
6d3dcc3835 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
e509a4207b Make the minimap UI not exposed via checkbox yet (still configurable via settings.ron). 2021-06-02 00:39:58 -04:00
Avi Weinstock
9d60a7f533 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
523bf2be58 Fix memory leak in KeyedJobs threadpool helper. 2021-06-02 00:39:58 -04:00
Avi Weinstock
7115b1c899 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
cbe7521259 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
1214715c21 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
59e93d23c1 Improve ceiling detection for the voxel minimap. 2021-06-02 00:39:04 -04:00
Avi Weinstock
d878a2050a Composite the layers on chunk load, and try to add an overhead mode. 2021-06-02 00:39:04 -04:00
Avi Weinstock
6df2e96d25 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
937815d8c3 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
7980230b7f Add a minimap overlay based on voxel data. 2021-06-02 00:39:04 -04:00
Imbris
8cd4a39bf9 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
a8ced7b959 Fix benchmarks by removing the rest of the incremental folder 2021-06-01 17:32:31 -04:00
Imbris
d256dae29e 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
e3523d418c 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
659541d463 Fix pages by specifying a docker image 2021-06-01 16:26:41 -04:00
Imbris
351327c3d0 Use native macos runner for builds 2021-06-01 16:08:47 -04:00
Imbris
2c279c02d1 Merge branch 'imbris/update-toolchain' into 'master' 
Update toolchain

See merge request veloren/veloren!2322
 2021-06-01 18:49:30 +00:00
Imbris
32ab0860ca delete all incremental things for clippy CI 2021-06-01 14:15:01 -04:00
Imbris
1a092be2a1 Re-disable incremental for veloren-network-protocol, switch back to 
`veloren-docker` tagged runners
 2021-06-01 13:35:03 -04:00
Imbris
3a1a65b134 Remove stabilized or_patterns feature 2021-06-01 13:19:20 -04:00
Imbris
1db0e2a15c 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
23eca4c3f6 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
48ebb10d50 Update toolchain 2021-05-31 20:44:57 -04:00
Samuel Keiffer
9637d874ab 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
77cb2ae783 fix: commas 2021-05-30 14:47:42 -07:00
Samuel Keiffer
58dcec79b5 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
daa18dd92a fix: remove limit 2021-05-30 13:42:47 -07:00
Adam Whitehurst
2e74348813 refactor: variable names 2021-05-30 13:40:25 -07:00