Commit graph

38 commits

Author SHA1 Message Date
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
Fredi
1275b92a5b bedroom and ghost sprites
Some checks failed
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
2874f832db
kitchen counter appliances 2024-07-07 13:35:48 +02:00
bb37f613ad enter house (#10)
Some checks failed
Rust / rustfmt (push) Successful in 29s
Rust / clippy (push) Failing after 2m25s
Rust / build (push) Successful in 2m54s
Reviewed-on: #10
Co-authored-by: luckyturtledev <git@lukas1818.de>
Co-committed-by: luckyturtledev <git@lukas1818.de>
2024-07-07 11:21:08 +00: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
Fredi
1c897d6712 added bzz.mp3
All checks were successful
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Successful in 1m26s
Rust / build (push) Successful in 3m5s
2024-07-07 12:32:04 +02:00
dadc5d59db add score
All checks were successful
Rust / rustfmt (push) Successful in 19s
Rust / clippy (push) Successful in 1m3s
Rust / build (push) Successful in 2m15s
2024-07-07 12:03:00 +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
ff743e97b8 Overworld Movement (#9)
All checks were successful
Rust / rustfmt (push) Successful in 24s
Rust / clippy (push) Successful in 1m12s
Rust / build (push) Successful in 3m13s
Co-authored-by: luckyturtledev <git@lukas1818.de>
Reviewed-on: #9
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-07 08:49:19 +00: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
Fredi
c1474c51e5 change furniture folder structure
All checks were successful
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
All checks were successful
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
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
9c8a399b38 fix drawing mirror
All checks were successful
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Successful in 1m24s
Rust / build (push) Successful in 3m19s
2024-07-06 23:52:27 +02:00
e03cd06c78
Add fence to static worldgen (#4)
All checks were successful
Rust / rustfmt (push) Successful in 22s
Rust / clippy (push) Successful in 1m17s
Rust / build (push) Successful in 3m21s
Fence Assets

Reviewed-on: #4
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-06 21:19:24 +00:00
b98bc61a02 add battery-ui (#6)
All checks were successful
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Successful in 1m24s
Rust / build (push) Successful in 3m9s
Reviewed-on: #6
Co-authored-by: luckyturtledev <git@lukas1818.de>
Co-committed-by: luckyturtledev <git@lukas1818.de>
2024-07-06 20:45:05 +00:00
8143a99843 Static World Gen and Display for the Overworld (#5)
All checks were successful
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Successful in 1m23s
Rust / build (push) Successful in 3m11s
Co-authored-by: luckyturtledev <git@lukas1818.de>
Reviewed-on: #5
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-06 20:23:25 +00:00
5a4451d6a7 cabel-movement (#3)
All checks were successful
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Successful in 1m21s
Rust / build (push) Successful in 3m1s
Cable Movemnt is finished. grid is hard coded

Reviewed-on: #3
Co-authored-by: Glaeder <niklas@vousten.dev>
Co-committed-by: Glaeder <niklas@vousten.dev>
2024-07-06 17:59:56 +00:00
576b21d8b9
Overworld Assets (#2)
Some checks failed
Rust / rustfmt (push) Successful in 19s
Rust / clippy (push) Failing after 35s
Rust / build (push) Successful in 2m2s
Reviewed-on: #2
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-06 11:52:10 +00:00
c957799a81 add activities
Some checks failed
Rust / rustfmt (push) Successful in 19s
Rust / clippy (push) Failing after 38s
Rust / build (push) Successful in 2m3s
2024-07-06 13:33:58 +02:00
6f77fb9008
Add CI (#1)
All checks were successful
Rust / rustfmt (push) Successful in 19s
Rust / clippy (push) Successful in 1m33s
Rust / build (push) Successful in 2m5s
Reviewed-on: #1
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-05 21:57:00 +00:00
e0b6a40fcc
format code 2024-07-05 23:43:11 +02:00
566310810c remove logger; comfy do automaticly use envlogger 2024-07-05 23:16:53 +02:00
e83ec5ce20 migrate to comfy 2024-07-05 23:12:09 +02:00
96e3f6982e
add rustfmt.toml 2024-07-05 22:40:41 +02:00
c27691540a
update Cargo.toml 2024-07-05 19:11:18 +02:00
c6ba3f6d80 init bevy 2024-07-05 19:01:09 +02:00