.gitignore

@@ -1,4 +1,6 @@
 target
+assets/tmp
+assets/external
 *.blend1
 extra
 outfly_v*

Cargo.toml

@@ -18,7 +18,7 @@ categories = ["game", "aerospace", "simulation"]
 keywords = ["game", "space", "3d"]
 license = "GPL-3.0-only"
 rust-version = "1.76.0"
-build = "src/build/build.rs"
+build = "build/build.rs"
 
 [dependencies]
 regex = "1"

README.md

@@ -12,7 +12,7 @@
 
 Chapters: [Features](#features) • [Controls](#controls) • [Running OutFly](#running-outfly) • [Building](#building) • [Changelog](#changelog) • [Credits](#credits)
 
-Links: [Code](https://codeberg.org/hut/outfly) • [itch.io](https://yunicode.itch.io/outfly) • [Mastodon](https://mastodon.social/@outfly) • [Chat](https://matrix.to/#/#outfly:pub.solar)
+Links: [Code](https://codeberg.org/hut/outfly) • [itch.io](https://yunicode.itch.io/outfly) • [Mastodon](https://mastodon.gamedev.place/@outfly) • [Chat](https://matrix.to/#/#outfly:pub.solar)
 
 # OutFly
 
@@ -250,7 +250,6 @@ python -m http.server -d wasm
 - Source code: GPL Version 3.0
 - 3D models: Original art, placed under the Creative Commons CC0 License
 - Photographs of celestial bodies: By NASA, public domain
-- Icon: Creative Commons CC0 License
 - Original sound files:
     - wakeup.ogg: Creative Commons CC0 License
 - Other sound files: [Pixabay Content License](https://pixabay.com/service/license-summary)

build/build.rs

@@ -12,6 +12,6 @@ fn main() {
     let target = std::env::var("TARGET").unwrap();
     if target.contains("windows") {
         println!("cargo:warning=Embedding Windows Icon");
-        embed_resource::compile("src/build/windows/icon.rc");
+        embed_resource::compile("build/windows/icon.rc");
     }
 }

build/linux/install.sh

@@ -13,5 +13,5 @@
 
 rootdir="${1:-}"
 install -Dm755 "target/release/outfly" "$rootdir/usr/bin/outfly"
-install -Dm644 "src/build/linux/outfly.png" "$rootdir/usr/share/pixmaps/outfly.png"
-install -Dm644 "src/build/linux/outfly.desktop" "$rootdir/usr/share/applications/outfly.desktop"
+install -Dm644 "build/linux/outfly.png" "$rootdir/usr/share/pixmaps/outfly.png"
+install -Dm644 "build/linux/outfly.desktop" "$rootdir/usr/share/applications/outfly.desktop"

build/pack.sh

@@ -10,7 +10,7 @@
 #  +   ▀████████████████████████████████████████████████████▀
 #
 # A script to package release binaries + README.md into zip files.
-# Usage: cd outfly; src/build/pack.sh [-b]
+# Usage: cd outfly; build/pack.sh [-b]
 # Options: -b: cross-compile targets before packing
 
 set -e

src/data/keybindings.in

@@ -1,22 +1,21 @@
-Space: Slow down (or match velocity)
-AWSD/Shift/Ctrl: Movement
-R: Rotate (hold + move mouse)
-E: Interact: Talk to people, enter vehicles
-Q: Exit vehicle
-M: Map
-Tab: Toggle HUD + Augmented Reality
-Left click: Target objects [AUGMENTED REALITY ONLY]
-Right click: Zoom [AUGMENTED REALITY ONLY]
-F: 3rd person view
-Y: Rotation stabilizer
-F2: Toggle shadows
+X: Teleport to target [CHEAT]
+C: Impossibly instant stopping [CHEAT]
+Shift+V/B: Same as V/B, but a thousand times faster [CHEAT]
+V/B: Impossible acceleration forward/backward [CHEAT]
+G: Toggle god mode / cheats [CHEAT]
+M: Toggle map
+Y: Toggle rotation stabilizer
+F: Toggle 3rd person view
 F3: Toggle sound effects
 F4: Toggle music
-F7: Restart game
 F11: Toggle fullscreen
+Tab: Toggle HUD + Augmented Reality
+Right click: Zoom [AUGMENTED REALITY ONLY]
+Left click: Target objects [AUGMENTED REALITY ONLY]
 JKULIO: Mouseless camera rotation
-G: Toggle god mode + cheats [CHEAT]
-V/B: Impossible acceleration forward/backward [CHEAT]
-Shift+V/B: Same as V/B, but a thousand times faster [CHEAT]
-C: Impossibly instant stopping [CHEAT]
-X: Teleport to target [CHEAT]
+F7: Restart game
+Q: Exit vehicle
+E: Interact: Talk to people, enter vehicles
+R: Rotate (hold & move mouse)
+AWSD/Shift/Ctrl: Accelerate
+Space: Slow down (or match velocity)

src/hud.rs

@@ -647,7 +647,7 @@ fn handle_input(
     q_camera: Query<&Transform, With<Camera>>,
 ) {
     if keyboard_input.just_pressed(settings.key_help) {
-        for line in include_str!("data/keybindings.in").trim().lines().rev() {
+        for line in include_str!("data/keybindings.in").trim().split("\n") {
             log.add(line.to_string(), "".to_string(), LogLevel::Always);
         }
     }