From fa0c47c9fb422e333601b99c545f28d3bde61816 Mon Sep 17 00:00:00 2001 From: Corentin Date: Sun, 18 Feb 2024 18:12:38 +0000 Subject: [PATCH 1/2] Fix the error in the distance calculation function (#58) Reviewed-on: https://git.tipragot.fr/corentin/border-wars/pulls/58 Reviewed-by: Tipragot --- crates/border-wars/src/map/hex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/border-wars/src/map/hex.rs b/crates/border-wars/src/map/hex.rs index 5410eff..f94e292 100644 --- a/crates/border-wars/src/map/hex.rs +++ b/crates/border-wars/src/map/hex.rs @@ -256,7 +256,7 @@ impl HexPosition { size.0 * 3f32 .sqrt() - .mul_add(T::to_f32(self.0), 3f32.sqrt() / 2.0 * T::to_f32(self.0)), + .mul_add(T::to_f32(self.0), 3f32.sqrt() / 2.0 * T::to_f32(self.1)), size.1 * (3.0 / 2.0 * T::to_f32(self.1)), ) } From 46ed463f41c170c2c357974acf4576edd4117382 Mon Sep 17 00:00:00 2001 From: Racloody Date: Wed, 21 Feb 2024 16:51:23 +0000 Subject: [PATCH 2/2] Unify languages in readme (#59) Translate "Compositeur" with "Composer" Reviewed-on: https://git.tipragot.fr/corentin/border-wars/pulls/59 Reviewed-by: Tipragot Co-authored-by: Racloody Co-committed-by: Racloody --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e90e662..38e5d2f 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Our team consists of : - [CoCo_Sol](https://github.com/cocosol007): Owner of this project and the main developper - [Raphaƫl](https://git.tipragot.fr/raphael): Owner of this project and game designer - [Tipragot](https://git.tipragot.fr/tipragot): Main reviewer -- [Arthur](https://www.instagram.com/tuturdu32): Compositeur +- [Arthur](https://www.instagram.com/tuturdu32): Composer - [Racloody](https://linktr.ee/racloody): Sound designer and chief communications officer - [Horoleysh](https://instagram.com/horoleysh): Artist