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
53c42acf01
Balancing
2023-04-09 23:22:44 +02:00
2758e057ea
No Loadingscreen Needed. actual solution: batched spawning
2023-04-09 22:45:00 +02:00
a1a7e5f9d3
Merge pull request 'Getting Stuff Together' ( #42 ) from dev-base into stable
...
Reviewed-on: #42
2023-04-09 17:21:28 +00:00
e09b2d0dd1
Fixing Rebind UI (Reoworking from scratch)
2023-04-09 19:06:45 +02:00
7d3778486a
Merging Stuff Together and Fixing Stuff Brocken From Merge
2023-04-09 17:57:37 +02:00
a82210061e
Cleaning up Merge
2023-04-09 17:22:06 +02:00
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
fd552541a7
Bunny AI Done using Nav Agent
2023-04-09 16:39:45 +02:00
AXVIII3
ea9cb71f9a
Resolutions Dropdown and Typo
2023-04-09 18:34:49 +05:30
AXVIII3
9d878116f0
Music system
2023-04-09 17:47:11 +05:30
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
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
b318e7d65a
Updating Scene
2023-04-08 22:34:07 +02:00
4eb022a49c
Merge branch 'dev-art'
2023-04-08 22:27:38 +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
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
f6eb10f644
Seting Up Theme so that It can be Used
2023-04-07 20:10:23 +02:00
AXVIII3
080401b9a3
Final Player Movement \w Animations
2023-04-07 22:56:18 +05:30
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
b49f0378da
- Adding Cave Generation
...
- Placeholder Art
- Setting Physics Layer
2023-04-07 15:33:54 +02: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
