Main scene update
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Assembly-CSharp-firstpass.pidb
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass.pidb
	Assets/Materials/ÃªÃ®Ã°Ã¥Ã¸Ã®Ãª.mat
	Assets/Materials/GrapesÃ²Ã¥Ã¬Ã­Ã»Ã©.mat
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scripts/FoodCollection.cs
	Assets/Scripts/FoodCollection.cs.meta
	Assets/Scripts/TimerUpdate.cs
renamed
merged
new RALPH model. finished #2
merge and fix gitignore
???
grrr
test_shapes for sam
Merge remote-tracking branch 'origin/nick'
Befoe the RALPH integration
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Assets/Scenes/RALPH_TEST_A1.unity.meta
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scenes/food_find(Mini Game) (2).unity.meta
	Assets/Scenes/food_find(Mini Game).unity (2).meta
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/06/06a98ab734549484680b44d5c56c6212
	Library/metadata/2b/2bad404cd815cfa4f8c9cf91235fa2fe
	Library/metadata/31/31552b1c0d52b6f408ec6ab482889532
	Library/metadata/46/46eca1da5ce4a004ebe9e2c5b986d84c
	Library/metadata/65/65f07609a45012d4fa3e7330a695a071
Using new RALPH model
starting character swap (maybe)
merged?
updating gitignore
merge
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	.gitignore
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/FoodCollection.cs.meta
	Assets/Materials.meta
	Assets/Materials/Bronze.mat.meta~origin_nick.meta
	Assets/Materials/Bronze.mat.meta~origin_nick.meta~HEAD
	Assets/Models/Frying pan.3DS.meta
	Assets/Models/Materials.meta
	Assets/Models/Mushroom-1.FBX.meta
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scripts/Audio/Intro1.cs.meta
	Assets/Scripts/Materials/korzinka_soloma.mat
	Assets/Scripts/ToastScript.cs
	Assets/cooking.userprefs.meta
	Assets/food_find(Mini Game).unity.meta
	FoodCollection.cs.meta
	Library/AnnotationManager
	Library/AssetImportState
	Library/AssetServerCacheV3
	Library/BuildSettings.asset
	Library/EditorUserBuildSettings.asset
	Library/EditorUserSettings.asset
	Library/InspectorExpandedItems.asset
	Library/MonoManager.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000001000000000000000
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/02/02adc2e3e3a23b74489f29d47d4636aa
	Library/metadata/05/05c28c4caf7be294d85f265aa46746bc
	Library/metadata/06/062039008903b2841a72bee08353dbde
	Library/metadata/09/09181e77afb226642b8b021f39177b32
	Library/metadata/0a/0a114119dfc510f438b1c7c8c084e279
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	Library/metadata/0f/0f34e28c8056cc049924042cdf2d546d
	Library/metadata/0f/0faf5a7d017a84c4cb50f7d5a4ea463b
	Library/metadata/10/10afc69a6348a6b4d9726128c46efbff
	Library/metadata/13/137576083766d9442b9ed65807d12d07
	Library/metadata/13/13c37619a25efcc40acced04993ae06c
	Library/metadata/17/176ad02691404b446a188ede8ba5ec6e
	Library/metadata/18/18cb4fa7a1ac9814a9ca4810997ae0c3
	Library/metadata/19/19eba9e9ca7fea3448a2e0a81844288d
	Library/metadata/1a/1a1b859f7d8f9384ab526d28a0346012
	Library/metadata/1b/1b201ce24caa0384e91961adbd8d5741
	Library/metadata/1b/1b445c33217e1d6448753fc6615f7063
	Library/metadata/1b/1bf62eb53145a6d48b84e2a2ce407a9b
	Library/metadata/1c/1ce0a7626fcdd7949ae9fad09019025b
	Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	Library/metadata/1f/1ff953ca540dd5a459545cdc90097ddd
	Library/metadata/22/22b44f40aa6822d4eb65b095a9135f22
	Library/metadata/22/22c9071b0911d364c9c468ac5a90502c
	Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Library/metadata/25/25e3e1b7ba0c9664d8d967aff5fa37ad
	Library/metadata/26/261cdb2549ab2ec4f9d9718499835072
	Library/metadata/26/26f27a96d554ff74e804a717bfc0c526
	Library/metadata/27/277f3af517b514f7b9126bbe785f0c45
	Library/metadata/28/28f8438399f217049b9d3d92c2599654
	Library/metadata/29/290ff36d29c1e9146be8ccd428f16595
	Library/metadata/2b/2b83784f21f1adf459e83222794fd6fb
	Library/metadata/2b/2bad404cd815cfa4f8c9cf91235fa2fe
	Library/metadata/2b/2bee6953e40e4674c80a18c370ef731c
	Library/metadata/2b/2beedc9274982f742bdde9d5b094bc2b
	Library/metadata/2d/2d511b2331dae5d43b0a02a2f7afe6b9
	Library/metadata/2e/2e9e50b30dd5cf74bb8cd9bf764ccf1a
	Library/metadata/2f/2f457cf94713dad4f85995c3b9f51264
	Library/metadata/33/337624ac623eb1d459f4c198b4e2fad5
	Library/metadata/34/3424693e6965f418b8553e8be9896eb3
	Library/metadata/35/351c8343661c6e5468075ed8ed47e759
	Library/metadata/39/3986d080d3d4e4c1597d7c25ce91bef0
	Library/metadata/3c/3cf6b035ee986a7469715d0791dd783e
	Library/metadata/3e/3e8d9420bee211543b6c8fb8c5162f71
	Library/metadata/3e/3eba299145ac1f142adf204a773ed20b
	Library/metadata/3e/3ed285c2d3fc4c44897fcedd2ee37238
	Library/metadata/41/41532f9f562424c4b9d94185ea0e86a5
	Library/metadata/41/41a5c3d3f279093459ad27b1dd9a91d0
	Library/metadata/43/43ed8fb586d1c2b4f91818d74f95a13b
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/48/48c683a67d845c649a11c97b07c790e6
	Library/metadata/4a/4aacb58e524ea6e428e19e660ea32891
	Library/metadata/4a/4ae0280787c3d1d449e05e0faad1b529
	Library/metadata/4b/4be10a8f8e65a42ebac33ef74d7c6d3f
	Library/metadata/4e/4e70f2ec91814a74e8db27e5285ef569
	Library/metadata/51/5191354591dd00d47a22dc2ab917f507
	Library/metadata/52/526b1fa52a5995d40aed1ba89b80c84d
	Library/metadata/52/52a59e5669a60504f9442219d5be5a01
	Library/metadata/53/53075cb0a7669364d8083cc11407f117
	Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Library/metadata/56/569a87b846b123346ae8851ac331e87d
	Library/metadata/5a/5af082de7425cbd4691b2fcaee8e999f
	Library/metadata/5b/5b28786e755dd844cbd78e69ddd019c3
	Library/metadata/5e/5eb48883b9f274b4e8eafd7aff2ea44e
	Library/metadata/5e/5ee9e345ab22f3644ad41e32ffca4719
	Library/metadata/5f/5fcb170f12a4b4844af24eefdf1ec1f3
	Library/metadata/5f/5feb802baff27eb428310fd29801571e
	Library/metadata/5f/5ff9623c6dfbfd74faf1d46a47c2d396
	Library/metadata/60/602e24fe884473d4a90208efc03e35bd
	Library/metadata/60/606a397055700a94e97c7b99fe2bcf51
	Library/metadata/60/60a5e6541c4cc0e4194f00038e0af9c5
	Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	Library/metadata/61/61fa75d3e23dc164fb3f74c7c2ee65d6
	Library/metadata/62/6295da44eaeba0144a444589490340cd
	Library/metadata/62/62f721cdf95b6fc4da5c235a02eb0051
	Library/metadata/64/64007f8196404094985eed9bed288b1f
	Library/metadata/66/667c39c35c27e4b23989fbf5f77a7e8f
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/6a/6ad0a8f4c21118441a84d662e23d6f1c
	Library/metadata/6b/6b56533e641a12a4ca76c7c8f657f0bc
	Library/metadata/6b/6b93fcf56abe5e34b93aa951988edfb0
	Library/metadata/6d/6d947e116ae609849b52bfdaa82a11cd
	Library/metadata/71/71709fbfa7cc5144c8aab57ed9afdf56
	Library/metadata/72/729ddb93ea03dbd4abb6eeca2d64b181
	Library/metadata/79/79e4ce2e13e259d46809f2763bed8e86
	Library/metadata/7a/7a0e8a44bcacae44a92d0b49b588eb0a
	Library/metadata/7d/7d422b60e6cb19e41a6aaf739cbeeac7
	Library/metadata/7d/7dc37ad44ce6d9b4bab2ee8f7c3e4409
	Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Library/metadata/7f/7f225436b111d5e4a8a6ce6218d8fe9b
	Library/metadata/7f/7f2e1b36244097849b98989644ff586f
	Library/metadata/7f/7fcaad17d73fc40518e04c1ade814aa0
	Library/metadata/7f/7ff9c22de07a6a146a6075be0ab16731
	Library/metadata/80/807077cf5e027434ea583b091520821c
	Library/metadata/82/82dfcbc139b539449a131f652514af29
	Library/metadata/85/8500a9cdd44558647a487337fff431b8
	Library/metadata/85/85c97102b862e42489742d71c52ab9bd
	Library/metadata/88/88fbae352204d8b46b9adec2a01bf62b
	Library/metadata/89/89ac3d25a79b2b145a7d0ff0f7cc6776
	Library/metadata/8b/8bd92ab6d3e57414fac66e0977c94b7a
	Library/metadata/8c/8c5d8b5a10ce04da6bd4b2b070d3efa8
	Library/metadata/8c/8c7561d240a3dd047b07da17b888751d
	Library/metadata/8d/8d9c0ab42b3b3c44a935b54277f6b76e
	Library/metadata/8e/8ecd1711e3a1346f4a0133450e9a8b58
	Library/metadata/8e/8ed6fd0128a7d0c43824c5a4b9f490a6
	Library/metadata/91/91e30ca9d6cce8c44affaa6f186c8060
	Library/metadata/92/92222e2084e69ad46978e554b3085847
	Library/metadata/93/93086f4acc00e964d80f712c083e1548
	Library/metadata/93/930d313b87bdbed48b8b579819aea6be
	Library/metadata/93/934922355cbad894c8f66043508a5d21
	Library/metadata/94/94861d69195721e4380cd10badf4c257
	Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	Library/metadata/9c/9c8a17e6f7f46944a963bfa3643f7023
	Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	Library/metadata/9e/9e1f8c28a04c43d4aa990f32e28a411c
	Library/metadata/9e/9e75537ae0f265d4bae6f4cf05cbf610
	Library/metadata/9f/9f15660be3a844797b0e70d511336532
	Library/metadata/9f/9f5e69be417c02a4e8a24c1b4eb411cc
	Library/metadata/a0/a0eb7b90e06fb6440bebd7592c38257a
	Library/metadata/a2/a291371c993734443a6bfaa27d872a91
	Library/metadata/a3/a36f815af6df68542a6691bd7fccc275
	Library/metadata/a3/a3e359d596a6987498f1f11be09d5609
	Library/metadata/a4/a467d2491ff32724ba9a2965e9edf548
	Library/metadata/a4/a4b17b205fbfbde4b89fea6099517a12
	Library/metadata/a4/a4b1e2681ce5c41e485e4a51fb9c8abc
	Library/metadata/a4/a4bffbfe92388e14489198f7a1555362
	Library/metadata/a5/a57e1f3dfa714485384be73d3d973ca4
	Library/metadata/a8/a890f6346d22b4c4f8cba47a4ecfefea
	Library/metadata/a8/a8b469e68b8081c4b8475b25057170bd
	Library/metadata/a9/a9d6292f960f15b449abaee6c8b3c449
	Library/metadata/a9/a9f60826292e1904b8c058e3476c5f28
	Library/metadata/af/af36d6f17bea9314ca781407b5eed7e1
	Library/metadata/af/af9a1c507c5d4484fa81558fef42124f
	Library/metadata/af/afe53cba7abc30f45a8e4f209b6731fc
	Library/metadata/b1/b1a477ffd9d7eec4d93ba513b6e3bec0
	Library/metadata/b1/b1fac6e0e24b3c4469b1e558c9d4101d
	Library/metadata/b2/b2161d4ce54bd5a449257182fc1bad2c
	Library/metadata/b3/b34d82dab8d7b3d4fa8aedad924c097e
	Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Library/metadata/b4/b4421849ad06e4b4284a9fce215ebb3a
	Library/metadata/b7/b72691fe752add04ab27716be6f587c3
	Library/metadata/b7/b737de5bd171aba448e3722f2fb1f355
	Library/metadata/b7/b7d6b78099bed2848b27f1fca43a7098
	Library/metadata/b8/b8f453e890fe51343903e637939652ed
	Library/metadata/b9/b9f01bb0786547f4fbde6ddb05563e9b
	Library/metadata/bc/bc000835a44d93e4ab0087689bc22aed
	Library/metadata/bc/bc3c45abbce5b4f9589cd0dc7471c087
	Library/metadata/be/be68672c7945dc546a3dbf853e75cc22
	Library/metadata/c0/c0a1721bc88dada4499134c6db94bf8d
	Library/metadata/c4/c4cde6a229f9e384881481aae46a8212
	Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	Library/metadata/cc/cc826e7ccd03898448e63aff3e5d7f4b
	Library/metadata/cd/cd048489737fee34d8e1e669282fb93d
	Library/metadata/ce/ce30a706d820f9641b52a64e5599bd5e
	Library/metadata/ce/cef2a3ecf5bea1b46ae260f777efb13a
	Library/metadata/cf/cf5db7f6ad5e34ddd91fe3bc17a7b38f
	Library/metadata/d0/d0362491922f44e14b1ede09504df525
	Library/metadata/d0/d07830da85707b4498075300cf513cde
	Library/metadata/d0/d0d6de19c8bd7e940a5116f4c5e66d5c
	Library/metadata/d2/d2d204ed95ce00441970542257ea9d28
	Library/metadata/d4/d405e4681edd043438eb1f015b576b78
	Library/metadata/d4/d44d3c7af6d4c1e4da5723901dc23ca0
	Library/metadata/d5/d5a2ea838e9f9c844be983cd578ee837
	Library/metadata/d6/d6c9f0f62a78c684ea7ab92810056167
	Library/metadata/d9/d960366646406d94e8edaac8e2953fe7
	Library/metadata/da/da80bd77605717b43a02f787c2ade4d3
	Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	Library/metadata/de/dec1e389cac1a8a4e91a946631d11f5f
	Library/metadata/df/df79ea5e016e57f4486a948fc55197e1
	Library/metadata/df/df9425f47b27f41729108ad6a27bc000
	Library/metadata/e1/e14e91e6e6e3f1c4684f38000352beb3
	Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Library/metadata/e5/e5f210d19adf73f4790e8ab536b563b7
	Library/metadata/e6/e6c3d01f4b4f6a34d94e744a9dc68e1e
	Library/metadata/e9/e946b3452d050c545b2ddcd616e1f112
	Library/metadata/e9/e97b7daab1e325941812b33c30b12a3d
	Library/metadata/e9/e9c0479af8073b94782677482a3808b5
	Library/metadata/ea/ea283974794c94e458a2469fc9568acf
	Library/metadata/ec/ec001dfafb93de3419ba484ba6fac082
	Library/metadata/ec/ec245bb0f88172d4fb5f01e8bb53c958
	Library/metadata/ed/ed1008f2b481c47f38e0ef87a9f6d1fc
	Library/metadata/ee/eea7641cea4b1d740bba40615d9f9596
	Library/metadata/ee/eec9339dc05508143ac512a6ce0827df
	Library/metadata/ef/ef4f31d7c213b094ea80e5635ce54b16
	Library/metadata/ef/ef5e99b611ae6ba409b954eb1ef9b19a
	Library/metadata/f0/f004d331e452f634083f85eedbd33461
	Library/metadata/f0/f021347a4c6e18748b2628309bab57cd
	Library/metadata/f1/f10b9076907ea104a98ea401d3e3d6e9
	Library/metadata/f1/f11f672737d1e5e4c8a31eaf32249627
	Library/metadata/f1/f1451be7fc56abc4da66d32724fe208e
	Library/metadata/f2/f2376ecb72eabec4e96ab6ff08c6aa10
	Library/metadata/f2/f27fe42b9399022438e84e04a0bf9f7d
	Library/metadata/f5/f5ac6b42d3232e4499cd0bf3b882a8f2
	Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Library/metadata/f8/f8a8d95d7779e544288a52a83713fc21
	Library/metadata/f9/f97cfc7fbbcc4d446b2dbd9ade31bf33
	Library/metadata/f9/f9c3c82082a60bd459bd16b9fc057edd
	Library/metadata/fa/fa1e7d00903254029bc7348f4c029c50
	Library/metadata/fb/fb229684b764c55478d49c4cef528a20
	Library/metadata/fb/fb2a7bff11f4d704380cd8f1466346a8
	Library/metadata/fb/fbf738fbe917ef4419bb270a4c27dc36
	Library/metadata/fd/fdb61df02d4d86b44bcc682bafe402e3
	Library/metadata/fe/fed80f06f083fad4abc68c7de5d73215
	ProjectSettings/TagManager.asset
	cooking.userprefs
mergin
Omlette script done!