Commit Graph

Select branches

Hide Pull Requests

LosersCreditsSFX

destroy-player

experiment

loseScreen

main

reinholzj-main

reinholzj-patch-1

reinholzj-patch-2

reinholzj-patch-3

reinholzj-patch-4

roegnere-patch-1

treats

trick-basket-blocking

trick-enhancements

Mono Color

• dba3871a55 Merge pull request 'TrickSounds' (#51) from TrickSounds into main main Ramdar 2026-02-01 15:51:02 -06:00
• 6bed0de07b Art Walter 2026-02-01 15:49:45 -06:00
• fd0c6fea0c Merge branch 'trick-enhancements' into trick-basket-blocking trick-basket-blocking hz 2026-02-01 15:48:56 -06:00
• c3db81afe0 Art Walter 2026-02-01 15:45:18 -06:00
• f3ce39231f Merge branch 'main' into TrickSounds Walter 2026-02-01 15:45:06 -06:00
• 6e43949591 Merge branch 'main' into trick-enhancements trick-enhancements hz 2026-02-01 15:44:48 -06:00
• cb176962a9 Adding basket blocking feature hz 2026-02-01 15:41:21 -06:00
• dfd4014286 Merge pull request 'Upload files to "Assets/Art"' (#49) from reinholzj-patch-7 into main Ramdar 2026-02-01 15:39:04 -06:00
• 706c128369 Merge pull request 'Upload files to "Assets/Art"' (#47) from reinholzj-patch-6 into main Ramdar 2026-02-01 15:38:37 -06:00
• 14c99f1b7d Merge pull request 'Upload files to "Assets/Art"' (#46) from reinholzj-patch-5 into main Ramdar 2026-02-01 15:38:12 -06:00
• 5864dd15b8 added trick sounds Roegner65 2026-02-01 15:37:46 -06:00
• cb335c78ec Merge pull request 'destory bad things' (#45) from destroyTricks into main Ramdar 2026-02-01 15:37:46 -06:00
• d557e098b8 Merge pull request 'Healing' (#50) from Healing into main reinholzj 2026-02-01 15:35:37 -06:00
• 1a498ce99d Player Animations Walter 2026-02-01 15:34:36 -06:00
• b78957739c Upload files to "Assets/Art" reinholzj 2026-02-01 15:28:16 -06:00
• 6894b3a475 Merge branch 'LosersCreditsSFX' into TrickSounds Roegner65 2026-02-01 15:26:59 -06:00
• 2d38838efd Tricks can now occupy baskets and block scoring hz 2026-02-01 15:13:20 -06:00
• b09362917a Trick ehancements hz 2026-02-01 14:51:50 -06:00
• 5c158aed5e Upload files to "Assets/Art" reinholzj 2026-02-01 14:36:33 -06:00
• 7362c7f57e Merge remote-tracking branch 'origin/LosersCreditsSFX' into Healing Walter 2026-02-01 14:29:59 -06:00
• b57c4f8202 Upload files to "Assets/Art" reinholzj 2026-02-01 14:27:53 -06:00
• f57c7313c6 added self heal Walter 2026-02-01 14:27:47 -06:00
• 2aca024b1c destory bad things Josiah 2026-02-01 14:19:40 -06:00
• 8293002400 Fixed LosersCreditsSFX Roegner65 2026-02-01 14:16:31 -06:00
• 47887a3f10 Credits Menu Added Roegner65 2026-02-01 14:08:33 -06:00
• 86381e4067 Merge pull request 'Losers' (#42) from Losers into main reinholzj 2026-02-01 13:43:20 -06:00
• 659a0ffd23 No More Player Pickup Walter 2026-02-01 13:41:09 -06:00
• 64a9edf527 Merge remote-tracking branch 'origin/LosersCreditsSFX' into Losers Walter 2026-02-01 13:25:23 -06:00
• efbad01d46 Merge remote-tracking branch 'origin/Losers' into Losers Walter 2026-02-01 13:23:04 -06:00
• 2814b6c7a2 Some Nice UI Walter 2026-02-01 13:21:59 -06:00
• e5b046f4e6 Added Music to Experiment Roegner65 2026-02-01 13:06:09 -06:00
• 98a9d31c66 trick animations that work DesignJiggles 2026-02-01 12:11:19 -06:00
• 882768caad saved changes in Unity DesignJiggles 2026-02-01 11:44:07 -06:00
• 44179071da Trick animations DesignJiggles 2026-02-01 11:43:03 -06:00
• 095296d5c2 Merge remote-tracking branch 'origin/loseScreen' into Losers Walter 2026-02-01 10:04:12 -06:00
• 1b6566ef2b lose screen loseScreen Josiah 2026-02-01 09:55:27 -06:00
• ba1dd13b54 Merge pull request 'GameGui' (#40) from GameGui into main reinholzj 2026-01-31 23:25:43 -06:00
• b3ca3bc238 Merge remote-tracking branch 'origin/destroy-player' into GameGui Walter 2026-01-31 23:22:16 -06:00
• 5fba9600a9 We Win Walter 2026-01-31 23:21:33 -06:00
• 057ed2e09e Trying to fix the issue where players get pinched through the floor destroy-player hz 2026-01-31 23:07:56 -06:00
• 36d74c175a Merge remote-tracking branch 'origin/reinholzj-main' into GameGui Walter 2026-01-31 22:57:53 -06:00
• 9bb666e9e6 turned on Stress Walter 2026-01-31 22:57:47 -06:00
• 57abbad196 Merge branch 'main' into GameGui Walter 2026-01-31 22:52:05 -06:00
• 6c17bae0ed Merge pull request 'Player animations' (#37) from animation into main Ramdar 2026-01-31 22:49:51 -06:00
• efff87febc Art Assets Walter 2026-01-31 22:48:55 -06:00
• db956e62ef WinScreen reinholzj-main Josiah 2026-01-31 22:48:42 -06:00
• 93e15d2ca4 Merge branch 'main' into animation Walter 2026-01-31 22:48:38 -06:00
• 52008f078a Added layers Walter 2026-01-31 22:46:12 -06:00
• b091ae3fcd Merge pull request 'Fixing trick behavior' (#36) from get-tricky2 into main Ramdar 2026-01-31 22:43:28 -06:00
• 84e739c8f6 Player animations DesignJiggles 2026-01-31 22:35:28 -06:00
• 1f53ab8119 Added Masks Walter 2026-01-31 22:28:38 -06:00
• c47bd0fe27 yeet hz 2026-01-31 22:27:43 -06:00
• 7c4cc39998 Merge pull request 'Upload files to "Assets/Art"' (#35) from reinholzj-patch-5 into main Ramdar 2026-01-31 22:27:16 -06:00
• e6593192a7 Adding trick respawn logic hz 2026-01-31 22:03:18 -06:00
• 36422bbbc6 Adding spinning treat spawner hz 2026-01-31 21:57:16 -06:00
• 86a860126e Fixing trick behavior hz 2026-01-31 21:48:28 -06:00
• 877b84ec0e Upload files to "Assets/Art" reinholzj 2026-01-31 21:26:33 -06:00
• 31b5d74554 Merge pull request 'BugFix' (#34) from WallStickyFix into main hz 2026-01-31 21:23:45 -06:00
• 754f75b499 BugFix Walter 2026-01-31 21:22:34 -06:00
• 7fc66ca4dd Merge pull request 'get-tricky2' (#33) from get-tricky2 into main Ramdar 2026-01-31 21:16:58 -06:00
• 7d14c58071 Merge branch 'main' into get-tricky hz 2026-01-31 21:14:48 -06:00
• ec35defeb7 Trick tweaks hz 2026-01-31 21:09:59 -06:00
• 0f2a376b40 Merged Main Walter 2026-01-31 20:41:12 -06:00
• dadbcd0ea4 Merge pull request 'ArtAndStress' (#32) from ArtAndStress into main hz 2026-01-31 20:34:10 -06:00
• 29dbe99612 Merge remote-tracking branch 'origin/reinholzj-patch-5' into ArtAndStress Walter 2026-01-31 20:29:51 -06:00
• ed6ae35555 Upload files to "Assets/Art" reinholzj 2026-01-31 20:29:22 -06:00
• 70d292a309 Fixed Sprites Walter 2026-01-31 20:28:26 -06:00
• 843464eb7a increasing trick consumtion cooldown hz 2026-01-31 20:18:13 -06:00
• 7339c012c3 Removing barriers, adding trick logic, and making players pick-up-able hz 2026-01-31 20:17:28 -06:00
• 314f7b9157 Adding Art and Stress Walter 2026-01-31 20:03:45 -06:00
• 7e71567d5f Merge pull request 'reinholzj-main' (#29) from reinholzj-main into main Ramdar 2026-01-31 19:58:22 -06:00
• 14ec7e81b2 Adding treat eating cooldown hz 2026-01-31 19:44:21 -06:00
• 4c1952d8fb Added files Josiah 2026-01-31 19:38:59 -06:00
• ca622504d7 Added my new files Josiah 2026-01-31 19:31:17 -06:00
• f93e9a51b1 Merge pull request 'get-tricky' (#28) from get-tricky into main Ramdar 2026-01-31 19:27:26 -06:00
• 517cde4f8d Merge pull request '18 new sounds' (#27) from SFX_add into main Ramdar 2026-01-31 19:26:26 -06:00
• e4e385c5c2 Merge branch 'main' of https://git.ranaze.com/admin/GGJ2026 into get-tricky hz 2026-01-31 19:24:32 -06:00
• c0b64e371b Having the tricks spawn after eating a treat hz 2026-01-31 19:24:15 -06:00
• efd4e134bb 18 new sounds Roegner65 2026-01-31 19:15:13 -06:00
• 4d777f1c77 Merge pull request 'Candy' (#26) from tastyTreats into main hz 2026-01-31 19:08:12 -06:00
• 4834e92f97 Merge pull request 'Adding trick spawn and movement to Experiment scene' (#25) from get-tricky into main Ramdar 2026-01-31 19:04:26 -06:00
• 412193a74b Candy Walter 2026-01-31 18:55:27 -06:00
• 7d1b387d19 Trick is now pickup-able and is not scored by baskets hz 2026-01-31 18:55:26 -06:00
• c24846d568 Adding trick spawn and movement to Experiment scene hz 2026-01-31 18:35:14 -06:00
• 6fc7feeb0d Merge pull request 'Upload files to "Assets/Art/Final Sprites"' (#23) from reinholzj-patch-5 into main Ramdar 2026-01-31 18:08:57 -06:00
• c5916e9cde Merge pull request 'Fixing players so that game pads only control one character' (#24) from 4-player-movement-fix into main Ramdar 2026-01-31 18:08:33 -06:00
• ca081179f9 4 Players Baby Walter 2026-01-31 18:07:50 -06:00
• 61b79ae4ed Fixing players so that game pads only control one character hz 2026-01-31 17:45:45 -06:00
• 16159b5eff Upload files to "Assets/Art/Final Sprites" reinholzj 2026-01-31 17:23:31 -06:00
• 79a229a5a6 Upload files to "Assets/Final Sprites" reinholzj-patch-4 reinholzj 2026-01-31 17:17:10 -06:00
• 0c031b558e Merge pull request 'Scoring' (#21) from Scoring into main Connor 2026-01-31 17:03:19 -06:00
• e360feb06d art Walter 2026-01-31 17:01:42 -06:00
• 0a90275530 Merge remote-tracking branch 'origin/reinholzj-patch-3' into Scoring Walter 2026-01-31 17:00:34 -06:00
• 7cf2361297 Added Scoring Walter 2026-01-31 16:59:41 -06:00
• 11c2c04aca Upload files to "Assets/Art" reinholzj-patch-3 reinholzj 2026-01-31 15:58:58 -06:00
• f958700a1c Merge pull request 'AddingAnxiety' (#19) from AddingAnxiety into main Connor 2026-01-31 15:37:05 -06:00
• 77d2abd60c Merging all the things Walter 2026-01-31 15:34:32 -06:00
• 85e34297ce Merge remote-tracking branch 'origin/reinholzj-patch-1' into AddingAnxiety Walter 2026-01-31 15:30:43 -06:00
• 80e70d882b Merge remote-tracking branch 'origin/reinholzj-patch-2' into AddingAnxiety Walter 2026-01-31 15:30:12 -06:00
• a85364f07e Merge remote-tracking branch 'origin/roegnere-patch-1' into AddingAnxiety Walter 2026-01-31 15:29:51 -06:00