Commit Graph

35 Commits

Author SHA1 Message Date
b583d609e3 Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git 2024-03-12 15:34:12 +01:00
25ef87c512 Finished cooking function 2024-03-12 15:34:00 +01:00
magn9775
263534a272 button 2024-03-12 15:32:44 +01:00
magn9775
71e0cbbd17 burger 2024-03-12 15:18:35 +01:00
b213c4ef42 Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git 2024-03-12 14:57:46 +01:00
35211790a4 Cooking function can find the best dish possible 2024-03-12 14:57:25 +01:00
magn9775
2672e3417c redo 2024-03-12 14:49:26 +01:00
magn9775
e97aa65066 Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git 2024-03-12 14:46:29 +01:00
magn9775
9636ce41d3 Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git 2024-03-12 14:44:09 +01:00
magn9775
2aa0ee9681 idk 2024-03-12 14:43:55 +01:00
d668718f12 Added function that finds all possible dishes from ingredients 2024-03-12 14:42:25 +01:00
0f25538814 Fixed sprites 2024-03-12 13:55:11 +01:00
magn9775
48e5607fe4 Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git
# Conflicts:
#	Assets/Sprites/dårlig_toast.png.meta
#	Assets/Sprites/flour.png.meta
#	Assets/Sprites/meat_sauce_and_rice.png.meta
#	Assets/Sprites/onion.png.meta
#	Assets/Sprites/steak.png.meta
2024-03-12 13:52:54 +01:00
c889a936f7 Added nutrionional value 2024-03-12 13:50:20 +01:00
magn9775
a87d99b3f3 L til Noah 2024-03-12 13:49:58 +01:00
PokingPines
298949332d Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git 2024-03-06 09:44:06 +01:00
magn9775
7ef8a07560 ingridients and dishses 2024-03-06 09:43:40 +01:00
PokingPines
f3e5bac0e4 en message 2024-03-06 09:43:37 +01:00
7cd2007f53 Merge branch 'master' of git@83.89.6.135:Let-Him-Cook.git 2024-03-06 09:31:57 +01:00
90781ef559 Made ingredients part of dishes 2024-03-06 09:31:48 +01:00
magn9775
e0fd0eac43 idk L 2024-03-06 09:25:36 +01:00
1ab8cea2f5 Merge branch 'master' of git@83.89.6.135:Let-Him-Cook.git
# Conflicts:
#	Assets/Scripts/Cooking.cs
2024-03-06 09:13:38 +01:00
24948de762 Cooker collision 2024-03-06 09:12:00 +01:00
magn9775
a3e4434331 Merge branch 'master' of git@83.89.6.135:Let-Him-Cook.git 2024-03-06 09:08:19 +01:00
magn9775
2286d0ba00 Cooking? 2024-03-06 09:07:21 +01:00
e4e75988d2 idk 2024-03-06 08:49:37 +01:00
magn9775
4c2427db10 cooking 2024-03-06 08:48:48 +01:00
magn9775
94a3c53742 LL 2024-03-06 08:34:35 +01:00
9489964a79 L 2024-03-06 08:29:11 +01:00
996da7ad5c Merge branch 'master' of git@83.89.6.135:Let-Him-Cook.git 2024-02-28 09:45:27 +01:00
abeb9f28b9 Moving Chimken 2024-02-28 09:45:13 +01:00
magn9775
dbb2fcb5ab assets ig? 2024-02-28 09:42:30 +01:00
53ebf520ee Chimken 2024-02-28 09:08:39 +01:00
49d443e439 L 2024-02-28 09:00:20 +01:00
46e377c7ac Let Him Cook 2024-02-28 08:40:50 +01:00