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 · 2024-07-07 13:42:49 +02:00 · 7965c7fb41
commit 7965c7fb41
parent bf6af37be1 1275b92a5b
67 changed files with 338 additions and 47 deletions
--- a/assets/furniture/bedroom/ac.png
+++ b/assets/furniture/bedroom/ac.png
--- a/assets/furniture/bedroom/bed.png
+++ b/assets/furniture/bedroom/bed.png
--- a/assets/furniture/bedroom/bookshelf.png
+++ b/assets/furniture/bedroom/bookshelf.png
--- a/assets/furniture/bedroom/couch.png
+++ b/assets/furniture/bedroom/couch.png
--- a/assets/furniture/bedroom/cupboard.png
+++ b/assets/furniture/bedroom/cupboard.png
--- a/assets/furniture/bedroom/display_off.png
+++ b/assets/furniture/bedroom/display_off.png
--- a/assets/furniture/bedroom/display_on.png
+++ b/assets/furniture/bedroom/display_on.png
--- a/assets/furniture/bedroom/drawer.png
+++ b/assets/furniture/bedroom/drawer.png
--- a/assets/furniture/bedroom/elec/ac.png
+++ b/assets/furniture/bedroom/elec/ac.png
--- a/assets/furniture/bedroom/elec/display_off.png
+++ b/assets/furniture/bedroom/elec/display_off.png
--- a/assets/furniture/bedroom/elec/display_on.png
+++ b/assets/furniture/bedroom/elec/display_on.png
--- a/assets/furniture/bedroom/elec/keyboard.png
+++ b/assets/furniture/bedroom/elec/keyboard.png
--- a/assets/furniture/bedroom/elec/laptop_off.png
+++ b/assets/furniture/bedroom/elec/laptop_off.png
--- a/assets/furniture/bedroom/elec/laptop_on.png
+++ b/assets/furniture/bedroom/elec/laptop_on.png
--- a/assets/furniture/bedroom/elec/mini_ac.png
+++ b/assets/furniture/bedroom/elec/mini_ac.png
--- a/assets/furniture/bedroom/elec/mouse.png
+++ b/assets/furniture/bedroom/elec/mouse.png
--- a/assets/furniture/bedroom/elec/nightlight.png
+++ b/assets/furniture/bedroom/elec/nightlight.png
--- a/assets/furniture/bedroom/elec/pc.png
+++ b/assets/furniture/bedroom/elec/pc.png
--- a/assets/furniture/bedroom/elec/phone.png
+++ b/assets/furniture/bedroom/elec/phone.png
--- a/assets/furniture/bedroom/elec/receiver.png
+++ b/assets/furniture/bedroom/elec/receiver.png
--- a/assets/furniture/bedroom/elec/tv.png
+++ b/assets/furniture/bedroom/elec/tv.png
--- a/assets/furniture/bedroom/elec/window_ac.png
+++ b/assets/furniture/bedroom/elec/window_ac.png
--- a/assets/furniture/bedroom/keyboard.png
+++ b/assets/furniture/bedroom/keyboard.png
--- a/assets/furniture/bedroom/laptop_off.png
+++ b/assets/furniture/bedroom/laptop_off.png
--- a/assets/furniture/bedroom/laptop_on.png
+++ b/assets/furniture/bedroom/laptop_on.png
--- a/assets/furniture/bedroom/metal/ac.png
+++ b/assets/furniture/bedroom/metal/ac.png
--- a/assets/furniture/bedroom/metal/bed.png
+++ b/assets/furniture/bedroom/metal/bed.png
--- a/assets/furniture/bedroom/metal/cupboard.png
+++ b/assets/furniture/bedroom/metal/cupboard.png
--- a/assets/furniture/bedroom/metal/display_off.png
+++ b/assets/furniture/bedroom/metal/display_off.png
--- a/assets/furniture/bedroom/metal/display_on.png
+++ b/assets/furniture/bedroom/metal/display_on.png
--- a/assets/furniture/bedroom/metal/drawer.png
+++ b/assets/furniture/bedroom/metal/drawer.png
--- a/assets/furniture/bedroom/metal/keyboard.png
+++ b/assets/furniture/bedroom/metal/keyboard.png
--- a/assets/furniture/bedroom/metal/laptop_off.png
+++ b/assets/furniture/bedroom/metal/laptop_off.png
--- a/assets/furniture/bedroom/metal/laptop_on.png
+++ b/assets/furniture/bedroom/metal/laptop_on.png
--- a/assets/furniture/bedroom/metal/mini_ac.png
+++ b/assets/furniture/bedroom/metal/mini_ac.png
--- a/assets/furniture/bedroom/metal/mouse.png
+++ b/assets/furniture/bedroom/metal/mouse.png
--- a/assets/furniture/bedroom/metal/nightlight.png
+++ b/assets/furniture/bedroom/metal/nightlight.png
--- a/assets/furniture/bedroom/metal/nightstand.png
+++ b/assets/furniture/bedroom/metal/nightstand.png
--- a/assets/furniture/bedroom/metal/pc.png
+++ b/assets/furniture/bedroom/metal/pc.png
--- a/assets/furniture/bedroom/metal/phone.png
+++ b/assets/furniture/bedroom/metal/phone.png
--- a/assets/furniture/bedroom/metal/receiver.png
+++ b/assets/furniture/bedroom/metal/receiver.png
--- a/assets/furniture/bedroom/metal/tv.png
+++ b/assets/furniture/bedroom/metal/tv.png
--- a/assets/furniture/bedroom/metal/wardrobe.png
+++ b/assets/furniture/bedroom/metal/wardrobe.png
--- a/assets/furniture/bedroom/metal/window_ac.png
+++ b/assets/furniture/bedroom/metal/window_ac.png
--- a/assets/furniture/bedroom/mini_ac.png
+++ b/assets/furniture/bedroom/mini_ac.png
--- a/assets/furniture/bedroom/mouse.png
+++ b/assets/furniture/bedroom/mouse.png
--- a/assets/furniture/bedroom/nightlight.png
+++ b/assets/furniture/bedroom/nightlight.png
--- a/assets/furniture/bedroom/nightstand.png
+++ b/assets/furniture/bedroom/nightstand.png
--- a/assets/furniture/bedroom/pc.png
+++ b/assets/furniture/bedroom/pc.png
--- a/assets/furniture/bedroom/phone.png
+++ b/assets/furniture/bedroom/phone.png
--- a/assets/furniture/bedroom/receiver.png
+++ b/assets/furniture/bedroom/receiver.png
--- a/assets/furniture/bedroom/tv.png
+++ b/assets/furniture/bedroom/tv.png
--- a/assets/furniture/bedroom/tv_stand.png
+++ b/assets/furniture/bedroom/tv_stand.png
--- a/assets/furniture/bedroom/wardrobe.png
+++ b/assets/furniture/bedroom/wardrobe.png
--- a/assets/furniture/bedroom/window.png
+++ b/assets/furniture/bedroom/window.png
--- a/assets/furniture/bedroom/window_ac.png
+++ b/assets/furniture/bedroom/window_ac.png