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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
hz
|
31b5d74554
|
Merge pull request 'BugFix' (#34) from WallStickyFix into main
Reviewed-on: admin/GGJ2026#34
Reviewed-by: admin <[email protected]>
|
2026-01-31 21:23:45 -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 |
|
hz
|
7d14c58071
|
Merge branch 'main' into get-tricky
|
2026-01-31 21:14:48 -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 |
|
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 |
|
hz
|
843464eb7a
|
increasing trick consumtion cooldown
|
2026-01-31 20:18:13 -06:00 |
|
hz
|
7339c012c3
|
Removing barriers, adding trick logic, and making players pick-up-able
|
2026-01-31 20:17:28 -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 |
|
hz
|
14ec7e81b2
|
Adding treat eating cooldown
|
2026-01-31 19:44:21 -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 |
|