room-creation #15

Merged
Glaeder merged 18 commits from room-creation into main 2024-07-07 14:13:52 +00:00

18 commits

Author SHA1 Message Date
38921a7a33 Merge remote-tracking branch 'origin/main' into room-creation
Some checks failed
Rust / rustfmt (pull_request) Successful in 20s
Rust / clippy (pull_request) Failing after 1m53s
Rust / build (pull_request) Successful in 2m57s
2024-07-07 16:12:23 +02:00
23a1be52db Merge remote-tracking branch 'origin/main' into room-creation 2024-07-07 16:11:53 +02:00
641fda7043 Merge branch 'room-layers' into room-creation
Some checks failed
Rust / rustfmt (pull_request) Failing after 34s
Rust / clippy (pull_request) Failing after 2m7s
Rust / build (pull_request) Successful in 2m40s
2024-07-07 15:24:08 +02:00
6da8b9d71f Fixed room-movement and rembering rooms (#12)
Reviewed-on: #12
Co-authored-by: Glaeder <niklas@vousten.dev>
Co-committed-by: Glaeder <niklas@vousten.dev>
2024-07-07 13:18:18 +00:00
13e54db09c Added layers
Some checks failed
Rust / rustfmt (pull_request) Successful in 19s
Rust / clippy (pull_request) Failing after 1m4s
Rust / build (pull_request) Successful in 2m6s
2024-07-07 15:11:39 +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