Marcel 5da8c70f48 Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master' ...

Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.

See merge request veloren/veloren!2542

2021-07-04 17:23:53 +00:00

..

assets

Run asset_tweak tests separately

2021-07-04 19:31:57 +03:00

base

Fix span macros by putting cfgs outside the macro (they are evaluated in the crate where the macro is used), add shorthand for common case of prof_span macro, add some spans to the client code and spiff bits of it

2021-06-19 04:27:50 -04:00

benches

use criterion groups and fix tracing to much on wgpu

2021-06-03 22:37:17 +02:00

ecs

Remove tracy features that are no longer needed now that macros have been fixed

2021-06-19 04:27:50 -04:00

frontend

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.

2021-07-04 09:47:18 +00:00

net

Merge branch 'aweinstock/networktracy' into 'master'

2021-07-03 05:44:30 +00:00

src

Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master'

2021-07-04 17:23:53 +00:00

state

Remove tracy features that are no longer needed now that macros have been fixed

2021-06-19 04:27:50 -04:00

systems

Fix underwater campfires.

2021-06-30 18:36:43 -04:00

build.rs

use bg_main.jpg instead of bg_main.png

2021-06-18 20:41:18 +03:00

Cargo.toml

Remove tracy features that are no longer needed now that macros have been fixed

2021-06-19 04:27:50 -04:00