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,466 Commits 151 Branches 18 Tags
Commit Graph

444 Commits

Author SHA1 Message Date
Imbris
22199a9980 Switch to using block_on directly from futures-executor instead of the umbrella crate 2021-06-03 14:28:28 -04:00
Imbris
6c61c9495e Enable since naga currently has issues translating our SPIRV -> metal 2021-06-03 00:10:07 -04:00
Imbris
b9a55961c5 Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code 2021-06-03 00:10:06 -04:00
Imbris
156888e965 address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace) 2021-06-03 00:10:06 -04:00
Imbris
7c761147a4 Use profling to get spans from wgpu, update wpgu & its deps for various 
fixes
 2021-06-03 00:10:06 -04:00
Imbris
94ace54aec Update wgpu to fix dx11 issue 2021-06-03 00:10:06 -04:00
Imbris
466ec852ee Update wgpu to latest version and improve error formating 2021-06-03 00:10:06 -04:00
Imbris
8f7e83926f Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue 2021-06-02 23:59:50 -04:00
Imbris
6a9c8612e7 Update wgpu 2021-06-02 23:59:50 -04:00
Imbris
e399ad23e2 Update wgpu-profiler, smol rebase fix 2021-06-02 23:59:50 -04:00
Imbris
9a06d03127 Almost implement instance merging for sprites (validation error), rebase 
fix
 2021-06-02 23:59:50 -04:00
João Capucho
5e4aabd981 Update to the most recent wgpu 2021-06-02 23:59:49 -04:00
Imbris
118487cee2 Update to the latest wgpu git 2021-06-02 23:59:49 -04:00
Imbris
0ea17414a5 Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes 2021-06-02 23:59:49 -04:00
Imbris
1b727ddba2 WIP gpu timer thing (not for squashing!) 2021-06-02 23:59:49 -04:00
Capucho
2c920558bb More fixes 2021-06-02 23:56:43 -04:00
Capucho
e1145de8c2 Finished porting all pipelines 2021-06-02 23:55:59 -04:00
Capucho
c069149aab Started the report of wgpu 2021-06-02 23:55:59 -04: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
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
82a83b2944 Fix memory leak in KeyedJobs threadpool helper. 2021-06-02 00:39:58 -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
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
5985584c5c Update toolchain 2021-05-31 20:44:57 -04:00
Avi Weinstock
202646787d Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. 
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
 2021-05-28 15:09:29 -04:00
Monty
52c7ec0db1 update conrod core commit to enhance highlight colors 2021-05-22 23:22:12 +02:00
Marcel
be56cd2a87 Revert "Merge branch 'sharp/revert-quinn' into 'master'" 
This reverts merge request !2315
 2021-05-21 10:41:16 +02:00
Joshua Yanovski
20eccf597b Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'" 
This reverts commit 04d8ddf25ed6b1ae8dd97846c5c4b9af4ab399b8, reversing
changes made to 9dcf7a9d26f7d60020c5707fea3ed8ac5596d3dc.
 2021-05-17 08:32:12 -07:00
Marcel
48208b711d Merge branch 'xMAC94x/quic_enablement' into 'master' 
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2268
 2021-05-17 12:02:55 +00:00
Joshua Yanovski
39369e090f More fixes to stdin input. 
Adding tty makes sure docker attach won't be accidentally detached
by ctrl-C (there are better ways of doing this but this one works
for now)

shell-words more closely emulates Bash's tokenizer rules (but without
doing things like environment variable expansion) which allows us to use
multiline strings as reasons, etc.  Unfortunately entering newlines
still won't work the way we've written things since shell-words does not
right now give enough information to incrementally build up a valid
string, just says there was a tokenizing error; but maybe in the future
we can fix that.
 2021-05-11 04:15:59 -07:00
Illia Denysenko
3cd279df3d Refactor i18n analysis code and improve UX of testing binary 2021-05-10 22:13:00 +00:00
Marcel Märtens
869a922b2d Add Quin support, as this is not yet very much tested it needs to be activated in the settings of SERVER and CLIENT. 
Server:
 provide a certificate file and key file via the settings. When provided it will then listen on TCP and QUIC, if not provided it will be TCP only.
 The certificate must be known by the client, so you might get problems with self-signed certificates.
 ```ron
 quic_files: Some((
     cert: "/home/user/veloren_cert.pem",
     key: "/home/user/veloren_key.key",
 )),
 ```

Client:
 activate the voxygen settin `use_quic: true` to try to connect to the quic backend of a server.
 2021-05-10 12:59:13 +02:00
Joshua Yanovski
3f8d2f95be Added non-admin moderators and timed bans. 
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
 2021-05-09 21:19:16 -07:00
juliancoffee
d2cba0f4e5 remove ssh feature from git2 2021-05-10 00:49:45 +03:00
juliancoffee
6cfd9c24b3 Downgrade git2 to compile on windows 2021-05-10 00:09:33 +03:00
juliancoffee
5bd4dcc167 Extract common/src/assets.rs to own crate 
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
 2021-05-09 13:12:26 +03:00
juliancoffee
696136fffc Use hashbrown 2021-05-09 13:12:26 +03:00
juliancoffee
53314e8961 Remove unused dependencies 2021-05-09 13:12:26 +03:00
juliancoffee
333754b2e6 Extract voxygen/src/i18n.rs into own crate 
- New crate (i18n), currently under voxygen directory
- Updated CI to run localization test from i18n, not from voxygen
 2021-05-09 13:12:26 +03:00
juliancoffee
b4bd196837 use hashbrown instead of std::collections 2021-05-09 13:12:26 +03:00
juliancoffee
6bc6f6bbba Extract localization test to binary 
- Implement `--all` option
- Implement `--lang <code>` option
- Implement `--verify` command
 2021-05-09 13:12:25 +03:00
Marcel Märtens
87cf347377 limit tokio threads to 1/4 of num_cpus 
make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
 2021-05-04 21:06:11 +02:00
Marcel Märtens
9fefdcbbca rayon::join creates a global threadpool, which is only used in /world 
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
 2021-05-04 21:06:07 +02:00
Samuel Keiffer
101fb498a5 Merge branch 'sam/minotaur' into 'master' 
Overhauled Minotaur

See merge request veloren/veloren!2193
 2021-05-04 16:26:08 +00:00
Sam
344e8c8a67 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Marcel Märtens
059765bd0c fix error handling in networking and switch to hashbrown, fixing #1118 2021-05-04 15:29:42 +02:00
Marcel
f53c7bdfaa Merge branch 'xMAC94x/quic' into 'master' 
Cleanup network, remove some unwraps, add experimental (disabled) Quic support

See merge request veloren/veloren!2221
 2021-05-04 00:16:05 +00:00
Avi Weinstock
d858c629ce Optimize CompressedData with Vec::with_capacity, and move obsolete formats from common_net into the compression benchmark. 2021-05-03 00:09:24 -04:00