Commit Graph
46 Commits
Author SHA1 Message Date
Walter 095296d5c2 Merge remote-tracking branch 'origin/loseScreen' into Losers 2026-02-01 10:04:12 -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
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
Ramdar 6c17bae0ed Merge pull request 'Player animations' (#37) from animation into main
Reviewed-on: admin/GGJ2026#37
Reviewed-by: Ramdar <[email protected]>
2026-01-31 22:49:51 -06:00
Walter efff87febc Art Assets 2026-01-31 22:48:55 -06:00
Walter 93e15d2ca4 Merge branch 'main' into animation 2026-01-31 22:48:38 -06:00
Walter 52008f078a Added layers 2026-01-31 22:46:12 -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
Walter 1f53ab8119 Added Masks 2026-01-31 22:28:38 -06:00
Ramdar 7c4cc39998 Merge pull request 'Upload files to "Assets/Art"' (#35) from reinholzj-patch-5 into main
Reviewed-on: admin/GGJ2026#35
Reviewed-by: Ramdar <[email protected]>
2026-01-31 22:27:16 -06:00
Walter 754f75b499 BugFix 2026-01-31 21:22:34 -06:00
Ramdar 7fc66ca4dd Merge pull request 'get-tricky2' (#33) from get-tricky2 into main
Reviewed-on: admin/GGJ2026#33
Reviewed-by: Ramdar <[email protected]>
2026-01-31 21:16:58 -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
Walter 70d292a309 Fixed Sprites 2026-01-31 20:28:26 -06:00
Walter 314f7b9157 Adding Art and Stress 2026-01-31 20:03:45 -06:00
Ramdar 7e71567d5f Merge pull request 'reinholzj-main' (#29) from reinholzj-main into main
Reviewed-on: admin/GGJ2026#29
Reviewed-by: Ramdar <[email protected]>
2026-01-31 19:58:22 -06:00
Ramdar f93e9a51b1 Merge pull request 'get-tricky' (#28) from get-tricky into main
Reviewed-on: admin/GGJ2026#28
Reviewed-by: Ramdar <[email protected]>
2026-01-31 19:27:26 -06:00
Ramdar 517cde4f8d Merge pull request '18 new sounds' (#27) from SFX_add into main
Reviewed-on: admin/GGJ2026#27
Reviewed-by: Ramdar <[email protected]>
2026-01-31 19:26:26 -06:00
Ramdar 4834e92f97 Merge pull request 'Adding trick spawn and movement to Experiment scene' (#25) from get-tricky into main
Reviewed-on: admin/GGJ2026#25
Reviewed-by: Ramdar <[email protected]>
2026-01-31 19:04:26 -06:00
Walter 412193a74b Candy 2026-01-31 18:55:27 -06:00
Ramdar 6fc7feeb0d Merge pull request 'Upload files to "Assets/Art/Final Sprites"' (#23) from reinholzj-patch-5 into main
Reviewed-on: admin/GGJ2026#23
Reviewed-by: Ramdar <[email protected]>
2026-01-31 18:08:57 -06:00
Ramdar c5916e9cde Merge pull request 'Fixing players so that game pads only control one character' (#24) from 4-player-movement-fix into main
Reviewed-on: admin/GGJ2026#24
Reviewed-by: Ramdar <[email protected]>
2026-01-31 18:08:33 -06:00
Walter ca081179f9 4 Players Baby 2026-01-31 18:07:50 -06:00
Walter e360feb06d art 2026-01-31 17:01:42 -06:00
Walter 0a90275530 Merge remote-tracking branch 'origin/reinholzj-patch-3' into Scoring 2026-01-31 17:00:34 -06:00
Walter 7cf2361297 Added Scoring
added ability to get rid of treats and increment a score
2026-01-31 16:59:41 -06:00
Walter 77d2abd60c Merging all the things
Adding in the spawning and treat picking up.
2026-01-31 15:34:32 -06:00
Walter 85e34297ce Merge remote-tracking branch 'origin/reinholzj-patch-1' into AddingAnxiety 2026-01-31 15:30:43 -06:00
Walter 80e70d882b Merge remote-tracking branch 'origin/reinholzj-patch-2' into AddingAnxiety 2026-01-31 15:30:12 -06:00
Walter a85364f07e Merge remote-tracking branch 'origin/roegnere-patch-1' into AddingAnxiety 2026-01-31 15:29:51 -06:00
Walter c759d55b91 Treat Pickup Working
got treats working and added a trick prefab
2026-01-31 12:50:24 -06:00
Ramdar d8c50e898e Merge pull request 'Upload files to "Assets/Art"' (#14) from reinholzj-patch-2 into main
Reviewed-on: admin/GGJ2026#14
Reviewed-by: Ramdar <[email protected]>
2026-01-31 10:44:34 -06:00
Walter 5ffc07fe4d Couple More menu Items 2026-01-31 10:43:00 -06:00
Ramdar 8588282498 Merge pull request 'Newscene' (#13) from Newscene into main
Reviewed-on: admin/GGJ2026#13
Reviewed-by: roegnere <[email protected]>
2026-01-31 10:04:17 -06:00
Ramdar f6cb859601 Merge pull request 'Adding players 3 and 4' (#11) from add-player-3-and-4 into main
Reviewed-on: admin/GGJ2026#11
Reviewed-by: Ramdar <[email protected]>
2026-01-31 09:42:59 -06:00
Ramdar 60ddfbfec2 Merge pull request 'Upload files to "Assets/Art"' (#9) from reinholzj-patch-2 into main
Reviewed-on: admin/GGJ2026#9
Reviewed-by: Ramdar <[email protected]>
2026-01-31 07:12:58 -06:00
Ramdar 217ece607a Merge pull request 'Adding ground-prefab' (#8) from ground-prefab into main
Reviewed-on: admin/GGJ2026#8
Reviewed-by: Ramdar <[email protected]>
2026-01-30 22:13:26 -06:00
Ramdar 39ff53f3a1 Merge pull request 'Adding 2nd player' (#6) from ai-nonsense into main
Reviewed-on: admin/GGJ2026#6
Reviewed-by: Ramdar <[email protected]>
2026-01-30 21:55:13 -06:00
Ramdar 8416fe7f09 Merge pull request 'roegnere-patch-1' (#7) from roegnere-patch-1 into main
Reviewed-on: admin/GGJ2026#7
Reviewed-by: Ramdar <[email protected]>
2026-01-30 21:53:04 -06:00
Ramdar 1ca8e3042f Merge pull request 'Upload files to "Assets/Art"' (#5) from reinholzj-patch-2 into main
Reviewed-on: admin/GGJ2026#5
Reviewed-by: Ramdar <[email protected]>
2026-01-30 21:51:32 -06:00
Ramdar 723eba06c5 Merge pull request 'Resolving error' (#3) from ai-nonsense into main
Reviewed-on: admin/GGJ2026#3
Reviewed-by: Ramdar <[email protected]>
2026-01-30 21:35:28 -06:00
Walter 4a291594da Recreated the Project 2026-01-30 20:33:20 -06:00