473 Commits

Author SHA1 Message Date
Marcel Märtens
cfe3a027be remove some reexports 2021-07-29 22:18:34 +02:00
Joshua Barretto
1df81360ab Properly fixed command parsing 2021-07-23 17:33:31 +01:00
schnippl0r
1ba8b8c4d3 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
2a14509640 Update wasmer 2021-07-10 15:06:51 +02:00
Marcel Märtens
e2e1f15cff update depednencies 2021-07-08 12:21:02 +02:00
Joshua Barretto
15200d48df Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
This reverts merge request 
2021-07-07 22:07:00 +00:00
Ben Wallis
1f100cd3ea Updated wgpu to 0.9.0 and egui to 0.13.0 2021-07-06 07:32:27 +01:00
Ben Wallis
9464a45783 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
88a0048d21 Merge branch 'juliancoffee/merchants_ux' into 'master'
Improve Merchant loadout from UX perspective

See merge request 
2021-07-03 20:25:49 +00:00
juliancoffee
4a10800de8 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
43bc40c7d5 Fix - Add a test that all the .ron manifests parse 2021-07-03 18:11:04 +00:00
Avi Weinstock
058a832d37 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
Avi Weinstock
7b0dcad68f Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00
Avi Weinstock
b04e820bc4 Add block statistics generator to world/examples. 2021-06-28 15:02:57 -04:00
juliancoffee
1609748009 update Cargo.lock 2021-06-28 16:02:31 +03:00
Benoît du Garreau
ab3c8cf764 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Imbris
3e9c3a20e0 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
e2f558dacd Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
Imbris
bf6f624c7f Upgrade to winit 0.25 2021-06-15 22:59:54 -04:00
Imbris
36821e5575 Merge branch 'capucho/wgpu-format-fixes' into 'master'
Update wgpu and check for best swap chain format

See merge request 
2021-06-16 01:24:05 +00:00
asumface
a63e839bfa
Bump rodio to 0.14 2021-06-14 22:04:23 +02:00
Marcel Märtens
d291a71f79 Change the version number to 0.10 2021-06-12 10:14:07 +02:00
João Capucho
40904130f6
Update wgpu and check for best swap chain format 2021-06-09 21:15:37 +01:00
Avi Weinstock
22ac7745b2 Add graphviz diagram generator for crafting recipes. 2021-06-08 14:42:51 -04:00
juliancoffee
7eacee7a85 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
beeea5830b 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
4c29484f22 switch to hashbrown 0.11 and specs 0.16.2 2021-06-07 13:01:01 +02:00
Sam
d7a7e01f16 Fixed csv tools 2021-06-07 10:58:47 +02:00
Marcel Märtens
e33bd39f34 update dependencies 2021-06-04 09:44:30 +02:00
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 
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