Commit Graph

140 Commits (master)
 

Author SHA1 Message Date
Sascha Woitschetzki 77cb5db8b7 Merge pull request 'MoreRecipes' (#20) from MoreRecipes into master
Reviewed-on: sascha/KitchenChaos#20
2023-03-07 19:40:28 +07:00
Sascha 064fcb5c65 repair 2023-03-07 19:39:25 +07:00
Sascha b47366ae67 restore under Linux 2023-02-23 22:06:21 +07:00
DJh2o2 bcb3c45715 add meta files 2023-02-22 14:33:51 +07:00
DJh2o2 caf96c82c6 Merge pull request 'add RoyalTS' (#19) from MoreRecipes into master
Reviewed-on: sascha/KitchenChaos#19
2023-02-21 17:16:17 +07:00
DJh2o2 9fc0df5e56 Merge branch 'master' into MoreRecipes 2023-02-21 17:13:25 +07:00
Sascha f2f67752d9 add RoyalTS 2023-02-21 17:11:33 +07:00
DJh2o2 5f80085b31 Merge pull request 'resolve merge issues' (#17) from MoreRecipes into master
Reviewed-on: sascha/KitchenChaos#17
2023-02-21 17:01:13 +07:00
Sascha 940c1c9c85 resolve merge issues 2023-02-21 16:59:14 +07:00
Sascha 8f06bf6cca Merge branch 'Polish' 2023-02-21 16:50:29 +07:00
Sascha 30b026256e apply gitignore 2023-02-21 16:48:20 +07:00
Sascha f3da074d88 close unity 2023-02-21 16:48:11 +07:00
Sascha 4c4d227972 Drop files from .gitignore 2023-02-21 16:48:01 +07:00
Sascha 595fb2fb26 PR 2023-02-21 16:47:45 +07:00
Sascha 18f4be356f Bug should be solved 2023-02-21 16:47:33 +07:00
Sascha fc1bee0eab Interact with StoveCounter which contains frying meat and have bread in hand
Some if things are strange, add a lot of Debug.Log to verify
2023-02-21 16:47:24 +07:00
Sascha 140519ebcf init 2023-02-21 16:47:13 +07:00
DJh2o2 a72e77c74f Add new RecipeSOs with Bacon
Resctructering of all get; and set;
2023-02-21 16:46:51 +07:00
DJh2o2 e013319a46 reload 2023-02-21 16:46:32 +07:00
Sascha acb2c7cc28 Add BaconUncooked, BaconCooked and BaconBurned 2023-02-21 16:46:03 +07:00
Sascha 45d6e0ad83 RestartButton after GameOver 2023-02-21 16:45:39 +07:00
Sascha 823817596d Drop files from .gitignore 2023-02-21 16:44:15 +07:00
Sascha cc7bc7c045 merge 2023-02-21 16:44:14 +07:00
Sascha 7cacd303b8 apply gitignore 2023-02-21 16:40:02 +07:00
Sascha be5c1b12ac close unity 2023-02-21 11:37:10 +07:00
Sascha 25b705e9dc Drop files from .gitignore 2023-02-21 11:32:03 +07:00
Sascha 170e062358 PR 2023-02-21 11:27:54 +07:00
DJh2o2 8f081d6ae4 Merge pull request 'Solved Bug' (#14) from BreadBug into Polish
Reviewed-on: sascha/KitchenChaos#14
2023-02-21 11:23:55 +07:00
Sascha 8f402c6f58 Bug should be solved 2023-02-21 11:13:36 +07:00
Sascha a4a1a16e84 Interact with StoveCounter which contains frying meat and have bread in hand
Some if things are strange, add a lot of Debug.Log to verify
2023-02-19 11:14:26 +07:00
Sascha 87af8f2d8d init 2023-02-19 10:41:56 +07:00
DJh2o2 106e381fe1 Add new RecipeSOs with Bacon
Resctructering of all get; and set;
2023-02-17 12:22:27 +07:00
DJh2o2 f46635e31b reload 2023-02-17 09:20:56 +07:00
Sascha b15b08debe Add BaconUncooked, BaconCooked and BaconBurned 2023-02-16 16:21:13 +07:00
Sascha 07731b426b RestartButton after GameOver 2023-02-16 11:43:06 +07:00
Sascha 0334cb7dcf Drop files from .gitignore 2023-02-16 10:08:07 +07:00
Sascha Woitschetzki d21734cbfb Merge pull request 'changed to Vulkan' (#7) from LinuxBuild into master
Reviewed-on: sascha/KitchenChaos#7
2023-02-16 10:05:18 +07:00
Sascha 5c0b079c16 merge 2023-02-16 10:04:26 +07:00
Sascha faa78b15ba remove UI namespace 2023-02-16 09:28:56 +07:00
Sascha e3f31f94e8 change gitignore 2023-02-16 09:28:22 +07:00
Sascha 83ca35e9bb successfull build with vulkan on linux
rebase to Polish
2023-02-16 09:25:00 +07:00
Sascha 4feb467b23 succesfull build
rebase to Polish
2023-02-16 09:24:49 +07:00
Sascha 8fc6c4bf31 close unity
reabse to Polish
2023-02-16 09:24:39 +07:00
Sascha 6e013c91ba succesfull build
rebase to Polish
2023-02-16 09:24:27 +07:00
Sascha 5bcac72c01 successfull build with vulkan on linux 2023-02-16 09:24:17 +07:00
Sascha e20fe28427 succesfull build 2023-02-16 09:24:01 +07:00
Sascha 509977f222 merge 2023-02-16 09:23:38 +07:00
Sascha de218a7588 merge 2023-02-16 09:21:21 +07:00
Sascha cabe594ecc merge 2023-02-16 09:17:57 +07:00
Sascha 3e45869779 merge 2023-02-16 09:17:11 +07:00