Room Creating: Place Kitchen Furniture #11

Merged
msrd0 merged 19 commits from room-creation-placing-furniture into main 2024-07-07 11:54:43 +00:00

19 commits

Author SHA1 Message Date
fd4f67336b
fix some lints
Some checks failed
Rust / rustfmt (pull_request) Successful in 20s
Rust / clippy (pull_request) Failing after 1m11s
Rust / build (pull_request) Successful in 2m56s
2024-07-07 13:54:31 +02:00
a4a96c809d
fix merge 2024-07-07 13:52:51 +02:00
c13b96d88b
fmt 2024-07-07 13:43:02 +02:00
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
bf6af37be1
remove stuff not meant for main
Some checks failed
Rust / rustfmt (pull_request) Successful in 24s
Rust / clippy (pull_request) Failing after 1m23s
Rust / build (pull_request) Successful in 3m4s
2024-07-07 13:40:07 +02:00
2874f832db
kitchen counter appliances 2024-07-07 13:35:48 +02:00
2498152b21
z index 2024-07-07 12:43:33 +02:00
d63c487b9d
start distributing kitchen furniture 2024-07-07 12:33:22 +02:00
a614cd0644 Random furnitur skeleton 2024-07-07 11:50:35 +02:00
c5ac0b39b2
fix texture loading 2024-07-07 11:40:02 +02:00
8f67dad44c Added furniture drawing to room-creation. Run clippy and fmt 2024-07-07 11:38:13 +02:00
106b5f590f Merge remote-tracking branch 'origin/main' into room-creation 2024-07-07 10:05:26 +02:00
1cdb6156f8 Added setup to house and WIP Furniture tiles 2024-07-07 10:04:39 +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
0a7e741207 WIP room movement 2024-07-07 00:48:37 +02:00
c8e21d544a Merge branch 'main' into room-creation 2024-07-07 00:04:54 +02:00
f3e6afc179 Added room and grid creation 2024-07-07 00:01:46 +02:00