31 commits

Author	SHA1	Message	Date
Snoweuph	59bb7f775c	Merge pull request 'New In Game Art' (#48) from dev-base into stable ... Reviewed-on: #48	2023-04-10 13:07:44 +00:00
Snoweuph	c455cdecb1	Fix Folder Structure	2023-04-10 15:06:16 +02:00
Snoweuph	f41b08dc95	Fix Folder Structure	2023-04-10 15:05:14 +02:00
Snoweuph	51aada9bff	Fix Folder Structure	2023-04-10 15:04:48 +02:00
Snoweuph	6aefc20f63	Update ColorPallet.png, Tileset, Bunnys, Cruzefix	2023-04-10 15:02:12 +02:00
Snoweuph	b6486ef57f	WIP: Work on new Tilemap (outlines only rn) ... TODO: Shading TODO: Update Colliders	2023-04-10 10:26:48 +02:00
Snoweuph	a1a7e5f9d3	Merge pull request 'Getting Stuff Together' (#42) from dev-base into stable ... Reviewed-on: #42	2023-04-09 17:21:28 +00:00
Snoweuph	7d3778486a	Merging Stuff Together and Fixing Stuff Brocken From Merge	2023-04-09 17:57:37 +02:00
Snoweuph	a82210061e	Cleaning up Merge	2023-04-09 17:22:06 +02:00
Snoweuph	5255092171	Update good bunny.png and good bunny.png.import	2023-04-09 17:13:18 +02:00
Snoweuph	8b9bf7e52d	Merge branch 'dev-menu' into dev-base ... Fuck you AXVIII3 You changed files your not supposed to change your in branch, ending with a fucking hell of a merge commit	2023-04-09 17:10:55 +02:00
Snoweuph	fd552541a7	Bunny AI Done using Nav Agent	2023-04-09 16:39:45 +02:00
AXVIII3	03192a25bf	Main Menu, Settings Menu and Save system	2023-04-09 17:30:52 +05:30
Snoweuph	5415c7a751	Update bad_bunny_spritesheet.png and good_bunny_spritesheet.png	2023-04-09 09:17:34 +02:00
Snoweuph	3adb32dc4a	Merge branch 'dev-base' ... Conflicts: Assets/Sprites/EvilBunny/bunny_down.png Assets/Sprites/EvilBunny/bunny_down.png.import Assets/Sprites/EvilBunny/bunny_left.png Assets/Sprites/EvilBunny/bunny_left.png.import Assets/Sprites/EvilBunny/bunny_righ.png Assets/Sprites/EvilBunny/bunny_up.png Assets/Sprites/EvilBunny/bunny_up.png.import Assets/Sprites/bunny_down.png Assets/Sprites/bunny_left.png Assets/Sprites/bunny_left.png.import Assets/Sprites/bunny_righ.png Assets/Sprites/bunny_righ.png.import Assets/Sprites/bunny_up.png Assets/Sprites/bunny_up.png.import Assets/Sprites/crucefix.png.import	2023-04-08 22:51:17 +02:00
Snoweuph	4eb022a49c	Merge branch 'dev-art'	2023-04-08 22:27:38 +02:00
Snoweuph	5038245697	Update Bunny & Crucefix	2023-04-08 22:10:11 +02:00
Snoweuph	f5391051d6	Update Jesus -> needs implementation in other branches	2023-04-08 21:51:47 +02:00
AXVIII3	e7f50d085a	Revert "Bunny Full Spritesheets" ... This reverts commit 335f3dd581. Reasons: 1. We dont need these full spritesheets 2. bunny sprites arent done yet 3. working with them is harder this way	2023-04-08 17:33:26 +02:00
Snoweuph	edb4265367	Implementing WeaponSystem and Entity System to go along with (so that weapons can be tested)	2023-04-08 17:00:54 +02:00
AXVIII3	335f3dd581	Bunny Full Spritesheets	2023-04-08 14:31:44 +05:30
Snoweuph	2a814abe05	Basic Movement and Map Generation (#22) ... Basic Movement and Map Generation are Done also got some art in stock, missing a lot still though. nothing to fancy for now Co-authored-by: Snoweuph, AXVIII3 Reviewed-on: #22	2023-04-08 00:41:09 +00:00
Snoweuph	9ea57c4566	Merge remote-tracking branch 'refs/remotes/origin/dev-player-movement'	2023-04-08 01:54:37 +02:00
Snoweuph	5e5c942729	Adding Bunnys, Tileset & Colorpallte ... - Removing Placeholers - Setting Up Rule Tile	2023-04-08 00:59:28 +02:00
Snoweuph	b1e63481fe	Remove no longer needed file	2023-04-07 19:55:29 +02:00
AXVIII3	080401b9a3	Final Player Movement \w Animations	2023-04-07 22:56:18 +05:30
Snoweuph	5a625f1792	Merge remote-tracking branch 'refs/remotes/origin/dev-base' ... Conflicts: project.godot	2023-04-07 16:18:21 +02:00
Snoweuph	ef60fdd59f	Fixing Strucuter and Cleaning Up	2023-04-07 16:11:07 +02:00
Snoweuph	b49f0378da	- Adding Cave Generation ... - Placeholder Art - Setting Physics Layer	2023-04-07 15:33:54 +02:00
Snoweuph	5825a5fb2e	Set Import Mode and Create a Basic Test Scene for Compiling	2023-04-07 10:54:56 +02:00
Snoweuph	b3560310ae	Adding Bunny Spritesheets	2023-04-07 10:42:21 +02:00