49 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Glaeder	a9aceaf65a	Merge remote-tracking branch 'origin/main' into attack-human	2024-07-07 18:23:44 +02:00
Glaeder	a29677523b	rust fmt	2024-07-07 18:20:45 +02:00
Glaeder	f7d21428ff	Added human texture to house	2024-07-07 18:19:49 +02:00
Glaeder	cc39434310	Merge remote-tracking branch 'origin/main' into attack-human	2024-07-07 18:16:44 +02:00
Dominic	6115ef4aa2	Play background sound (#19) ... 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
Glaeder	703e0f28fb	Added ghost sprite and score	2024-07-07 18:10:57 +02:00
Glaeder	1ab85960fc	Added human-attack	2024-07-07 18:02:02 +02:00
Dominic	8e04d74682	fix all warnings	2024-07-07 17:55:22 +02:00
Dominic	e5e2ccfc6b	CI: change folder structure	2024-07-07 17:53:22 +02:00
Dominic	b68b160d9f	CI: fix missing pipe	2024-07-07 17:48:07 +02:00
Dominic	d346d68aed	redistributable game	2024-07-07 17:44:17 +02:00
Dominic	28655cc819	overworld human icon	2024-07-07 17:39:06 +02:00
Dominic	ac21220dea	Upload human artifacts from @librico	2024-07-07 17:29:34 +02:00
Dominic	0c9624d511	Houses have energy that interact with ghosts (#18) ... 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
luckyturtledev	2354e34142	energie lost overworld	2024-07-07 16:41:44 +02:00
Dominic	b9e065058f	fix camera inside houses	2024-07-07 16:32:07 +02:00
Fredi	3816dbac77	Merge branch 'room-types'	2024-07-07 16:20:20 +02:00
Fredi	84030e5b6c	Living room	2024-07-07 16:19:57 +02:00
Glaeder	a6d9e088ef	room-creation (#15) ... 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
luckyturtledev	fa990bfadb	improve movement at overworld (#16) ... 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
luckyturtledev	fe6651d573	add option to turn devtools off (#17) ... 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
Dominic	2416ffd7dc	fix warning in build.rs	2024-07-07 15:34:58 +02:00
Dominic	03e12d6feb	Convert Music to ogg/vorbis and load in build.rs (#14) ... 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
luckyturtledev	d3a54938af	show fps	2024-07-07 14:59:57 +02:00
Dominic	eddeda6ba9	remove spaces from filenames	2024-07-07 14:51:15 +02:00
Fredi	11b52f4d4a	music assets	2024-07-07 14:49:08 +02:00
luckyturtledev	9bfa6e2669	fix house entering	2024-07-07 14:39:25 +02:00
Dominic	33b301a410	Room Creating: Place Kitchen Furniture (#11) ... 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	2024-07-07 13:37:21 +02:00
luckyturtledev	bb37f613ad	enter house (#10) ... 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	2024-07-07 12:32:04 +02:00
luckyturtledev	dadc5d59db	add score	2024-07-07 12:03:00 +02:00
Dominic	ff743e97b8	Overworld Movement (#9) ... 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	2024-07-07 09:46:06 +02:00
Fredi	74652f1191	kitchen_textures	2024-07-07 01:52:43 +02:00
luckyturtledev	9c8a399b38	fix drawing mirror	2024-07-06 23:52:27 +02:00
Dominic	e03cd06c78	Add fence to static worldgen (#4) ... 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
luckyturtledev	b98bc61a02	add battery-ui (#6) ... 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
Dominic	8143a99843	Static World Gen and Display for the Overworld (#5) ... 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
Glaeder	5a4451d6a7	cabel-movement (#3) ... 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
Dominic	576b21d8b9	Overworld Assets (#2) ... 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
luckyturtledev	c957799a81	add activities	2024-07-06 13:33:58 +02:00
Dominic	6f77fb9008	Add CI (#1) ... 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
Dominic	e0b6a40fcc	format code	2024-07-05 23:43:11 +02:00
luckyturtledev	566310810c	remove logger; comfy do automaticly use envlogger	2024-07-05 23:16:53 +02:00
luckyturtledev	e83ec5ce20	migrate to comfy	2024-07-05 23:12:09 +02:00
Dominic	96e3f6982e	add rustfmt.toml	2024-07-05 22:40:41 +02:00
Dominic	c27691540a	update Cargo.toml	2024-07-05 19:11:18 +02:00
luckyturtledev	c6ba3f6d80	init bevy	2024-07-05 19:01:09 +02:00