Ben Wallis b0e899de45 Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui

2021-06-14 21:31:42 +01:00

..

assets

Change the version number to 0.10

2021-06-12 10:14:07 +02:00

base

Merge branch 'juliancoffee/asset_entity' into 'master'

2021-06-14 12:56:28 +00:00

benches

use criterion groups and fix tracing to much on wgpu

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

ecs

Change the version number to 0.10

2021-06-12 10:14:07 +02:00

frontend

merge from master

2021-06-14 21:31:28 +01:00

net

Change the version number to 0.10

2021-06-12 10:14:07 +02:00

src

Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui

2021-06-14 21:31:42 +01:00

state

Change the version number to 0.10

2021-06-12 10:14:07 +02:00

systems

Merge branch 'aweinstock/forcemove-no-pushback' into 'master'

2021-06-14 14:42:01 +00:00

build.rs

fix and improve nix build: actually output a proper veloren voxygen package now

2020-11-25 02:00:50 +03:00

Cargo.toml

Change the version number to 0.10

2021-06-12 10:14:07 +02:00