hz/ggj2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70 Commits 14 Branches 0 Tags
dadbcd0ea46ec58fcae30af6dec569c336a8c71b
Commit Graph
70 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hz dadbcd0ea4 Merge pull request 'ArtAndStress' (#32) from ArtAndStress into main 
Reviewed-on: admin/GGJ2026#32
Reviewed-by: admin <[email protected]>
 2026-01-31 20:34:10 -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
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
Josiah 4c1952d8fb Added files 2026-01-31 19:38:59 -06:00
Josiah ca622504d7 Added my new files 2026-01-31 19:31:17 -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
hz e4e385c5c2 Merge branch 'main' of https://git.ranaze.com/admin/GGJ2026 into get-tricky 2026-01-31 19:24:32 -06:00
hz c0b64e371b Having the tricks spawn after eating a treat 2026-01-31 19:24:15 -06:00
Roegner65 efd4e134bb 18 new sounds 2026-01-31 19:15:13 -06:00
hz 4d777f1c77 Merge pull request 'Candy' (#26) from tastyTreats into main 
Reviewed-on: admin/GGJ2026#26
Reviewed-by: admin <[email protected]>
 2026-01-31 19:08:12 -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
hz 7d1b387d19 Trick is now pickup-able and is not scored by baskets 2026-01-31 18:55:26 -06:00
hz c24846d568 Adding trick spawn and movement to Experiment scene 2026-01-31 18:35:14 -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
hz 61b79ae4ed Fixing players so that game pads only control one character 2026-01-31 17:45:45 -06:00
reinholzj 16159b5eff Upload files to "Assets/Art/Final Sprites" 2026-01-31 17:23:31 -06:00
Connor 0c031b558e Merge pull request 'Scoring' (#21) from Scoring into main 
Reviewed-on: admin/GGJ2026#21
Reviewed-by: Connor <[email protected]>
 2026-01-31 17:03:19 -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
reinholzj 11c2c04aca Upload files to "Assets/Art" 2026-01-31 15:58:58 -06:00
Connor f958700a1c Merge pull request 'AddingAnxiety' (#19) from AddingAnxiety into main 
Reviewed-on: admin/GGJ2026#19
Reviewed-by: Connor <[email protected]>
 2026-01-31 15:37:05 -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
roegnere 9ef0c56d3b Uploaded a bunch of sound effect files 2026-01-31 12:45:41 -06:00
reinholzj b9021c5cc9 Upload files to "Assets/Art" 2026-01-31 12:42:15 -06:00
reinholzj c73901d298 Upload files to "Assets/Art" 2026-01-31 12:27:13 -06:00
Connor ea384d8c7b Merge pull request 'Upload files to "Assets/Art"' (#16) from reinholzj-patch-2 into main 
Reviewed-on: admin/GGJ2026#16
Reviewed-by: Connor <[email protected]>
 2026-01-31 11:29:55 -06:00
reinholzj 3c52498bc0 Upload files to "Assets/Art" 2026-01-31 11:07:10 -06:00
Connor 1f8bb1d8da Merge pull request 'Couple More menu Items' (#15) from AddingAnxiety into main 
Reviewed-on: admin/GGJ2026#15
Reviewed-by: Connor <[email protected]>
 2026-01-31 10:47:26 -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
reinholzj c158357a72 Upload files to "Assets/Art" 2026-01-31 10:33:37 -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
DesignJiggles cacfcd2d53 Saved scene 2026-01-31 09:49:28 -06:00
DesignJiggles 74feba5452 Merge remote-tracking branch 'origin/main' 2026-01-31 09:48:59 -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
hz 2531c0fd0d Adding players 3 and 4 2026-01-31 09:29:49 -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
DesignJiggles 605adf4ccf Prototype level design with player movements 2026-01-30 23:53:00 -06:00