|
7965c7fb41
|
Merge remote-tracking branch 'origin/main' into room-creation-placing-furniture
Conflicts:
Cargo.lock
Cargo.toml
src/activities/house/mod.rs
src/activities/mod.rs
src/main.rs
|
2024-07-07 13:42:49 +02:00 |
|
Fredi
|
1275b92a5b
|
bedroom and ghost sprites
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Failing after 1m25s
Rust / build (push) Successful in 3m10s
|
2024-07-07 13:37:21 +02:00 |
|
|
106b5f590f
|
Merge remote-tracking branch 'origin/main' into room-creation
|
2024-07-07 10:05:26 +02:00 |
|
|
9f78a94c8d
|
remove .gitkeep
|
2024-07-07 10:04:39 +02:00 |
|
Fredi
|
aa4ad84403
|
kitchen_textures
|
2024-07-07 10:04:39 +02:00 |
|
|
a83653352a
|
Add Furniture struct
|
2024-07-07 10:04:39 +02:00 |
|
Fredi
|
c1474c51e5
|
change furniture folder structure
Rust / rustfmt (push) Successful in 20s
Rust / clippy (push) Successful in 1m1s
Rust / build (push) Successful in 2m14s
|
2024-07-07 09:46:06 +02:00 |
|
Fredi
|
74652f1191
|
kitchen_textures
Rust / rustfmt (push) Successful in 26s
Rust / clippy (push) Successful in 1m26s
Rust / build (push) Successful in 3m15s
|
2024-07-07 01:52:43 +02:00 |
|