Compare commits
48 commits
Author | SHA1 | Date | |
---|---|---|---|
7317f7514c | |||
173410ef4e | |||
e9dd691627 | |||
23ba11596e | |||
24db0b0e0f | |||
2d0b613df1 | |||
6115ef4aa2 | |||
8e04d74682 | |||
e5e2ccfc6b | |||
b68b160d9f | |||
d346d68aed | |||
28655cc819 | |||
ac21220dea | |||
0c9624d511 | |||
2354e34142 | |||
b9e065058f | |||
|
3816dbac77 | ||
|
84030e5b6c | ||
a6d9e088ef | |||
fa990bfadb | |||
fe6651d573 | |||
2416ffd7dc | |||
03e12d6feb | |||
d3a54938af | |||
eddeda6ba9 | |||
|
11b52f4d4a | ||
9bfa6e2669 | |||
33b301a410 | |||
|
1275b92a5b | ||
bb37f613ad | |||
|
1c897d6712 | ||
dadc5d59db | |||
ff743e97b8 | |||
|
c1474c51e5 | ||
|
74652f1191 | ||
9c8a399b38 | |||
e03cd06c78 | |||
b98bc61a02 | |||
8143a99843 | |||
5a4451d6a7 | |||
576b21d8b9 | |||
c957799a81 | |||
6f77fb9008 | |||
e0b6a40fcc | |||
566310810c | |||
e83ec5ce20 | |||
96e3f6982e | |||
c27691540a |
69
.forgejo/workflows/rust.yml
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
name: Rust
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
rustfmt:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: https://github.com/dtolnay/rust-toolchain@nightly
|
||||||
|
with:
|
||||||
|
components: rustfmt
|
||||||
|
- run: cargo fmt --all -- --check
|
||||||
|
|
||||||
|
clippy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends \
|
||||||
|
g++ pkg-config libx11-dev libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: https://github.com/dtolnay/rust-toolchain@1.79.0
|
||||||
|
id: rust-toolchain
|
||||||
|
with:
|
||||||
|
components: clippy
|
||||||
|
- uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.cargo/git
|
||||||
|
~/.cargo/registry
|
||||||
|
target
|
||||||
|
key: "${{runner.os}} Rust+Clippy ${{steps.rust-toolchain.outputs.cachekey}}"
|
||||||
|
- run: cargo clippy --locked --all-targets -- -D warnings
|
||||||
|
env:
|
||||||
|
RUSTFLAGS: "-D warnings"
|
||||||
|
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends \
|
||||||
|
g++ pkg-config libx11-dev libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: https://github.com/dtolnay/rust-toolchain@stable
|
||||||
|
id: rust-toolchain
|
||||||
|
- uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.cargo/git
|
||||||
|
~/.cargo/registry
|
||||||
|
target
|
||||||
|
key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}"
|
||||||
|
- run: mkdir .ci-destdir
|
||||||
|
- run: cargo install --path . --locked --root .
|
||||||
|
- run: find .ci-destdir
|
||||||
|
- uses: forgejo/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: Powercreep
|
||||||
|
path: |
|
||||||
|
bin
|
||||||
|
assets
|
2
.gitignore
vendored
|
@ -1 +1,3 @@
|
||||||
/target
|
/target
|
||||||
|
*.nix
|
||||||
|
.vscode/
|
3203
Cargo.lock
generated
22
Cargo.toml
|
@ -1,14 +1,13 @@
|
||||||
[package]
|
[package]
|
||||||
name = "game-jame"
|
name = "powercreep"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
publish = false
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
repository = "https://msrd0.dev/spielemarmelade/turtlegame"
|
||||||
|
description = "turtlegame - the game from the turtleteam :)"
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
|
|
||||||
# Enable a small amount of optimization in debug mode
|
|
||||||
[profile.dev]
|
|
||||||
# opt-level = 1
|
# opt-level = 1
|
||||||
|
|
||||||
# Enable high optimizations for dependencies (incl. Bevy), but not for our code:
|
# Enable high optimizations for dependencies (incl. Bevy), but not for our code:
|
||||||
|
@ -16,4 +15,15 @@ resolver = "2"
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy = "0.14.0"
|
comfy = { version = "0.4.0", features = ["wayland"] }
|
||||||
|
indexmap = "2"
|
||||||
|
log = "0.4.22"
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
heck = "0.5"
|
||||||
|
resvg = "0.42"
|
||||||
|
|
||||||
|
[patch.crates-io]
|
||||||
|
# https://github.com/darthdeus/comfy/issues/101
|
||||||
|
# https://github.com/darthdeus/comfy/pull/102
|
||||||
|
comfy = { git = "https://github.com/Plonq/comfy/", branch = "101-fix-keyboard-events" }
|
||||||
|
|
BIN
assets/entities/ghost.png
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
assets/entities/human.png
Normal file
After Width: | Height: | Size: 28 KiB |
BIN
assets/entities/human_captured.png
Normal file
After Width: | Height: | Size: 30 KiB |
BIN
assets/entities/human_overworld.png
Normal file
After Width: | Height: | Size: 16 KiB |
BIN
assets/furniture/bedroom/ac.png
Normal file
After Width: | Height: | Size: 6.2 KiB |
BIN
assets/furniture/bedroom/bed.png
Normal file
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/furniture/bedroom/bookshelf.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
BIN
assets/furniture/bedroom/couch.png
Normal file
After Width: | Height: | Size: 8 KiB |
BIN
assets/furniture/bedroom/cupboard.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
assets/furniture/bedroom/display_off.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
assets/furniture/bedroom/display_on.png
Normal file
After Width: | Height: | Size: 6.6 KiB |
BIN
assets/furniture/bedroom/drawer.png
Normal file
After Width: | Height: | Size: 6.2 KiB |
BIN
assets/furniture/bedroom/elec/ac.png
Normal file
After Width: | Height: | Size: 4.8 KiB |
BIN
assets/furniture/bedroom/elec/display_off.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/furniture/bedroom/elec/display_on.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/furniture/bedroom/elec/keyboard.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/elec/laptop_off.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/bedroom/elec/laptop_on.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/bedroom/elec/mini_ac.png
Normal file
After Width: | Height: | Size: 4.9 KiB |
BIN
assets/furniture/bedroom/elec/mouse.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/elec/nightlight.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/furniture/bedroom/elec/pc.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/bedroom/elec/phone.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/elec/receiver.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/bedroom/elec/tv.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/furniture/bedroom/elec/window_ac.png
Normal file
After Width: | Height: | Size: 5.4 KiB |
BIN
assets/furniture/bedroom/keyboard.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/laptop_off.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
assets/furniture/bedroom/laptop_on.png
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/furniture/bedroom/metal/ac.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
assets/furniture/bedroom/metal/bed.png
Normal file
After Width: | Height: | Size: 6 KiB |
BIN
assets/furniture/bedroom/metal/cupboard.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
assets/furniture/bedroom/metal/display_off.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/bedroom/metal/display_on.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/bedroom/metal/drawer.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
assets/furniture/bedroom/metal/keyboard.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/metal/laptop_off.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
assets/furniture/bedroom/metal/laptop_on.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
assets/furniture/bedroom/metal/mini_ac.png
Normal file
After Width: | Height: | Size: 6 KiB |
BIN
assets/furniture/bedroom/metal/mouse.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/furniture/bedroom/metal/nightlight.png
Normal file
After Width: | Height: | Size: 5 KiB |
BIN
assets/furniture/bedroom/metal/nightstand.png
Normal file
After Width: | Height: | Size: 4.8 KiB |
BIN
assets/furniture/bedroom/metal/pc.png
Normal file
After Width: | Height: | Size: 4.9 KiB |
BIN
assets/furniture/bedroom/metal/phone.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/metal/receiver.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/furniture/bedroom/metal/tv.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/furniture/bedroom/metal/wardrobe.png
Normal file
After Width: | Height: | Size: 7 KiB |
BIN
assets/furniture/bedroom/metal/window_ac.png
Normal file
After Width: | Height: | Size: 6.2 KiB |
BIN
assets/furniture/bedroom/mini_ac.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
assets/furniture/bedroom/mouse.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
assets/furniture/bedroom/nightlight.png
Normal file
After Width: | Height: | Size: 6.2 KiB |
BIN
assets/furniture/bedroom/nightstand.png
Normal file
After Width: | Height: | Size: 5.4 KiB |
BIN
assets/furniture/bedroom/pc.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/furniture/bedroom/phone.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
assets/furniture/bedroom/receiver.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/furniture/bedroom/tv.png
Normal file
After Width: | Height: | Size: 4.9 KiB |
BIN
assets/furniture/bedroom/tv_stand.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/furniture/bedroom/wardrobe.png
Normal file
After Width: | Height: | Size: 7.9 KiB |
BIN
assets/furniture/bedroom/window.png
Normal file
After Width: | Height: | Size: 9.4 KiB |
BIN
assets/furniture/bedroom/window_ac.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
assets/furniture/blender.png
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/furniture/cupboard.png
Normal file
After Width: | Height: | Size: 338 KiB |
BIN
assets/furniture/dishwasher.png
Normal file
After Width: | Height: | Size: 5.9 KiB |
BIN
assets/furniture/drawer.png
Normal file
After Width: | Height: | Size: 338 KiB |
BIN
assets/furniture/drawer_cupboard.png
Normal file
After Width: | Height: | Size: 6.3 KiB |
BIN
assets/furniture/dryer.png
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
assets/furniture/elec/blender.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/furniture/elec/dishwasher.png
Normal file
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/furniture/elec/dryer.png
Normal file
After Width: | Height: | Size: 7.4 KiB |
BIN
assets/furniture/elec/fridge.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
assets/furniture/elec/kettle.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/furniture/elec/minifridge.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
assets/furniture/elec/oven.png
Normal file
After Width: | Height: | Size: 5 KiB |
BIN
assets/furniture/elec/stove.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/elec/toaster.png
Normal file
After Width: | Height: | Size: 126 KiB |
BIN
assets/furniture/elec/washing_machine.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
assets/furniture/fridge.png
Normal file
After Width: | Height: | Size: 14 KiB |
BIN
assets/furniture/hanging_cupboard.png
Normal file
After Width: | Height: | Size: 298 KiB |
BIN
assets/furniture/kettle.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
assets/furniture/kitchen/blender.png
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
assets/furniture/kitchen/cupboard.png
Normal file
After Width: | Height: | Size: 338 KiB |
BIN
assets/furniture/kitchen/dishwasher.png
Normal file
After Width: | Height: | Size: 5.9 KiB |
BIN
assets/furniture/kitchen/drawer.png
Normal file
After Width: | Height: | Size: 338 KiB |
BIN
assets/furniture/kitchen/drawer_cupboard.png
Normal file
After Width: | Height: | Size: 6.3 KiB |
BIN
assets/furniture/kitchen/dryer.png
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
assets/furniture/kitchen/elec/blender.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/furniture/kitchen/elec/dishwasher.png
Normal file
After Width: | Height: | Size: 5.3 KiB |
BIN
assets/furniture/kitchen/elec/dryer.png
Normal file
After Width: | Height: | Size: 7.4 KiB |
BIN
assets/furniture/kitchen/elec/fridge.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
assets/furniture/kitchen/elec/kettle.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/furniture/kitchen/elec/minifridge.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
assets/furniture/kitchen/elec/oven.png
Normal file
After Width: | Height: | Size: 5 KiB |
BIN
assets/furniture/kitchen/elec/stove.png
Normal file
After Width: | Height: | Size: 4.4 KiB |
BIN
assets/furniture/kitchen/elec/toaster.png
Normal file
After Width: | Height: | Size: 126 KiB |
BIN
assets/furniture/kitchen/elec/washing_machine.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
assets/furniture/kitchen/fridge.png
Normal file
After Width: | Height: | Size: 14 KiB |