Auto merge of #85 - indiv0:chore-various-fixes, r=indiv0

Various Fixes
indiv0 · May 16, 2016 · f4b72a9 · f4b72a9
2 parents 533dfe8 + eb22a95
commit f4b72a9
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 14 deletions.
diff --git a/.clog.toml b/.clog.toml
@@ -8,3 +8,4 @@ Performance = ["perf"]
 Improvements = ["impr", "im", "imp"]
 Documentation = ["docs"]
 Examples = ["examples"]
+"Bug Fixes" = ["bug", "bugs"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,12 @@
-<a name="v0.2.0"></a>
-##  (2016-05-15)
+<a name="v0.1.0"></a>
+## v0.1.0 (2016-05-16)
 
 
-#### Documentation
-
-* **README:**  update `README.md` ([07cd376b](https://github.com/indiv0/colonize/commit/07cd376b496ac9c3299426e238c4ba6117d26284))
+#### Bug Fixes
 
-#### Breaking Changes
-
-*   implement partially backend-agnostic rendering ([5acfcd49](https://github.com/indiv0/colonize/commit/5acfcd4933e765f85d7da5cae71c2ffcd612c071), closes [#22](https://github.com/indiv0/colonize/issues/22), breaks [#](https://github.com/indiv0/colonize/issues/))
+*   fix struct deserialization ([eb38933a](https://github.com/indiv0/colonize/commit/eb38933ad4703dc470f006632de0a17e7a39955a))
+*   fix compilation on stable ([4d135c35](https://github.com/indiv0/colonize/commit/4d135c359f9518d072d8b8081a5aa6b75331aaee))
+* **Camera:**  fix initial `Camera` position ([abbf5643](https://github.com/indiv0/colonize/commit/abbf56431b5d44672a6d81307cea90ac9115c47f), closes [#82](https://github.com/indiv0/colonize/issues/82))
 
 #### Features
 
@@ -25,5 +23,20 @@
 * **Localization:**  remove unnecessary pub ([7036912b](https://github.com/indiv0/colonize/commit/7036912b1c416ea51020105c68581ee31dccd07f))
 * **macro:**  remove unused macro arg ([e5224b80](https://github.com/indiv0/colonize/commit/e5224b80ff6da35873d6a949db69fa102ab796af))
 
+#### Breaking Changes
+
+*   implement partially backend-agnostic rendering ([5acfcd49](https://github.com/indiv0/colonize/commit/5acfcd4933e765f85d7da5cae71c2ffcd612c071), closes [#22](https://github.com/indiv0/colonize/issues/22), breaks [#](https://github.com/indiv0/colonize/issues/))
 
+#### Documentation
 
+* **CONTRIBUTING.md:**  add `CONTRIBUTING.md` ([311f79ac](https://github.com/indiv0/colonize/commit/311f79ac80fccb9b4891e761e689d9cdec6ac084), closes [#72](https://github.com/indiv0/colonize/issues/72))
+* **CONTRIBUTORS.md:**  add `CONTRIBUTORS.md` ([0b5cd45c](https://github.com/indiv0/colonize/commit/0b5cd45cc824edfe5bf6d635dc123cc39b2fd6c6), closes [#73](https://github.com/indiv0/colonize/issues/73))
+* **Cargo.toml:**  update `Cargo.toml` files ([8e6dcdb9](https://github.com/indiv0/colonize/commit/8e6dcdb91bdf32ff7d750d9d361cc6e7d9d543e1), closes [#76](https://github.com/indiv0/colonize/issues/76))
+* **LICENSE:**  replace LICENSE ([f5d21499](https://github.com/indiv0/colonize/commit/f5d21499743376c13a6790ef3e2fec6e2e1e65c3), closes [#74](https://github.com/indiv0/colonize/issues/74))
+* **README:**
+  *  replace out-dated `Config` info ([b7bb4c5b](https://github.com/indiv0/colonize/commit/b7bb4c5b05f5b5e97eced4bebca26e1939a60cbb), closes [#83](https://github.com/indiv0/colonize/issues/83))
+  *  add platforms & toolchains info ([956272f3](https://github.com/indiv0/colonize/commit/956272f3e1eb984e7170f872677ecba2dc4a65a5), closes [#75](https://github.com/indiv0/colonize/issues/75))
+  *  replace Crates.io badges ([7925364c](https://github.com/indiv0/colonize/commit/7925364c63f9a4d06e18f3054702027cd12e071d))
+  *  add in-game screenshot ([19c5c7f0](https://github.com/indiv0/colonize/commit/19c5c7f0481aa861d67119d47a4452027ddc961d), closes [#61](https://github.com/indiv0/colonize/issues/61))
+  *  add CHANGELOG notice ([972d7f5b](https://github.com/indiv0/colonize/commit/972d7f5b402614309e3119681fa736c4226bdd05))
+  *  update `README.md` ([07cd376b](https://github.com/indiv0/colonize/commit/07cd376b496ac9c3299426e238c4ba6117d26284))
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ name = "colonize"
 version = "0.1.0"
 authors = ["Nikita Pekin <contact@nikitapek.in>"]
 description = "A Dwarf Fortress/Rimworld-like game written in Rust"
-respository = "https://github.com/indiv0/colonize"
+repository = "https://github.com/indiv0/colonize"
 readme = "README.md"
 keywords = [
     "colonize",

diff --git a/README.md b/README.md
@@ -158,7 +158,7 @@ cargo run --no-default-features --features nightly
 ## Configuration
 
 Currently, the `Config` struct holds all the configurable values for Colonize.
-The struct is generated at compile time via a macro.
+This struct and further information on its usage can be found [here][config.in.rs].
 
 When running Colonize, the game first attempts to load the configuration from a
 `colonize.json` file in the game's directory. If no such file is found, it falls
@@ -189,6 +189,7 @@ The list of contributors to this project can be found at
 
 [changelog]: https://github.com/indiv0/colonize/blob/master/CHANGELOG.md
 [colonize-json-example]: https://github.com/indiv0/colonize/blob/master/colonize.json.example "Example configuration"
+[config.in.rs]: https://github.com/indiv0/colonize/blob/master/src/config.in.rs "config.in.rs"
 [contributing]: https://github.com/indiv0/colonize/blob/master/CONTRIBUTING.md "Contribution guide"
 [contributors]: https://github.com/indiv0/colonize/blob/master/CONTRIBUTORS.md "List of contributors"
 [latest-release]: https://github.com/indiv0/colonize/releases/latest "Latest release"

diff --git a/framework/Cargo.toml b/framework/Cargo.toml
@@ -4,7 +4,7 @@ name = "rgframework"
 version = "0.0.1"
 authors = ["Nikita Pekin <contact@nikitapek.in>"]
 description = "A game development framework built around Piston"
-respository = "https://github.com/indiv0/colonize"
+repository = "https://github.com/indiv0/colonize"
 keywords = [
     "game",
     "development",

diff --git a/src/scene/game_scene.rs b/src/scene/game_scene.rs
@@ -31,6 +31,7 @@ use localization::Localization;
 use scene::MenuScene;
 use textures::TextureType;
 
+const CAMERA_INITIAL_POSITION: Point3<i32> = Point3 { x: 0, y: 15, z: 1};
 const CAMERA_MOVEMENT_SPEED: Vector3<i32> = Vector3 { x: 1, y: 1, z: 1 };
 const CURSOR_COLOR: [f32; 4] = [1.0, 0.0, 0.0, 1.0];
 const CURSOR_SIZE: f64 = 16.0;
@@ -77,7 +78,7 @@ impl<B> GameScene<B>
             world: World::new(None, config.initial_world_size),
             config: config,
             bounds: bounds,
-            camera: Camera::new(CAMERA_MOVEMENT_SPEED, Point3::origin()),
+            camera: Camera::new(CAMERA_MOVEMENT_SPEED, CAMERA_INITIAL_POSITION),
             cursor: cursor,
             textures: textures,
         }

diff --git a/utility/Cargo.toml b/utility/Cargo.toml
@@ -4,7 +4,7 @@ name = "colonize_utility"
 version = "0.0.1"
 authors = ["Nikita Pekin <contact@nikitapek.in>"]
 description = "A utility library built for the game Colonize"
-respository = "https://github.com/indiv0/colonize"
+repository = "https://github.com/indiv0/colonize"
 keywords = [
     "game",
     "colonize",

diff --git a/world/Cargo.toml b/world/Cargo.toml
@@ -4,7 +4,7 @@ name = "colonize_world"
 version = "0.0.1"
 authors = ["Nikita Pekin <contact@nikitapek.in>"]
 description = "A library for representing the internal game state for Colonize"
-respository = "https://github.com/indiv0/colonize"
+repository = "https://github.com/indiv0/colonize"
 keywords = [
     "game",
     "state",