GameDev/HoppyEaster
GameDev/HoppyEaster
Archived
4
0
Fork 0
Code Issues 10 Pull requests Projects 1 Releases 2 Packages Activity Actions
114 commits 7 branches 3 tags 21 MiB
Commit graph

59 commits

Author SHA1 Message Date
AXVIII3
2f960fc2cc Music bug fixed 2023-04-16 13:23:02 +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
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
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
11e59ce070 Use Input Dotproduct based Animation Choosing for Player 2023-04-11 20:52:35 +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
07aa3c846b Fixing Rebind, (With Saving) 2023-04-11 00:27:26 +02:00
Snoweuph
87508f9170 Merge Fix #49 2023-04-10 23:54:58 +02:00
Snoweuph
4e6c65d8ea Fixing Bunny Animations by using dot Products 2023-04-10 23:47:14 +02:00
Snoweuph
b69e705ea3 Fixing Up UI 2023-04-10 23:31:07 +02:00
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
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
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
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
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'
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
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)
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
fa686fb55a Merge Stuff Together, Setuped Cave in PlayerMovement Scene 2023-04-08 02:17:24 +02:00
Snoweuph
9ea57c4566 Merge remote-tracking branch 'refs/remotes/origin/dev-player-movement' 2023-04-08 01:54:37 +02:00
Snoweuph
27d1606d08 Setting Up new Tileset 2023-04-08 01:52:25 +02:00
Snoweuph
5e5c942729 Adding Bunnys, Tileset & Colorpallte 
- Removing Placeholers
- Setting Up Rule Tile
 2023-04-08 00:59:28 +02:00
Snoweuph
f6eb10f644 Seting Up Theme so that It can be Used 2023-04-07 20:10:23 +02:00