Commit graph

123 commits

Author SHA1 Message Date
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
2a9b0bbef0 Implement Player Taking Damage 2023-04-23 15:21:22 +02:00
66ae4054c6 Adding Bunny Attackspeed and Basic Attack Logic 2023-04-23 15:00:28 +02:00
71e3b6ae4a Adding Damage stat to bunnys 2023-04-23 14:50:34 +02:00
fe89b4a00d Improved Bunny Map collisions 2023-04-16 14:36:10 +02:00
5b71f2c3de Setting up new Tileset Colliders 2023-04-16 14:28:17 +02:00
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
91920d15b1 Part one of Setting up Collider (it so tidoius, gonna sleep now) 2023-04-15 06:24:21 +02:00
a1bdddb849 Fixing Imports 2023-04-15 06:10:43 +02:00
c3e43aa5e4 Set Projectile Sounds to SFX audiobus 2023-04-15 06:09:35 +02:00
ea3192a894 Repair Bunny Projectile Collisions 2023-04-15 06:08:49 +02:00
2c0a0673da Update Settings Menu.tscn 2023-04-15 05:59:23 +02:00
d3fd2f0a6a ReAdd Theme.tres because it was accedently removed by merge 2023-04-15 05:59:14 +02:00
04d5d2422c Merge Weapon SF from branch 'dev-sfx'
Conflicts:
	Assets/UI/Theme.tres
2023-04-15 05:51:16 +02:00
2fc9af744d Merge branch 'dev-reset-rebind'
Conflicts:
	Assets/UI/Theme.tres
2023-04-12 21:26:40 +02:00
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
235aa27dfc Making Workflow Builds Verbose
All checks were successful
Export Game
2023-04-11 20:54:12 +00:00
65c832203e Merge pull request 'Ui Rebuild and Full Controller Support' (#59) from dev-base into stable
All checks were successful
Export Game
Reviewed-on: #59
2023-04-11 20:41:54 +00:00
1f24357f1f Implement Controller Aim Rebind 2023-04-11 22:39:58 +02:00
47ddb86bbb Improve Remap Controller Axis Detection 2023-04-11 22:39:39 +02:00
d8ec01161e Fixed Controller Rebinding to support Axis 2023-04-11 22:28:22 +02:00
6fa3602b65 Improve and Partially rebuild UI 2023-04-11 21:51:55 +02:00
189e20d2e4 Fix Map Generating so that player is stuck in wall 2023-04-11 21:05:44 +02:00
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
11e59ce070 Use Input Dotproduct based Animation Choosing for Player 2023-04-11 20:52:35 +02:00
006e1046a3 Fix Assigned Bottom Controll node 2023-04-11 20:49:15 +02:00
376cce2b92 Minor UI Tweaks 2023-04-11 17:00:09 +02:00
79f6f43502 Fixing up all the stuff about UI 2023-04-11 16:54:04 +02:00
9c216a1dba Polish Menu 2023-04-11 10:33:19 +02:00
9201e21c78 New assets 2023-04-11 10:03:20 +02:00
d3a27af77b Controller Gamepad Suport for Rebind UI (Kindof, still needs polish) 2023-04-11 02:13:08 +02:00
07aa3c846b Fixing Rebind, (With Saving) 2023-04-11 00:27:26 +02:00
4ad79253b2 Merge Brocken Saving of Rempaping 2023-04-10 23:55:55 +02:00
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