Commit Graph
105 Commits
Author SHA1 Message Date
hz fd0c6fea0c Merge branch 'trick-enhancements' into trick-basket-blocking 2026-02-01 15:48:56 -06:00
hz 6e43949591 Merge branch 'main' into trick-enhancements 2026-02-01 15:44:48 -06:00
hz cb176962a9 Adding basket blocking feature 2026-02-01 15:41:21 -06:00
Ramdar dfd4014286 Merge pull request 'Upload files to "Assets/Art"' (#49) from reinholzj-patch-7 into main
Reviewed-on: admin/GGJ2026#49
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:39:04 -06:00
Ramdar 706c128369 Merge pull request 'Upload files to "Assets/Art"' (#47) from reinholzj-patch-6 into main
Reviewed-on: admin/GGJ2026#47
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:38:37 -06:00
Ramdar 14c99f1b7d Merge pull request 'Upload files to "Assets/Art"' (#46) from reinholzj-patch-5 into main
Reviewed-on: admin/GGJ2026#46
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:38:12 -06:00
Ramdar cb335c78ec Merge pull request 'destory bad things' (#45) from destroyTricks into main
Reviewed-on: admin/GGJ2026#45
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:37:46 -06:00
Walter 1a498ce99d Player Animations 2026-02-01 15:34:36 -06:00
reinholzj b78957739c Upload files to "Assets/Art" 2026-02-01 15:28:16 -06:00
hz 2d38838efd Tricks can now occupy baskets and block scoring 2026-02-01 15:13:20 -06:00
hz b09362917a Trick ehancements 2026-02-01 14:51:50 -06:00
reinholzj 5c158aed5e Upload files to "Assets/Art" 2026-02-01 14:36:33 -06:00
Walter 7362c7f57e Merge remote-tracking branch 'origin/LosersCreditsSFX' into Healing 2026-02-01 14:29:59 -06:00
reinholzj b57c4f8202 Upload files to "Assets/Art" 2026-02-01 14:27:53 -06:00
Walter f57c7313c6 added self heal 2026-02-01 14:27:47 -06:00
Josiah 2aca024b1c destory bad things 2026-02-01 14:19:40 -06:00
Roegner65 8293002400 Fixed 2026-02-01 14:16:31 -06:00
Roegner65 47887a3f10 Credits Menu Added 2026-02-01 14:08:33 -06:00
Walter 659a0ffd23 No More Player Pickup 2026-02-01 13:41:09 -06:00
Walter 64a9edf527 Merge remote-tracking branch 'origin/LosersCreditsSFX' into Losers 2026-02-01 13:25:23 -06:00
Walter efbad01d46 Merge remote-tracking branch 'origin/Losers' into Losers 2026-02-01 13:23:04 -06:00
Walter 2814b6c7a2 Some Nice UI 2026-02-01 13:21:59 -06:00
Roegner65 e5b046f4e6 Added Music to Experiment 2026-02-01 13:06:09 -06:00
DesignJiggles 98a9d31c66 trick animations that work
Trick animations that work
2026-02-01 12:11:19 -06:00
DesignJiggles 882768caad saved changes in Unity 2026-02-01 11:44:07 -06:00
DesignJiggles 44179071da Trick animations 2026-02-01 11:43:03 -06:00
Josiah 1b6566ef2b lose screen 2026-02-01 09:55:27 -06:00
Walter b3ca3bc238 Merge remote-tracking branch 'origin/destroy-player' into GameGui 2026-01-31 23:22:16 -06:00
Walter 5fba9600a9 We Win 2026-01-31 23:21:33 -06:00
hz 057ed2e09e Trying to fix the issue where players get pinched through the floor 2026-01-31 23:07:56 -06:00
Walter 36d74c175a Merge remote-tracking branch 'origin/reinholzj-main' into GameGui 2026-01-31 22:57:53 -06:00
Walter 9bb666e9e6 turned on Stress 2026-01-31 22:57:47 -06:00
Walter 57abbad196 Merge branch 'main' into GameGui 2026-01-31 22:52:05 -06:00
Walter efff87febc Art Assets 2026-01-31 22:48:55 -06:00
Josiah db956e62ef WinScreen 2026-01-31 22:48:42 -06:00
Walter 93e15d2ca4 Merge branch 'main' into animation 2026-01-31 22:48:38 -06:00
Ramdar b091ae3fcd Merge pull request 'Fixing trick behavior' (#36) from get-tricky2 into main
Reviewed-on: admin/GGJ2026#36
Reviewed-by: Ramdar <[email protected]>
2026-01-31 22:43:28 -06:00
DesignJiggles 84e739c8f6 Player animations 2026-01-31 22:35:28 -06:00
Walter 1f53ab8119 Added Masks 2026-01-31 22:28:38 -06:00
hz c47bd0fe27 yeet 2026-01-31 22:27:43 -06:00
hz e6593192a7 Adding trick respawn logic 2026-01-31 22:03:18 -06:00
hz 36422bbbc6 Adding spinning treat spawner 2026-01-31 21:57:16 -06:00
hz 86a860126e Fixing trick behavior 2026-01-31 21:48:28 -06:00
reinholzj 877b84ec0e Upload files to "Assets/Art" 2026-01-31 21:26:33 -06:00
Walter 754f75b499 BugFix 2026-01-31 21:22:34 -06:00
hz ec35defeb7 Trick tweaks 2026-01-31 21:09:59 -06:00
Walter 0f2a376b40 Merged Main 2026-01-31 20:41:12 -06:00
Walter 29dbe99612 Merge remote-tracking branch 'origin/reinholzj-patch-5' into ArtAndStress 2026-01-31 20:29:51 -06:00
reinholzj ed6ae35555 Upload files to "Assets/Art" 2026-01-31 20:29:22 -06:00
Walter 70d292a309 Fixed Sprites 2026-01-31 20:28:26 -06:00