Commit graph

Select branches

Hide pull requests

main

Mono Color

• 444aab72cf Update README.md main AKP 2025-03-23 18:50:36 +00:00
• dae609288a
  Code formatting AKP 2025-03-23 18:49:40 +00:00
• c57a4fb30b
  Update README.md AKP 2025-03-23 13:34:49 +00:00
• cdd563e2c2
  Update README.md AKP 2025-03-23 13:31:34 +00:00
• a5b7967c15
  Update README.md AKP 2025-03-23 13:30:29 +00:00
• 30a927f69c Merge branch 'display' AKP 2025-03-23 11:59:18 +00:00
• 6b0cef4929 toppings Joe Penny 2025-03-23 11:59:03 +00:00
• 0e733411f0
  Alter 2 files AKP 2025-03-23 11:56:29 +00:00
• f732d664ac
  Merge branch 'display' into interaction AKP 2025-03-23 11:53:57 +00:00
• f5849c6a09 Alter 6 files AKP 2025-03-23 11:52:31 +00:00
• f4b87d2d5b toppings Joe Penny 2025-03-23 11:49:54 +00:00
• b6c7db1b67 toppings Joe Penny 2025-03-23 11:47:09 +00:00
• f2581cbb91 filled tubs visually djungelsk0g 2025-03-23 11:46:47 +00:00
• 4d528d3441 toppings Joe Penny 2025-03-23 11:45:59 +00:00
• 3735581cfe toppings Joe Penny 2025-03-23 11:41:27 +00:00
• 676ffd328d fix prepare Joe Penny 2025-03-23 11:36:48 +00:00
• a4acdbae43 fix prepare Joe Penny 2025-03-23 11:36:12 +00:00
• 8a24e28faf filled tubs visually djungelsk0g 2025-03-23 11:35:47 +00:00
• e6207ad820
  Characters do things AKP 2025-03-23 11:33:14 +00:00
• 6a8cc761a7 Merge branch 'display' into interaction AKP 2025-03-23 11:24:31 +00:00
• 252e2e7d94 Merge branch 'main' into interaction AKP 2025-03-23 11:22:58 +00:00
• 549f220081
  Make people say something AKP 2025-03-23 11:20:17 +00:00
• 0b097721b4 fix prepare Joe Penny 2025-03-23 11:18:03 +00:00
• d0f91cf0e3 fix prepare Joe Penny 2025-03-23 11:17:46 +00:00
• a79dee19a7 more visuals/changes djungelsk0g 2025-03-23 11:17:22 +00:00
• c0c8ebaab5 fix prepare Joe Penny 2025-03-23 11:03:13 +00:00
• 6ff6ad704d merging Joe Penny 2025-03-23 10:48:31 +00:00
• b11ab75d45 merging Joe Penny 2025-03-23 10:48:12 +00:00
• 9b364b9db9
  fix person AKP 2025-03-23 10:47:32 +00:00
• cb5ffdc3ae merging Joe Penny 2025-03-23 10:46:44 +00:00
• ae71716a88 Update menu.py AKP 2025-03-23 01:51:23 +00:00
• edfd07c946 Delete joe.jpg AKP 2025-03-23 01:27:41 +00:00
• 9f863cd1f2 Alter 9 files AKP 2025-03-23 00:21:38 +00:00
• 768ae7db4c background djungelsk0g 2025-03-23 10:35:48 +00:00
• c8d3988f38 more design features djungelsk0g 2025-03-23 10:09:11 +00:00
• 418eb25220 counting suspicion Joe Penny 2025-03-23 10:05:19 +00:00
• d201b1f146 final saturday night changes Joe Penny 2025-03-23 02:26:30 +00:00
• e973a0a1b0 final saturday night changes Joe Penny 2025-03-23 02:26:03 +00:00
• 209ba25bb6 more textures djungelsk0g 2025-03-23 01:56:25 +00:00
• 7d4a9e8d02 tidying Joe Penny 2025-03-23 01:51:28 +00:00
• 161c56bf91 merging Joe Penny 2025-03-23 00:08:50 +00:00
• 9af6a97c99 fix lingering ingredients Joe Penny 2025-03-23 00:07:24 +00:00
• 9e4e8087fc finished ticket style djungelsk0g 2025-03-22 23:57:39 +00:00
• 32a4c18584 merging Joe Penny 2025-03-22 23:12:34 +00:00
• 85535c171e Making sandwich and checking if correct Joe Penny 2025-03-22 23:10:47 +00:00
• 065cd235f8
  Merge remote-tracking branch 'origin/display' into menu AKP 2025-03-22 18:09:52 +00:00
• 09ba5f8edf Food buttons Joe Penny 2025-03-22 18:08:42 +00:00
• aafc3e02f6
  Merge branch 'main' into menu AKP 2025-03-22 18:03:21 +00:00
• f25ef6ddf3
  Update resources.py AKP 2025-03-22 18:02:35 +00:00
• 8c82091236 Food buttons Joe Penny 2025-03-22 17:57:04 +00:00
• 286bda6b70 Food buttons Joe Penny 2025-03-22 17:56:50 +00:00
• 732d4873e5 Alter 4 files AKP 2025-03-22 17:55:38 +00:00
• 60938ea34e Food buttons Joe Penny 2025-03-22 17:53:20 +00:00
• 085cea3a10 Food buttons Joe Penny 2025-03-22 17:53:00 +00:00
• 1195e6b84f Merge branch 'main' of github.com:codemicro/birminghack-2025 djungelsk0g 2025-03-22 17:38:29 +00:00
• 0e31f58f29 added counter djungelsk0g 2025-03-22 17:38:25 +00:00
• 27d341a626
  Delete Counter.py AKP 2025-03-22 17:10:36 +00:00
• 51f34e84b0
  Integrate menu and game AKP 2025-03-22 17:10:08 +00:00
• e8dd8637c2
  Merge remote-tracking branch 'origin/display' AKP 2025-03-22 17:04:40 +00:00
• 640f0a3850 Merge branch 'menu' AKP 2025-03-22 17:03:05 +00:00
• 2bab33b413
  Alter 3 files AKP 2025-03-22 17:02:34 +00:00
• 9eb4d5d2b4 gameplay added Joe Penny 2025-03-22 17:01:54 +00:00
• f8604d2176
  Update __main__.py AKP 2025-03-22 16:40:57 +00:00
• a89a0115ed
  Add scene switching mechanism AKP 2025-03-22 16:39:41 +00:00
• 3bc0103ae8 Fix merge Joe Penny 2025-03-22 16:16:42 +00:00
• 1e21bf842d Fix merge Joe Penny 2025-03-22 16:14:23 +00:00
• 412a04d4a6 Remove need to call Button.do AKP 2025-03-22 16:13:12 +00:00
• afcc8fa433 completed sub style sprites djungelsk0g 2025-03-22 16:11:42 +00:00
• 4cd6044f6e Switch button placed Joe Penny 2025-03-22 16:11:33 +00:00
• 774ad62c80 Switch button placed Joe Penny 2025-03-22 15:58:44 +00:00
• 0e263ac7df
  Alter 6 files AKP 2025-03-22 15:56:49 +00:00
• 7176e7aa47 Counter in main Joe Penny 2025-03-22 15:34:01 +00:00
• df0ca1ee0a Counter Joe Penny 2025-03-22 15:31:01 +00:00
• f0202dd3d5 Merge branch 'main' of github.com:codemicro/birminghack-2025 djungelsk0g 2025-03-22 15:24:08 +00:00
• 648d8caa0d split into sub and ticket djungelsk0g 2025-03-22 15:22:32 +00:00
• 5c09929d7c button Joe Penny 2025-03-22 15:17:33 +00:00
• c012f22573 Merge branch 'menu' AKP 2025-03-22 15:16:00 +00:00
• b1a005dbbc
  Alter 2 files AKP 2025-03-22 15:14:03 +00:00
• e55dfb1b50
  Alter 3 files AKP 2025-03-22 15:10:30 +00:00
• 95ecbbbdfd add more sprites djungelsk0g 2025-03-22 15:06:48 +00:00
• dfb94d1ae5
  Alter 2 files AKP 2025-03-22 13:48:32 +00:00
• 6fd7488812 changed tomato to png djungelsk0g 2025-03-22 13:33:05 +00:00
• a38588ac3b Merge branch 'main' of github.com:codemicro/birminghack-2025 djungelsk0g 2025-03-22 13:24:45 +00:00
• 4a3e315674 add tomato djungelsk0g 2025-03-22 13:24:29 +00:00
• 4a172aaa79
  Alter 2 files AKP 2025-03-22 13:24:23 +00:00
• bb96c1c639
  Alter 2 files AKP 2025-03-22 13:06:13 +00:00
• d1a9c866ee
  Update main.py AKP 2025-03-22 13:01:52 +00:00
• 2e3b4f5d89
  Update main.py AKP 2025-03-22 12:54:41 +00:00
• e9e6fa7dbc
  Add pygame AKP 2025-03-22 12:47:46 +00:00
• 9e0c817bba banana djungelsk0g 2025-03-22 12:41:00 +00:00
• 7c1924088f
  Alter 5 files AKP 2025-03-22 12:30:12 +00:00