GameDev/HoppyEaster
GameDev/HoppyEaster
Archived
4
0
Fork 0
Code Issues 10 Pull requests Projects 1 Releases 2 Packages Activity Actions

Get Map Gernation in #17

Closed
Snoweuph wants to merge 85 commits from dev-base into dev-player-movement
pull from: dev-base
merge into: GameDev:dev-player-movement
Conversation 0 Commits 85 Files changed 122 +4408 -168

85 commits

Author SHA1 Message Date
Snoweuph
6c5c5138c2 Merge pull request 'dev-health-attack2' (#66) from dev-health-attack2 into dev-base 
Reviewed-on: #66
 2023-04-23 13:25:39 +00:00
Snoweuph
2a9b0bbef0 Implement Player Taking Damage 2023-04-23 15:21:22 +02:00
Snoweuph
66ae4054c6 Adding Bunny Attackspeed and Basic Attack Logic 2023-04-23 15:00:28 +02:00
Snoweuph
71e3b6ae4a Adding Damage stat to bunnys 2023-04-23 14:50:34 +02:00
Snoweuph
fe89b4a00d Improved Bunny Map collisions 2023-04-16 14:36:10 +02:00
Snoweuph
5b71f2c3de Setting up new Tileset Colliders 2023-04-16 14:28:17 +02:00
Snoweuph
6d3b64014b Merge Bugfix for #63 2023-04-16 14:13:16 +02:00
AXVIII3
2f960fc2cc Music bug fixed 2023-04-16 13:23:02 +05:30
AXVIII3
26a3226fe0 Fixed settings going brr 2023-04-16 12:48:42 +05:30
AXVIII3
c4f75e56e9 Pause Menu 2023-04-15 17:00:52 +05:30
Snoweuph
91920d15b1 Part one of Setting up Collider (it so tidoius, gonna sleep now) 2023-04-15 06:24:21 +02:00
Snoweuph
a1bdddb849 Fixing Imports 2023-04-15 06:10:43 +02:00
Snoweuph
c3e43aa5e4 Set Projectile Sounds to SFX audiobus 2023-04-15 06:09:35 +02:00
Snoweuph
ea3192a894 Repair Bunny Projectile Collisions 2023-04-15 06:08:49 +02:00
Snoweuph
2c0a0673da Update Settings Menu.tscn 2023-04-15 05:59:23 +02:00
Snoweuph
d3fd2f0a6a ReAdd Theme.tres because it was accedently removed by merge 2023-04-15 05:59:14 +02:00
Snoweuph
04d5d2422c Merge Weapon SF from branch 'dev-sfx' 
Conflicts:
	Assets/UI/Theme.tres
 2023-04-15 05:51:16 +02:00
Snoweuph
2fc9af744d Merge branch 'dev-reset-rebind' 
Conflicts:
	Assets/UI/Theme.tres
 2023-04-12 21:26:40 +02:00
Snoweuph
c0cf72a6d1 Improve Bunny AI Performance Impact 2023-04-12 21:16:14 +02:00
AXVIII3
0905212626 Added reset keybinds to default button 2023-04-12 14:18:21 +05:30
khushmmehta
a26e37d301 Audio And Stuff 2023-04-12 12:56:44 +05:30
Snoweuph
235aa27dfc Making Workflow Builds Verbose
All checks were successful
Export Game
Details
2023-04-11 20:54:12 +00:00
Snoweuph
65c832203e Merge pull request 'Ui Rebuild and Full Controller Support' (#59) from dev-base into stable
All checks were successful
Export Game
Details 
Reviewed-on: #59
 2023-04-11 20:41:54 +00:00
Snoweuph
1f24357f1f Implement Controller Aim Rebind 2023-04-11 22:39:58 +02:00
Snoweuph
47ddb86bbb Improve Remap Controller Axis Detection 2023-04-11 22:39:39 +02:00
Snoweuph
d8ec01161e Fixed Controller Rebinding to support Axis 2023-04-11 22:28:22 +02:00
Snoweuph
6fa3602b65 Improve and Partially rebuild UI 2023-04-11 21:51:55 +02:00
Snoweuph
189e20d2e4 Fix Map Generating so that player is stuck in wall 2023-04-11 21:05:44 +02:00
Snoweuph
c7a4901817 Make Tab switching Compatible with Remapping (you can now set the tab change button as an binding) 2023-04-11 21:03:25 +02:00
Snoweuph
11e59ce070 Use Input Dotproduct based Animation Choosing for Player 2023-04-11 20:52:35 +02:00
Snoweuph
006e1046a3 Fix Assigned Bottom Controll node 2023-04-11 20:49:15 +02:00
Snoweuph
376cce2b92 Minor UI Tweaks 2023-04-11 17:00:09 +02:00
Snoweuph
79f6f43502 Fixing up all the stuff about UI 2023-04-11 16:54:04 +02:00
Snoweuph
9c216a1dba Polish Menu 2023-04-11 10:33:19 +02:00
Snoweuph
9201e21c78 New assets 2023-04-11 10:03:20 +02:00
Snoweuph
d3a27af77b Controller Gamepad Suport for Rebind UI (Kindof, still needs polish) 2023-04-11 02:13:08 +02:00
Snoweuph
07aa3c846b Fixing Rebind, (With Saving) 2023-04-11 00:27:26 +02:00
Snoweuph
4ad79253b2 Merge Brocken Saving of Rempaping 2023-04-10 23:55:55 +02:00
Snoweuph
87508f9170 Merge Fix #49 2023-04-10 23:54:58 +02:00
Snoweuph
b284b325c9 Cleaning Code 2023-04-10 23:50:19 +02:00
Snoweuph
4e6c65d8ea Fixing Bunny Animations by using dot Products 2023-04-10 23:47:14 +02:00
Snoweuph
a0d1e09d91 Merge remote-tracking branch 'refs/remotes/origin/dev-bunny' 
Conflicts:
	Scenes/Main Menu.tscn
 2023-04-10 23:32:38 +02:00
Snoweuph
b69e705ea3 Fixing Up UI 2023-04-10 23:31:07 +02:00
Snoweuph
8d3196075f Merge branch 'dev-art' 
Conflicts:
	Scenes/Main Menu.tscn
 2023-04-10 22:48:49 +02:00
Snoweuph
cf7c9fcc14 Full Controller Menu Support 2023-04-10 22:46:15 +02:00
Snoweuph
02f141a6ef Code Cleaning 2023-04-10 22:19:54 +02:00
Snoweuph
b45a090d23 Controler Aim 2023-04-10 22:18:16 +02:00
Snoweuph
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
Snoweuph
53bb97d972 Improve Button Theme Animation 2023-04-10 18:37:15 +02:00
Snoweuph
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
Snoweuph
59bb7f775c Merge pull request 'New In Game Art' (#48) from dev-base into stable
All checks were successful
Export Game
Details 
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
bbeb024af5 Update ColorPallet.png to have Darker Shades 2023-04-10 13:36:15 +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
53c42acf01 Balancing 2023-04-09 23:22:44 +02:00
Snoweuph
2758e057ea No Loadingscreen Needed. actual solution: batched spawning 2023-04-09 22:45:00 +02:00
Snoweuph
a1a7e5f9d3 Merge pull request 'Getting Stuff Together' (#42) from dev-base into stable
All checks were successful
Export Game
Details 
Reviewed-on: #42
 2023-04-09 17:21:28 +00:00
Snoweuph
e09b2d0dd1 Fixing Rebind UI (Reoworking from scratch) 2023-04-09 19:06:45 +02: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
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
Snoweuph
97a49b122b Basic Wave System is Down 2023-04-09 12:01:03 +02:00
Snoweuph
128abc60b8 Update bunny spawning 2023-04-09 10:36:03 +02:00
Snoweuph
b7811cebea Merge remote-tracking branch 'refs/remotes/origin/dev-art' 2023-04-09 09:17:56 +02:00
Snoweuph
5415c7a751 Update bad_bunny_spritesheet.png and good_bunny_spritesheet.png 2023-04-09 09:17:34 +02:00
Snoweuph
50f435b5f7 Updating Testscene 
- Make Scaling Right
- Fix Players Collision Box
 2023-04-08 23:00:44 +02:00
Snoweuph
3adb32dc4a Merge branch 'dev-base'
All checks were successful
Export Game
Details 
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
e833b0b3f3 Merge pull request '„project.godot“ ändern' (#34) from snoweuph-patch-1 into stable
Some checks are pending
Export Game
Details 
Reviewed-on: #34
 2023-04-08 20:48:01 +00:00
Snoweuph
35b69a05e0 „project.godot“ ändern 2023-04-08 20:47:40 +00:00
Snoweuph
e4e4d7e30b trying to make it merge 2023-04-08 22:45:08 +02:00
Snoweuph
b318e7d65a Updating Scene 2023-04-08 22:34:07 +02:00
Snoweuph
2a814abe05 Basic Movement and Map Generation (#22)
All checks were successful
Export Game
Details 
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
f6eb10f644 Seting Up Theme so that It can be Used 2023-04-07 20:10:23 +02:00
Snoweuph
dfb751f37f Set Resize Mode 2023-04-07 19:58:16 +02:00
Snoweuph
b7ead67e58 Starting To Build UI Theme 2023-04-07 17:51:40 +02:00