Skip to content
This repository has been archived by the owner on Apr 18, 2022. It is now read-only.

Commit

Permalink
Merge #1239
Browse files Browse the repository at this point in the history
1239: Move changelog entry to right position r=azriel91,Xaeroxe a=udoprog

This entry was added to the wrong position in the changelog.

Co-authored-by: John-John Tedro <udoprog@tedro.se>
  • Loading branch information
bors[bot] and udoprog committed Dec 12, 2018
2 parents ec7785b + c2a87e0 commit 45fe5d0
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,22 @@ The format is based on [Keep a Changelog][kc], and this project adheres to

### Added

* Introduce `application_dir` utility ([#1213])

### Changed

* Make `application_root_dir` return a `Result<Path>` instead of a `String` ([#1213])

### Removed

### Fixed

[#1213]: https://github.com/amethyst/amethyst/pull/1213

## [0.10.0] - 2018-12

### Added

* Introduce `application_dir` utility ([#1213])
* Derive PrefabData for CameraOrtho component ([#1188])
* Partially migrate the project to Rust 2018. Full migration will be completed at some point after 2019-01-31 ([#1098])
* `SystemExt::pausable` for better ergonomics when pausing systems for specific states ([#1146]).
Expand All @@ -42,7 +47,6 @@ The format is based on [Keep a Changelog][kc], and this project adheres to

### Changed

* Make `application_root_dir` return a `Result<Path>` instead of a `String` ([#1213])
* Minimum Rust version is now `1.31.0` &ndash; Rust 2018. ([#1224])
* `Transform::look_at` renamed to `Transform::face_towards` and behavior fixed. ([#1142])
* `Material` animations now directly use `Handle<Texture>` instead of using indirection. ([#1089])
Expand Down Expand Up @@ -70,7 +74,6 @@ The format is based on [Keep a Changelog][kc], and this project adheres to

* `SpriteSheetFormat` converts pixel coordinates to texture coordinates on load. ([#1181])

[#1213]: https://github.com/amethyst/amethyst/pull/1213
[#1146]: https://github.com/amethyst/amethyst/pull/1146
[#1144]: https://github.com/amethyst/amethyst/pull/1144
[#1000]: https://github.com/amethyst/amethyst/pull/1000
Expand Down

0 comments on commit 45fe5d0

Please sign in to comment.