Marcel Märtens
7200cc4ad7
undo egui upgrade try
2021-11-20 20:18:03 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Jon Nettleton
836c948086
Update crate for keyboard-keynames
...
This revision includes a fix for supporting Aarch64 platforms
Signed-off-by: Jon Nettleton <jon@solid-run.com>
(cherry picked from commit a5e64af199
2021-11-02 08:49:17 +00:00
Joshua Barretto
5c0026f4a7
Performance improvements for terrain watcher
2021-10-10 13:41:56 +01:00
Imbris
645bd03142
Make sure ui draw commands are cleared if the renderer's resolution changes
2021-10-04 18:58:28 -04:00
Imbris
bb26008074
Remove explicit coreaudio-sys version since we no longer rely on having the older version pinned (in fact it was already updated to the latest version)
2021-10-04 11:15:26 -04:00
Benoît du Garreau
ef1c51332d
Update assets_manager to 0.6.0
2021-10-01 21:13:01 +02:00
juliancoffee
8af4cf1a37
Make Rtsim entity config work
2021-09-27 15:09:22 +03:00
Marcel Märtens
2a82405df2
update toolchain to nightly-2021-09-24
2021-09-24 23:18:07 +02:00
Marcel Märtens
42eadb715b
update toolchain to nightly-2021-09-24
2021-09-24 23:17:54 +02:00
Imbris
f1c44e1f1d
Remove old textures that aren't reused when calling replace_graphic
2021-09-23 21:50:37 -04:00
Marcel Märtens
88685cc016
update crates
2021-09-20 14:39:01 +02:00
James Melkonian
9875a74640
Make RRT pathfinding a cfg feature
2021-09-17 16:01:20 -07:00
James Melkonian
c2c4429750
Disable RRT pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
7ddc229728
Initial RRT flight pathfinding
2021-09-17 16:01:19 -07:00
Marcel Märtens
7913e6a9ba
Change the version number to 0.11
2021-09-10 20:19:17 +02:00
Joshua Yanovski
5500435d2f
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0
2021-09-04 11:59:18 -07:00
Marcel Märtens
cf1a6b1806
switch to SharedLink and unset context
2021-09-02 12:29:01 +02:00
Imbris
16e2550e46
Merge branch 'capucho/naga' into 'master'
...
Replace shaderc with naga
See merge request veloren/veloren!2749
2021-08-31 22:38:17 +00:00
João Capucho
446d93dda0
Replace shaderc with naga
2021-08-31 22:53:10 +01:00
Sam
6d91bae44b
Sprite interaction now uses pathfinding to check that it can be picked up.
2021-08-31 13:37:36 -04:00
Joshua Barretto
c2498d81c7
Added feature flag for terrain persistence
2021-08-12 10:48:00 +01:00
Marcel Märtens
32e58c4b17
remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt
2021-08-11 00:38:03 +02:00
Imbris
e99a885bfe
Merge branch 'juliancoffee/asset_tweak_v2' into 'master'
...
asset_tweak v2
See merge request veloren/veloren!2723
2021-08-06 17:41:54 +00:00
Yusuf Bera Ertan
aa371147e7
build: update keyboard-keynames
2021-08-03 18:16:55 +03:00
juliancoffee
2ce09af2d8
Remove redundant serial_test crate
2021-08-03 16:31:13 +03:00
Marcel Märtens
4c0b74150d
remove some reexports
2021-07-29 22:18:34 +02:00
Joshua Barretto
0cb524d8d6
Properly fixed command parsing
2021-07-23 17:33:31 +01:00
schnippl0r
9e3b2a20d0
Moved GameInput to own module and made use of strum's EnumIter and AsRefStr.
2021-07-21 13:23:45 +02:00
Benoît du Garreau
286037166a
Update wasmer
2021-07-10 15:06:51 +02:00
Marcel Märtens
98800c5424
update depednencies
2021-07-08 12:21:02 +02:00
Joshua Barretto
ad1f6a5304
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
...
This reverts merge request !2566
2021-07-07 22:07:00 +00:00
Ben Wallis
88bb160336
Updated wgpu to 0.9.0 and egui to 0.13.0
2021-07-06 07:32:27 +01:00
Ben Wallis
b499cf2c58
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds.
...
Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph.
This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
Marcel
89b71dc9a9
Merge branch 'juliancoffee/merchants_ux' into 'master'
...
Improve Merchant loadout from UX perspective
See merge request veloren/veloren!2544
2021-07-03 20:25:49 +00:00
juliancoffee
dd2d0a98fb
Improve Merchant inventory from UX perspective
...
Changes:
- Make it use red bags with 18 slots (2 rows * 9)
- Sort items by quality
- Stack ingredients, food, potions
- Move coins to ingedients bag and put it first
- Filter unconsumed good (case when you saw 16 rugged shirts)
Refactoring:
- Split bag creation to separate functions
2021-07-03 22:16:06 +03:00
eckso
4f66bff54a
Fix #1158 - Add a test that all the .ron manifests parse
2021-07-03 18:11:04 +00:00
Avi Weinstock
f9c263faf6
Add benchmark for color quantization using the rtree crate.
2021-07-01 13:41:37 -04:00
Avi Weinstock
47b3b5e5d9
Generate palette info from block statistics, and benchmark how well it compresses.
2021-06-28 22:11:19 -04:00
Avi Weinstock
024b6c52ef
Add block statistics generator to world/examples.
2021-06-28 15:02:57 -04:00
juliancoffee
a434be594c
update Cargo.lock
2021-06-28 16:02:31 +03:00
Benoît du Garreau
1cba7db9b6
Update assets_manager to 0.5
2021-06-26 12:05:40 +02:00
Imbris
044b2316a6
Eliminate strange wait time of ~1 ms during message handling on the
...
client where nothing seemed to be occuring
2021-06-19 04:27:50 -04:00
Joshua Barretto
96cbf60c3f
Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients
2021-06-17 19:55:21 +01:00
Imbris
b7162ac15c
Upgrade to winit 0.25
2021-06-15 22:59:54 -04:00
Imbris
3e79972061
Merge branch 'capucho/wgpu-format-fixes' into 'master'
...
Update wgpu and check for best swap chain format
See merge request veloren/veloren!2454
2021-06-16 01:24:05 +00:00
asumface
8568dfb38e
Bump rodio to 0.14
2021-06-14 22:04:23 +02:00
Marcel Märtens
4167621f5d
Change the version number to 0.10
2021-06-12 10:14:07 +02:00
João Capucho
cc566abe5c
Update wgpu and check for best swap chain format
2021-06-09 21:15:37 +01:00
Avi Weinstock
b5b7de9532
Add graphviz diagram generator for crafting recipes.
2021-06-08 14:42:51 -04:00
juliancoffee
3c34301947
More tests, support only assets/tweak directory
...
- Use `serial_test` because tests can't run in parallel as both of them
are accessing fs.
- Take only filename, use hardcoded `assets/tweak` to keep it simple and
support .gitignore
2021-06-08 13:31:27 +03:00
juliancoffee
8a157b8410
New tweak_expect fn to tweak values from .ron
...
- Function to tweak values via temporary hot-reloaded .ron files
2021-06-08 13:31:27 +03:00
Marcel Märtens
7185dcee68
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 13:01:01 +02:00
Sam
fa0fe38699
Fixed csv tools
2021-06-07 10:58:47 +02:00
Marcel Märtens
1015af13d4
update dependencies
2021-06-04 09:44:30 +02:00
Imbris
6ffdad173d
Switch to using block_on directly from futures-executor instead of the umbrella crate
2021-06-03 14:28:28 -04:00
Imbris
538677263b
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-03 00:10:07 -04:00
Imbris
2b8eaae572
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-06-03 00:10:06 -04:00
Imbris
8403e4c483
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
99998b9870
Use profling to get spans from wgpu, update wpgu & its deps for various
...
fixes
2021-06-03 00:10:06 -04:00
Imbris
ffdf7012bc
Update wgpu to fix dx11 issue
2021-06-03 00:10:06 -04:00
Imbris
1647c9d607
Update wgpu to latest version and improve error formating
2021-06-03 00:10:06 -04:00
Imbris
76c7161364
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
ceaa20c668
Update wgpu
2021-06-02 23:59:50 -04:00
Imbris
7723ce265e
Update wgpu-profiler, smol rebase fix
2021-06-02 23:59:50 -04:00
Imbris
8d63446300
Almost implement instance merging for sprites (validation error), rebase
...
fix
2021-06-02 23:59:50 -04:00
João Capucho
f5dc871c59
Update to the most recent wgpu
2021-06-02 23:59:49 -04:00
Imbris
22d67d4cc1
Update to the latest wgpu git
2021-06-02 23:59:49 -04:00
Imbris
7a67ce87e7
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
8c21023500
WIP gpu timer thing (not for squashing!)
2021-06-02 23:59:49 -04:00
Capucho
8c3995298b
More fixes
2021-06-02 23:56:43 -04:00
Capucho
9ee71d6369
Finished porting all pipelines
2021-06-02 23:55:59 -04:00
Capucho
806f240eb5
Started the report of wgpu
2021-06-02 23:55:59 -04: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
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
523bf2be58
Fix memory leak in KeyedJobs threadpool helper.
2021-06-02 00:39:58 -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
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
48ebb10d50
Update toolchain
2021-05-31 20:44:57 -04:00
Avi Weinstock
3684cf0454
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
d5883e76a9
update conrod core commit to enhance highlight colors
2021-05-22 23:22:12 +02:00
Marcel
99304ffddd
Revert "Merge branch 'sharp/revert-quinn' into 'master'"
...
This reverts merge request !2315
2021-05-21 10:41:16 +02:00
Joshua Yanovski
3679cb75bc
Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
...
This reverts commit 04d8ddf25e9dcf7a9d26
2021-05-17 08:32:12 -07:00
Marcel
04d8ddf25e
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
33494c0e29
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
f626d27955
Refactor i18n analysis code and improve UX of testing binary
2021-05-10 22:13:00 +00:00
Marcel Märtens
b443e4dd31
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
e7587c4d9d
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
93b3d12478
remove ssh feature from git2
2021-05-10 00:49:45 +03:00
juliancoffee
5e598964b1
Downgrade git2 to compile on windows
2021-05-10 00:09:33 +03:00
juliancoffee
735e8ab4ec
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
911bf974f3
Use hashbrown
2021-05-09 13:12:26 +03:00
juliancoffee
89b6111064
Remove unused dependencies
2021-05-09 13:12:26 +03:00
juliancoffee
5573fc33b9
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
50e992ed0d
use hashbrown instead of std::collections
2021-05-09 13:12:26 +03:00
juliancoffee
57cddb3ee3
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
0142cf37f0
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
6e3a74b476
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
