Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Massive rework #330

Draft
wants to merge 50 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
621be08
Merge main
janhohenheim Aug 31, 2024
0ba6c22
Remove some unused stuff
janhohenheim Aug 31, 2024
dc792c7
Fix naming
janhohenheim Aug 31, 2024
1a54615
Remove readme because casing is hard
janhohenheim Aug 31, 2024
5cc451d
Idk
janhohenheim Aug 31, 2024
2016bae
Start porting Blenvy and Avian stuff
janhohenheim Aug 29, 2024
8224ecc
Start porting blend file
janhohenheim Aug 31, 2024
4b63053
Add levels file
janhohenheim Aug 31, 2024
5240487
Add generated assets
janhohenheim Aug 31, 2024
93043ce
Regenerate stuff
janhohenheim Aug 31, 2024
9ee8d5a
Add armature
janhohenheim Aug 31, 2024
7ea8dcb
Remove armature
janhohenheim Aug 31, 2024
f322f80
Fix module name
janhohenheim Aug 31, 2024
8c54fe4
Add docs
janhohenheim Aug 31, 2024
e33994f
Add player stuff
janhohenheim Sep 5, 2024
ac5b7a5
Add stuff
janhohenheim Sep 6, 2024
9de681e
Spawn single 3D camera
janhohenheim Sep 6, 2024
6001f83
Overhaul spawning a little bit
janhohenheim Sep 6, 2024
bcfc944
Start working on character controller
janhohenheim Sep 6, 2024
b92f6a2
Setup character controller, at least parts of it
janhohenheim Sep 7, 2024
84cffcb
Patch avian main
janhohenheim Sep 7, 2024
4237455
Fix some log spam
janhohenheim Sep 7, 2024
2d4a64c
Fix more warning spam
janhohenheim Sep 7, 2024
ab237f2
Implement character controller moving player
janhohenheim Sep 7, 2024
58cb171
Shave a Tnua-shaped yak
janhohenheim Sep 8, 2024
af5b719
Add interpolation
janhohenheim Sep 10, 2024
f838d42
Use local avian
janhohenheim Sep 11, 2024
d7d3a1a
Remove unused code
janhohenheim Sep 11, 2024
3d23903
Implement camera-based movement
janhohenheim Sep 11, 2024
1b87536
Add cursor handling
janhohenheim Sep 11, 2024
d8d1ba7
Remove comments
janhohenheim Sep 11, 2024
6b42b65
Add height offset
janhohenheim Sep 11, 2024
1c94e81
Fix jump height
janhohenheim Sep 11, 2024
461508c
Allow clicking around in UI
janhohenheim Sep 11, 2024
4b9d35a
Use some fixed deps
janhohenheim Sep 12, 2024
2f2827f
Start working on dialog
janhohenheim Sep 12, 2024
8ffa6db
idk
janhohenheim Sep 13, 2024
f4ccc8f
Implement dialogue
janhohenheim Sep 13, 2024
1e5a116
Disable character on dialog
janhohenheim Sep 13, 2024
f34c6df
Update registry
janhohenheim Sep 13, 2024
55219d4
Rework interaction opportunities based on The Outer Worlds
janhohenheim Sep 15, 2024
18afb60
Fix prompt
janhohenheim Sep 15, 2024
ed16ad4
WIP refactoring
janhohenheim Sep 15, 2024
889f186
Refactor prompt stuff
janhohenheim Sep 15, 2024
6bcbb17
Fix branch
janhohenheim Sep 15, 2024
1d30196
Add camera tweening to dialog
janhohenheim Sep 16, 2024
33bdcf0
refactor some modules
janhohenheim Sep 16, 2024
8ee480e
Implement dialog camera target
janhohenheim Sep 20, 2024
7eabc2b
Show cursor in dialogs
janhohenheim Sep 20, 2024
d8d476e
Fix player moving while talking
janhohenheim Sep 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 48 additions & 46 deletions .cargo/config_fast_builds.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,60 +67,61 @@
[target.x86_64-unknown-linux-gnu]
linker = "clang"
rustflags = [
# LLD linker
#
# You may need to install it:
#
# - Ubuntu: `sudo apt-get install lld clang`
# - Fedora: `sudo dnf install lld clang`
# - Arch: `sudo pacman -S lld clang`
"-Clink-arg=-fuse-ld=lld",
# Mold linker
#
# You may need to install it:
#
# - Ubuntu: `sudo apt-get install mold clang`
# - Fedora: `sudo dnf install mold clang`
# - Arch: `sudo pacman -S mold clang`
# "-Clink-arg=-fuse-ld=/usr/bin/mold",
# LLD linker
#
# You may need to install it:
#
# - Ubuntu: `sudo apt-get install lld clang`
# - Fedora: `sudo dnf install lld clang`
# - Arch: `sudo pacman -S lld clang`
"-Clink-arg=-fuse-ld=lld",

# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
# Mold linker
#
# You may need to install it:
#
# - Ubuntu: `sudo apt-get install mold clang`
# - Fedora: `sudo dnf install mold clang`
# - Arch: `sudo pacman -S mold clang`
# "-Clink-arg=-fuse-ld=/usr/bin/mold",

# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
]

[target.x86_64-apple-darwin]
rustflags = [
# LLD linker
#
# The default ld64 linker is faster, you should continue using it instead.
#
# You may need to install it:
#
# Brew: `brew install llvm`
# Manually: <https://lld.llvm.org/MachO/index.html>
# "-Clink-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld",
# LLD linker
#
# The default ld64 linker is faster, you should continue using it instead.
#
# You may need to install it:
#
# Brew: `brew install llvm`
# Manually: <https://lld.llvm.org/MachO/index.html>
# "-Clink-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld",

# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
]

[target.aarch64-apple-darwin]
rustflags = [
# LLD linker
#
# The default ld64 linker is faster, you should continue using it instead.
#
# You may need to install it:
#
# Brew: `brew install llvm`
# Manually: <https://lld.llvm.org/MachO/index.html>
# "-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",
# LLD linker
#
# The default ld64 linker is faster, you should continue using it instead.
#
# You may need to install it:
#
# Brew: `brew install llvm`
# Manually: <https://lld.llvm.org/MachO/index.html>
# "-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",

# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
]

[target.x86_64-pc-windows-msvc]
Expand All @@ -133,10 +134,11 @@ rustflags = [
# rustup component add llvm-tools
# ```
linker = "rust-lld.exe"
rustdocflags = ["-Clinker=rust-lld.exe"]
rustflags = [
# Nightly
# "-Zshare-generics=y",
# "-Zthreads=0",
# Nightly
# "-Zshare-generics=n", # This needs to be off if you use dynamic linking on Windows.
# "-Zthreads=0",
]

# Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'
Expand Down
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[.github/workflows/*.{yaml,yml}]
indent_size = 2
104 changes: 104 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: CI

on:
push:
branches: [main]
pull_request:
branches: [main]

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: --deny warnings
RUSTDOCFLAGS: --deny warnings

jobs:
# Run tests.
test:
name: Tests
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

- name: Install dependencies
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev

- name: Populate target directory from cache
uses: Leafwing-Studios/cargo-cache@v2
with:
sweep-cache: true

- name: Run tests
run: |
cargo test --workspace --all-features --all-targets
# Workaround for https://github.com/rust-lang/cargo/issues/6669
cargo test --workspace --all-features --doc

# Run clippy lints.
clippy:
name: Clippy
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
components: clippy

- name: Install dependencies
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev

- name: Populate target directory from cache
uses: Leafwing-Studios/cargo-cache@v2
with:
sweep-cache: true

- name: Run clippy lints
run: cargo clippy --workspace --all-targets --all-features -- --deny warnings

# Check formatting.
format:
name: Format
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt

- name: Run cargo fmt
run: cargo fmt --all -- --check

# Check documentation.
doc:
name: Docs
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

- name: Install dependencies
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev

- name: Populate target directory from cache
uses: Leafwing-Studios/cargo-cache@v2
with:
sweep-cache: true

- name: Check documentation
run: cargo doc --workspace --all-features --document-private-items --no-deps
63 changes: 0 additions & 63 deletions .github/workflows/ci.yml

This file was deleted.

Loading
Loading