Merge branch 'dev'

agateau · Jan 29, 2022 · f54422a · f54422a
2 parents 03084c8 + 867fa97
commit f54422a
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## 0.22.0 - 2021-01-30
+
+### Added
+
+- Five new translations:
+    - Bengali by Oymate.
+    - Chinese by Lu Xu.
+    - Polish by PandaCoderPL.
+    - Russian by Nickoriginal.
+    - Spanish by Clara Gâteau.
+
+- Keyboard keys are now configurable (#129).
+
+### Fixed
+
+- Reworked Rocket car so that it cannot get stuck on thin walls (#174).
+
+- The ambiguous "You broke a record" message has been turned into a more generic one, which shows when the player ranks 3rd or better (#139).
+
+- On Android, Pixel Wheels now uses an adaptive icon (#83).
+
+- Added a workaround for the Android 11 status bar not disappearing when switching between apps (#140).
+
+### Developers
+
+- It is now possible to define the PW_ASSETS_DIR environment variable to make Pixel Wheels uses assets directly from there instead of using the bundled assets.
+
+- Bumped Android target SDK version to 30.
+
 ## 0.21.0 - 2021-10-04
 
 ### Added

diff --git a/README.md b/README.md
@@ -31,11 +31,16 @@ If you feel adventurous, you can also try binaries from the master branch. These
 
 ## I think it would be much better if it did X, Y or Z...
 
-I have a reasonably well defined vision of what I want Pixel Wheels to be.  Your feedback and suggestions are welcome, and I will look into it with great attention, but I reserve the right to decide if your ideas fit with the game I am trying to create.
+I have a reasonably well defined vision of what I want Pixel Wheels to be. Your feedback and suggestions are welcome, and I will look into them, but I reserve the right to decide if your ideas fit with the game I am trying to create.
 
-## What if I want to build it myself?
+## Contributing
 
-The [build instructions][build] should have you covered.
+The [docs](docs/) directory contains documentation to work on Pixel Wheels.
+
+In particular:
+
+- [Adding or updating a translation](docs/translations.md)
+- [Building instructions](docs/building.md)
 
 [build]: docs/building.md
 

diff --git a/docs/building.md b/docs/building.md
@@ -35,10 +35,8 @@ Building Pixel Wheels requires the following components:
 - GNU Make: <http://www.gnu.org/software/make/>
 - Some Python packages:
     - PAFX: <https://github.com/agateau/pafx>
-    - Pillow: <https:python-pillow.github.io/>
+    - Pillow: <https://python-pillow.github.io>
     - pypng: <https://github.com/drj11/pypng>
-    - jinja2: <https://palletsprojects.com/p/jinja/>
-    - polib: <https://github.com/izimobil/polib/>
 
 #### Python packages
 

diff --git a/docs/coding-style.md b/docs/coding-style.md
@@ -2,8 +2,7 @@
 
 ## Base
 
-Pixel Wheels is based on the AOSP variant (4 space indents) of [Google Java
-coding style][coding-style].
+Pixel Wheels is based on the AOSP variant (4 space indents) of [Google Java coding style][coding-style].
 
 [coding-style]: https://google.github.io/styleguide/javaguide.html
 
@@ -63,10 +62,8 @@ drawFilledRect(12, 34, 100, 200);
 
 ## Applying the coding style
 
-You can run `tools/apply-codingstyle` to apply most of the rules to the code in
-your checkout. This tool downloads [google-java-format][gjf] in `$HOME/.cache`
-and runs it on all the Java files of the project.
+You can run `tools/apply-codingstyle` to apply most of the rules to the code in your checkout. This tool downloads [google-java-format][gjf] in `$HOME/.cache` and runs it on all the Java files of the project.
 
-Note that the CI builder checks for coding style conformance.
+The CI checks for coding style conformance.
 
 [gjf]: https://github.com/google/google-java-format
diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt
@@ -0,0 +1,5 @@
+Pixel Wheels is now translated in Bengali, Chinese, Polish, Russian and Spanish in addition to French.
+
+The status bar no longer stays visible on Android 11.
+
+Improved game icon.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,2 +1 @@
-polib==1.1.1
 fonttools==4.27.1
diff --git a/tools/installer-data/README.html b/tools/installer-data/README.html
@@ -59,6 +59,8 @@ <h3>⌨ Keyboard</h3>
   <li><kbd>Left control</kbd>: activate bonuses</li>
 </ul>
 
+<p>Keys can be configured from the Settings menu.</p>
+
 <h3>🕹 Gamepads</h3>
 
 You can configure mapping of the gamepad buttons in the configuration menu.

diff --git a/version.properties b/version.properties
@@ -1,3 +1,3 @@
 # Careful: this file is read both by Gradle and Make
-VERSION_CODE=22
-VERSION=0.21.0
+VERSION_CODE=23
+VERSION=0.22.0