87508f9170
Merge Fix #49
2023-04-10 23:54:58 +02:00
b284b325c9
Cleaning Code
2023-04-10 23:50:19 +02:00
4e6c65d8ea
Fixing Bunny Animations by using dot Products
2023-04-10 23:47:14 +02:00
a0d1e09d91
Merge remote-tracking branch 'refs/remotes/origin/dev-bunny'
...
Conflicts:
Scenes/Main Menu.tscn
2023-04-10 23:32:38 +02:00
b69e705ea3
Fixing Up UI
2023-04-10 23:31:07 +02:00
8d3196075f
Merge branch 'dev-art'
...
Conflicts:
Scenes/Main Menu.tscn
2023-04-10 22:48:49 +02:00
cf7c9fcc14
Full Controller Menu Support
2023-04-10 22:46:15 +02:00
02f141a6ef
Code Cleaning
2023-04-10 22:19:54 +02:00
b45a090d23
Controler Aim
2023-04-10 22:18:16 +02:00
364ec9a959
Player Movement and Attack Controller support
2023-04-10 22:02:00 +02:00
AXVIII3
502820fc56
Added velocity based bunny animations but it does not feel too good
2023-04-11 01:15:25 +05:30
53bb97d972
Improve Button Theme Animation
2023-04-10 18:37:15 +02:00
4f6ef9b4c2
Create New UI Theme
2023-04-10 18:30:20 +02:00
AXVIII3
90e9391700
Music Looping fixed anf I am still trying to fix rebind save
2023-04-10 21:43:18 +05:30
c455cdecb1
Fix Folder Structure
2023-04-10 15:06:16 +02:00
f41b08dc95
Fix Folder Structure
2023-04-10 15:05:14 +02:00
51aada9bff
Fix Folder Structure
2023-04-10 15:04:48 +02:00
6aefc20f63
Update ColorPallet.png, Tileset, Bunnys, Cruzefix
2023-04-10 15:02:12 +02:00
bbeb024af5
Update ColorPallet.png to have Darker Shades
2023-04-10 13:36:15 +02:00
b6486ef57f
WIP: Work on new Tilemap (outlines only rn)
...
TODO: Shading
TODO: Update Colliders
2023-04-10 10:26:48 +02: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
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
5255092171
Update good bunny.png and good bunny.png.import
2023-04-09 17:13:18 +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
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
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
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