Merge branch 'master' into infinite_fall_memory

Fix merge conflict resulting from "axii" spelling correction

4 files changed, 38 insertions, 32 deletions

diff --git a/build/rapier2d/Cargo.toml b/build/rapier2d/Cargo.toml
index ff5253b..d963079 100644
--- a/build/rapier2d/Cargo.toml
+++ b/build/rapier2d/Cargo.toml
@@ -1,7 +1,6 @@
-# Name idea: bident for 2D and trident for 3D
 [package]
 name    = "rapier2d"
-version = "0.2.0"
+version = "0.3.0"
 authors = [ "Sébastien Crozet <developer@crozet.re>" ]
 description = "2-dimensional physics engine in Rust."
 documentation = "http://docs.rs/rapier2d"
@@ -22,7 +21,7 @@ simd-nightly = [ "simba/packed_simd", "simd-is-enabled" ]
 # enabled with the "simd-stable" or "simd-nightly" feature.
 simd-is-enabled = [ ]
 wasm-bindgen = [ "instant/wasm-bindgen" ]
-serde-serialize = [ "nalgebra/serde-serialize", "ncollide2d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde", "arrayvec/serde" ]
+serde-serialize = [ "erased-serde", "nalgebra/serde-serialize", "ncollide2d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde", "arrayvec/serde" ]
 enhanced-determinism = [ "simba/libm_force", "indexmap" ]
 
 [lib]
@@ -35,18 +34,22 @@ required-features = [ "dim2" ]
 vec_map = "0.8"
 instant = { version = "0.1", features = [ "now" ]}
 num-traits = "0.2"
-nalgebra = "0.22"
-ncollide2d = "0.24"
-simba = "^0.2.1"
-approx = "0.3"
+nalgebra = "0.23"
+ncollide2d = "0.26"
+simba = "0.3"
+approx = "0.4"
 rayon = { version = "1", optional = true }
-crossbeam = "0.7"
+crossbeam = "0.8"
 generational-arena = "0.2"
 arrayvec = "0.5"
 bit-vec = "0.6"
 rustc-hash = "1"
 serde = { version = "1", features = [ "derive" ], optional = true }
+erased-serde = { version = "0.3", optional = true }
 indexmap = { version = "1", features = [ "serde-1" ], optional = true }
+downcast-rs = "1.2"
+num-derive = "0.3"
+bitflags = "1"
 
 [dev-dependencies]
 bincode = "1"
diff --git a/build/rapier3d/Cargo.toml b/build/rapier3d/Cargo.toml
index 130e5dd..f5c2fe4 100644
--- a/build/rapier3d/Cargo.toml
+++ b/build/rapier3d/Cargo.toml
@@ -1,7 +1,6 @@
-# Name idea: bident for 2D and trident for 3D
 [package]
 name    = "rapier3d"
-version = "0.2.0"
+version = "0.3.0"
 authors = [ "Sébastien Crozet <developer@crozet.re>" ]
 description = "3-dimensional physics engine in Rust."
 documentation = "http://docs.rs/rapier3d"
@@ -22,7 +21,7 @@ simd-nightly = [ "simba/packed_simd", "simd-is-enabled" ]
 # enabled with the "simd-stable" or "simd-nightly" feature.
 simd-is-enabled = [ ]
 wasm-bindgen = [ "instant/wasm-bindgen" ]
-serde-serialize = [ "nalgebra/serde-serialize", "ncollide3d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde" ]
+serde-serialize = [ "erased-serde", "nalgebra/serde-serialize", "ncollide3d/serde-serialize", "serde", "generational-arena/serde", "bit-vec/serde" ]
 enhanced-determinism = [ "simba/libm_force", "indexmap" ]
 
 [lib]
@@ -35,18 +34,22 @@ required-features = [ "dim3" ]
 vec_map = "0.8"
 instant = { version = "0.1", features = [ "now" ]}
 num-traits = "0.2"
-nalgebra = "0.22"
-ncollide3d = "0.24"
-simba = "^0.2.1"
-approx = "0.3"
+nalgebra = "0.23"
+ncollide3d = "0.26"
+simba = "0.3"
+approx = "0.4"
 rayon = { version = "1", optional = true }
-crossbeam = "0.7"
+crossbeam = "0.8"
 generational-arena = "0.2"
 arrayvec = "0.5"
 bit-vec = "0.6"
 rustc-hash = "1"
 serde = { version = "1", features = [ "derive" ], optional = true }
+erased-serde = { version = "0.3", optional = true }
 indexmap = { version = "1", features = [ "serde-1" ], optional = true }
+downcast-rs = "1.2"
+num-derive = "0.3"
+bitflags = "1"
 
 [dev-dependencies]
 bincode = "1"
diff --git a/build/rapier_testbed2d/Cargo.toml b/build/rapier_testbed2d/Cargo.toml
index eeecb2a..08c0893 100644
--- a/build/rapier_testbed2d/Cargo.toml
+++ b/build/rapier_testbed2d/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "rapier_testbed2d"
-version = "0.2.0"
+version = "0.3.0"
 authors = [ "Sébastien Crozet <developer@crozet.re>" ]
 description = "Testbed for the 2-dimensional physics engine in Rust."
 homepage = "http://rapier.org"
@@ -23,17 +23,17 @@ other-backends = [ "wrapped2d", "nphysics2d" ]
 
 
 [dependencies]
-nalgebra   = "0.22"
-kiss3d     = { version = "0.25", features = [ "conrod" ] }
+nalgebra   = "0.23"
+kiss3d     = { version = "0.27", features = [ "conrod" ] }
 rand       = "0.7"
 rand_pcg   = "0.2"
 instant    = { version = "0.1", features = [ "web-sys", "now" ]}
 bitflags   = "1"
 num_cpus   = { version = "1", optional = true }
 wrapped2d  = { version = "0.4", optional = true }
-ncollide2d = "0.24"
-nphysics2d = { version = "0.17", optional = true }
-crossbeam = "0.7"
+ncollide2d = "0.26"
+nphysics2d = { version = "0.18", optional = true }
+crossbeam = "0.8"
 bincode = "1"
 flexbuffers = "0.1"
 Inflector  = "0.11"
@@ -42,5 +42,5 @@ md5 = "0.7"
 
 [dependencies.rapier2d]
 path = "../rapier2d"
-version = "0.2"
+version = "0.3"
 features = [ "serde-serialize" ]
diff --git a/build/rapier_testbed3d/Cargo.toml b/build/rapier_testbed3d/Cargo.toml
index 7675701..7fa01d7 100644
--- a/build/rapier_testbed3d/Cargo.toml
+++ b/build/rapier_testbed3d/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "rapier_testbed3d"
-version = "0.2.0"
+version = "0.3.0"
 authors = [ "Sébastien Crozet <developer@crozet.re>" ]
 description = "Testbed for the 3-dimensional physics engine in Rust."
 homepage = "http://rapier.org"
@@ -22,19 +22,19 @@ parallel = [ "rapier3d/parallel", "num_cpus" ]
 other-backends = [ "physx", "physx-sys", "glam", "nphysics3d" ]
 
 [dependencies]
-nalgebra   = "0.22"
-kiss3d     = { version = "0.25", features = [ "conrod" ] }
+nalgebra   = "0.23"
+kiss3d     = { version = "0.27", features = [ "conrod" ] }
 rand       = "0.7"
 rand_pcg   = "0.2"
 instant    = { version = "0.1", features = [ "web-sys", "now" ]}
 bitflags   = "1"
-glam       = { version = "0.8", optional = true }
+glam       = { version = "0.9", optional = true }
 num_cpus   = { version = "1", optional = true }
-ncollide3d = "0.24"
-nphysics3d = { version = "0.17", optional = true }
-physx      = { version = "0.6", optional = true }
+ncollide3d = "0.26"
+nphysics3d = { version = "0.18", optional = true }
+physx      = { version = "0.7", optional = true }
 physx-sys = { version = "0.4", optional = true }
-crossbeam = "0.7"
+crossbeam = "0.8"
 bincode = "1"
 flexbuffers = "0.1"
 serde_cbor = "0.11"
@@ -44,5 +44,5 @@ serde = { version = "1", features = [ "derive" ] }
 
 [dependencies.rapier3d]
 path = "../rapier3d"
-version = "0.2"
+version = "0.3"
 features = [ "serde-serialize" ]