Commit graph

49 commits

Author SHA1 Message Date
a9aceaf65a Merge remote-tracking branch 'origin/main' into attack-human
Some checks failed
Rust / rustfmt (pull_request) Successful in 27s
Rust / clippy (pull_request) Failing after 2m31s
Rust / build (pull_request) Successful in 3m13s
2024-07-07 18:23:44 +02:00
a29677523b rust fmt
Some checks failed
Rust / rustfmt (pull_request) Successful in 35s
Rust / clippy (pull_request) Failing after 1m48s
Rust / build (pull_request) Successful in 3m51s
2024-07-07 18:20:45 +02:00
f7d21428ff Added human texture to house 2024-07-07 18:19:49 +02:00
cc39434310 Merge remote-tracking branch 'origin/main' into attack-human 2024-07-07 18:16:44 +02:00
6115ef4aa2
Play background sound (#19)
All checks were successful
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Successful in 2m33s
Rust / build (push) Successful in 3m44s
Reviewed-on: #19
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-07 16:13:39 +00:00
703e0f28fb Added ghost sprite and score 2024-07-07 18:10:57 +02:00
1ab85960fc Added human-attack 2024-07-07 18:02:02 +02:00
8e04d74682
fix all warnings
All checks were successful
Rust / rustfmt (push) Successful in 21s
Rust / clippy (push) Successful in 1m28s
Rust / build (push) Successful in 2m16s
2024-07-07 17:55:22 +02:00
e5e2ccfc6b
CI: change folder structure
Some checks failed
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Failing after 1m26s
Rust / build (push) Has been cancelled
2024-07-07 17:53:22 +02:00
b68b160d9f
CI: fix missing pipe
Some checks failed
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Failing after 1m31s
Rust / build (push) Successful in 3m18s
2024-07-07 17:48:07 +02:00
d346d68aed
redistributable game
Some checks failed
Rust / rustfmt (push) Successful in 19s
Rust / clippy (push) Failing after 1m29s
Rust / build (push) Successful in 2m8s
2024-07-07 17:44:17 +02:00
28655cc819
overworld human icon
Some checks failed
Rust / rustfmt (push) Successful in 26s
Rust / clippy (push) Failing after 1m32s
Rust / build (push) Successful in 3m14s
2024-07-07 17:39:06 +02:00
ac21220dea
Upload human artifacts from @librico
Some checks failed
Rust / rustfmt (push) Successful in 20s
Rust / clippy (push) Failing after 1m28s
Rust / build (push) Successful in 2m14s
2024-07-07 17:29:34 +02:00
0c9624d511
Houses have energy that interact with ghosts (#18)
Some checks failed
Rust / rustfmt (push) Successful in 24s
Rust / clippy (push) Failing after 2m32s
Rust / build (push) Successful in 3m40s
Reviewed-on: #18
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-07 15:18:32 +00:00
2354e34142 energie lost overworld
Some checks failed
Rust / rustfmt (push) Failing after 24s
Rust / clippy (push) Failing after 1m26s
Rust / build (push) Successful in 3m3s
2024-07-07 16:41:44 +02:00
b9e065058f
fix camera inside houses
Some checks failed
Rust / rustfmt (push) Failing after 20s
Rust / clippy (push) Failing after 1m26s
Rust / build (push) Successful in 2m9s
2024-07-07 16:32:07 +02:00
Fredi
3816dbac77 Merge branch 'room-types'
Some checks failed
Rust / rustfmt (push) Failing after 24s
Rust / clippy (push) Failing after 1m27s
Rust / build (push) Successful in 3m1s
2024-07-07 16:20:20 +02:00
Fredi
84030e5b6c Living room 2024-07-07 16:19:57 +02:00
a6d9e088ef room-creation (#15)
Some checks failed
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Failing after 2m29s
Rust / build (push) Successful in 3m29s
Co-authored-by: Dominic <git@msrd0.de>
Co-authored-by: Fredi <fredrik.konrad@rwth-aachen.de>
Reviewed-on: #15
Co-authored-by: Glaeder <niklas@vousten.dev>
Co-committed-by: Glaeder <niklas@vousten.dev>
2024-07-07 14:13:52 +00:00
fa990bfadb improve movement at overworld (#16)
Some checks failed
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Failing after 1m30s
Rust / build (push) Successful in 3m8s
Reviewed-on: #16
Co-authored-by: luckyturtledev <git@lukas1818.de>
Co-committed-by: luckyturtledev <git@lukas1818.de>
2024-07-07 14:03:49 +00:00
fe6651d573 add option to turn devtools off (#17)
Some checks failed
Rust / clippy (push) Has been cancelled
Rust / build (push) Has been cancelled
Rust / rustfmt (push) Has been cancelled
Reviewed-on: #17
Co-authored-by: luckyturtledev <git@lukas1818.de>
Co-committed-by: luckyturtledev <git@lukas1818.de>
2024-07-07 14:03:30 +00:00
2416ffd7dc
fix warning in build.rs
Some checks failed
Rust / rustfmt (push) Successful in 24s
Rust / clippy (push) Failing after 2m11s
Rust / build (push) Successful in 2m45s
2024-07-07 15:34:58 +02:00
03e12d6feb
Convert Music to ogg/vorbis and load in build.rs (#14)
Some checks failed
Rust / rustfmt (push) Successful in 20s
Rust / clippy (push) Failing after 1m31s
Rust / build (push) Has been cancelled
Reviewed-on: #14
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-07 13:29:41 +00:00
d3a54938af show fps
Some checks failed
Rust / rustfmt (push) Successful in 24s
Rust / clippy (push) Failing after 2m15s
Rust / build (push) Successful in 2m45s
2024-07-07 14:59:57 +02:00
eddeda6ba9
remove spaces from filenames
Some checks failed
Rust / rustfmt (push) Successful in 22s
Rust / clippy (push) Failing after 1m0s
Rust / build (push) Successful in 2m10s
2024-07-07 14:51:15 +02:00
Fredi
11b52f4d4a music assets
Some checks failed
Rust / rustfmt (push) Successful in 20s
Rust / clippy (push) Failing after 57s
Rust / build (push) Has been cancelled
2024-07-07 14:49:08 +02:00
9bfa6e2669 fix house entering
Some checks failed
Rust / rustfmt (push) Successful in 25s
Rust / clippy (push) Failing after 1m26s
Rust / build (push) Successful in 3m0s
2024-07-07 14:39:25 +02:00
33b301a410 Room Creating: Place Kitchen Furniture (#11)
Some checks failed
Rust / rustfmt (push) Successful in 24s
Rust / clippy (push) Failing after 2m27s
Rust / build (push) Successful in 3m8s
Co-authored-by: Glaeder <niklas@vousten.dev>
Co-authored-by: Fredi <fredrik.konrad@rwth-aachen.de>
Reviewed-on: #11
Co-authored-by: Dominic <git@msrd0.de>
Co-committed-by: Dominic <git@msrd0.de>
2024-07-07 11:54:42 +00: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
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
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
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
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
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