AXVIII3
03192a25bf
Main Menu, Settings Menu and Save system
2023-04-09 17:30:52 +05:30
97a49b122b
Basic Wave System is Down
2023-04-09 12:01:03 +02:00
128abc60b8
Update bunny spawning
2023-04-09 10:36:03 +02:00
b7811cebea
Merge remote-tracking branch 'refs/remotes/origin/dev-art'
2023-04-09 09:17:56 +02:00
5415c7a751
Update bad_bunny_spritesheet.png and good_bunny_spritesheet.png
2023-04-09 09:17:34 +02:00
50f435b5f7
Updating Testscene
...
- Make Scaling Right
- Fix Players Collision Box
2023-04-08 23:00:44 +02:00
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
e833b0b3f3
Merge pull request '„project.godot“ ändern' ( #34 ) from snoweuph-patch-1 into stable
...
Reviewed-on: #34
2023-04-08 20:48:01 +00:00
35b69a05e0
„project.godot“ ändern
2023-04-08 20:47:40 +00:00
e4e4d7e30b
trying to make it merge
2023-04-08 22:45:08 +02:00
b318e7d65a
Updating Scene
2023-04-08 22:34:07 +02:00
4eb022a49c
Merge branch 'dev-art'
2023-04-08 22:27:38 +02:00
5038245697
Update Bunny & Crucefix
2023-04-08 22:10:11 +02:00
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
08a134d2fc
Cleanup Code
2023-04-08 17:17:48 +02:00
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
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
fa686fb55a
Merge Stuff Together, Setuped Cave in PlayerMovement Scene
2023-04-08 02:17:24 +02:00
9ea57c4566
Merge remote-tracking branch 'refs/remotes/origin/dev-player-movement'
2023-04-08 01:54:37 +02:00
579faa06df
Implementing Tileset for Map Generation
2023-04-08 01:52:42 +02:00
27d1606d08
Setting Up new Tileset
2023-04-08 01:52:25 +02:00
5e5c942729
Adding Bunnys, Tileset & Colorpallte
...
- Removing Placeholers
- Setting Up Rule Tile
2023-04-08 00:59:28 +02:00
AXVIII3
8e03e10593
Diagonal Movement Fix and Textures
2023-04-08 01:02:56 +05:30
f6eb10f644
Seting Up Theme so that It can be Used
2023-04-07 20:10:23 +02:00
dfb751f37f
Set Resize Mode
2023-04-07 19:58:16 +02:00
b1e63481fe
Remove no longer needed file
2023-04-07 19:55:29 +02:00
e833b82dd4
Cleanup of Code
2023-04-07 19:52:50 +02:00
AXVIII3
080401b9a3
Final Player Movement \w Animations
2023-04-07 22:56:18 +05:30
b7ead67e58
Starting To Build UI Theme
2023-04-07 17:51:40 +02:00
7305e31751
Merge pull request 'Improve and Speedup MapGeneration Code' ( #18 ) from dev-map-generation into dev-base
...
Reviewed-on: #18
2023-04-07 14:55:24 +00:00
f731170b15
Improve and Speedup MapGeneration Code
2023-04-07 16:53:54 +02:00
537589e30b
Putting Generated Map into PlayerMovement Scene For testing
2023-04-07 16:22:55 +02:00
5a625f1792
Merge remote-tracking branch 'refs/remotes/origin/dev-base'
...
Conflicts:
project.godot
2023-04-07 16:18:21 +02:00
ef60fdd59f
Fixing Strucuter and Cleaning Up
2023-04-07 16:11:07 +02:00
AXVIII3
4b2d83a4c5
Basic Movement
2023-04-07 19:28:30 +05:30
79622596bc
Merge pull request 'Adding Cave Generation' ( #13 ) from dev-map-generation into dev-base
...
Reviewed-on: #13
2023-04-07 13:37:32 +00:00
b49f0378da
- Adding Cave Generation
...
- Placeholder Art
- Setting Physics Layer
2023-04-07 15:33:54 +02:00
ebc7a8ec62
Merge pull request 'Fix Typo in Build Workflow' ( #4 ) from snoweuph-patch-1 into stable
...
Reviewed-on: #4
2023-04-07 09:03:36 +00:00
0732748e7e
Fix Typo in Build Workflow
2023-04-07 09:03:27 +00:00
3ae1886caf
Merge pull request 'Fix Typo in Build Workflow' ( #3 ) from snoweuph-patch-1 into stable
...
Reviewed-on: #3
2023-04-07 08:59:23 +00:00
4f53918fdf
Fix Typo in Build Workflow
2023-04-07 08:59:09 +00:00
1b6ac9984d
Merge pull request 'Import Basic Scene for Compiling' ( #2 ) from dev-base into stable
...
Reviewed-on: #2
2023-04-07 08:55:57 +00:00
5825a5fb2e
Set Import Mode and Create a Basic Test Scene for Compiling
2023-04-07 10:54:56 +02:00
bf97ae2d0e
Adding Folder Structure
2023-04-07 10:44:34 +02:00
f61568fbe5
Merge pull request 'Adding Bunny Spritesheets' ( #1 ) from dev-art into dev-base
...
Reviewed-on: #1
2023-04-07 08:43:11 +00:00
b3560310ae
Adding Bunny Spritesheets
2023-04-07 10:42:21 +02:00
6ec72a9f05
Collecting Ideas
2023-04-06 21:28:35 +00:00
a94e4b7b1f
Update export_presets.cfg
2023-04-06 22:44:16 +02:00