Updated project to unity 5, finalized terrain generation

2015-05-08 11:09:28 +03:00
parent 76527c2619
commit b1a8da324d
748 changed files with 20345 additions and 1571 deletions
--- a/Game/Library/AssetImportState
+++ b/Game/Library/AssetImportState
@ -1 +1 @@
-5;0;-1
+19;0;-1
--- a/Game/Library/AssetServerCacheV3
+++ b/Game/Library/AssetServerCacheV3
--- a/Game/Library/CurrentLayout.dwlt
+++ b/Game/Library/CurrentLayout.dwlt
--- a/Game/Library/EditorUserBuildSettings.asset
+++ b/Game/Library/EditorUserBuildSettings.asset
--- a/Game/Library/InspectorExpandedItems.asset
+++ b/Game/Library/InspectorExpandedItems.asset
--- a/Game/Library/ProjectSettings.asset
+++ b/Game/Library/ProjectSettings.asset
--- a/Game/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
+++ b/Game/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
--- a/Game/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
+++ b/Game/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
--- a/Game/Library/ScriptAssemblies/Assembly-CSharp.dll
+++ b/Game/Library/ScriptAssemblies/Assembly-CSharp.dll
--- a/Game/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
+++ b/Game/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
--- a/Game/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
+++ b/Game/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
--- a/Game/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
+++ b/Game/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
--- a/Game/Library/ScriptAssemblies/BuiltinAssemblies.stamp
+++ b/Game/Library/ScriptAssemblies/BuiltinAssemblies.stamp
@ -1,2 +1,2 @@
-0000.54eca922.0000
-0000.54eca946.0000
+0000.55154b60.0000
+0000.55154ba6.0000
--- a/Game/Library/ScriptMapper
+++ b/Game/Library/ScriptMapper
--- a/Game/Library/ShaderCache/0/00072aed2a62c7057997e041278bf1b5.bin
+++ b/Game/Library/ShaderCache/0/00072aed2a62c7057997e041278bf1b5.bin
--- a/Game/Library/ShaderCache/0/0070702fb66aa3a7d436324715fafeb3.bin
+++ b/Game/Library/ShaderCache/0/0070702fb66aa3a7d436324715fafeb3.bin
--- a/Game/Library/ShaderCache/0/00d934901179b5ff79ebc194e5f5baee.bin
+++ b/Game/Library/ShaderCache/0/00d934901179b5ff79ebc194e5f5baee.bin
--- a/Game/Library/ShaderCache/0/017b29a2b0a64f7edfe1ce6afa53dc49.bin
+++ b/Game/Library/ShaderCache/0/017b29a2b0a64f7edfe1ce6afa53dc49.bin
--- a/Game/Library/ShaderCache/0/01c549243649f334de07e5f97df607e9.bin
+++ b/Game/Library/ShaderCache/0/01c549243649f334de07e5f97df607e9.bin
--- a/Game/Library/ShaderCache/0/021def425fd40884f263a772e66c02e6.bin
+++ b/Game/Library/ShaderCache/0/021def425fd40884f263a772e66c02e6.bin
--- a/Game/Library/ShaderCache/0/02989c1c8c3d2fc8c8fe34f7a0299a60.bin
+++ b/Game/Library/ShaderCache/0/02989c1c8c3d2fc8c8fe34f7a0299a60.bin
--- a/Game/Library/ShaderCache/0/0343dd70cc0e33bd26eab068622218b2.bin
+++ b/Game/Library/ShaderCache/0/0343dd70cc0e33bd26eab068622218b2.bin
--- a/Game/Library/ShaderCache/0/0420edb4ea6b8ef0d5e7437a05876307.bin
+++ b/Game/Library/ShaderCache/0/0420edb4ea6b8ef0d5e7437a05876307.bin
--- a/Game/Library/ShaderCache/0/042d96477f7704a9387dabcf4a07de0e.bin
+++ b/Game/Library/ShaderCache/0/042d96477f7704a9387dabcf4a07de0e.bin
--- a/Game/Library/ShaderCache/0/0441fd2376f5786a5c68073ac5fc6acb.bin
+++ b/Game/Library/ShaderCache/0/0441fd2376f5786a5c68073ac5fc6acb.bin
--- a/Game/Library/ShaderCache/0/04529e61403d02d7705124f21a85bacf.bin
+++ b/Game/Library/ShaderCache/0/04529e61403d02d7705124f21a85bacf.bin
--- a/Game/Library/ShaderCache/0/0463e3f8fb84adcd1cf39ab417bb3c82.bin
+++ b/Game/Library/ShaderCache/0/0463e3f8fb84adcd1cf39ab417bb3c82.bin
--- a/Game/Library/ShaderCache/0/05915d2904f850bfa4c3683f97f258bd.bin
+++ b/Game/Library/ShaderCache/0/05915d2904f850bfa4c3683f97f258bd.bin
--- a/Game/Library/ShaderCache/0/063271fdd0c6703a7145ca861acbea9e.bin
+++ b/Game/Library/ShaderCache/0/063271fdd0c6703a7145ca861acbea9e.bin
--- a/Game/Library/ShaderCache/0/0640b9a36b927ffe72c686f0d3047c88.bin
+++ b/Game/Library/ShaderCache/0/0640b9a36b927ffe72c686f0d3047c88.bin
--- a/Game/Library/ShaderCache/0/067ad363dfc5c695fda89c6a863eda20.bin
+++ b/Game/Library/ShaderCache/0/067ad363dfc5c695fda89c6a863eda20.bin
--- a/Game/Library/ShaderCache/0/068f4c389e96eafc27bf737378a36a66.bin
+++ b/Game/Library/ShaderCache/0/068f4c389e96eafc27bf737378a36a66.bin
--- a/Game/Library/ShaderCache/0/06d012c01208d6fbf30f16d3232f4d60.bin
+++ b/Game/Library/ShaderCache/0/06d012c01208d6fbf30f16d3232f4d60.bin
--- a/Game/Library/ShaderCache/0/070f6ac94e09801f604b113afc959178.bin
+++ b/Game/Library/ShaderCache/0/070f6ac94e09801f604b113afc959178.bin
--- a/Game/Library/ShaderCache/0/075862f307b7191426790e0380dfffb7.bin
+++ b/Game/Library/ShaderCache/0/075862f307b7191426790e0380dfffb7.bin
--- a/Game/Library/ShaderCache/0/07c9cc77ddd78a22b788e23624776102.bin
+++ b/Game/Library/ShaderCache/0/07c9cc77ddd78a22b788e23624776102.bin
--- a/Game/Library/ShaderCache/0/093bba639b60edb3d6e337f59f0a205a.bin
+++ b/Game/Library/ShaderCache/0/093bba639b60edb3d6e337f59f0a205a.bin
--- a/Game/Library/ShaderCache/0/097adb856ea76576d62c38d7c8143f02.bin
+++ b/Game/Library/ShaderCache/0/097adb856ea76576d62c38d7c8143f02.bin
--- a/Game/Library/ShaderCache/0/099646d1d6d14a976e4a610a30edb3ba.bin
+++ b/Game/Library/ShaderCache/0/099646d1d6d14a976e4a610a30edb3ba.bin
--- a/Game/Library/ShaderCache/0/0a0e13ab80bf1497523585f3bfc55619.bin
+++ b/Game/Library/ShaderCache/0/0a0e13ab80bf1497523585f3bfc55619.bin
--- a/Game/Library/ShaderCache/0/0a27af3988ed668ebe392f447ae2f8ee.bin
+++ b/Game/Library/ShaderCache/0/0a27af3988ed668ebe392f447ae2f8ee.bin
--- a/Game/Library/ShaderCache/0/0b634534b07961eeaaae6327ae4f22a7.bin
+++ b/Game/Library/ShaderCache/0/0b634534b07961eeaaae6327ae4f22a7.bin
--- a/Game/Library/ShaderCache/0/0c2a32646f1926f152b065734838fe14.bin
+++ b/Game/Library/ShaderCache/0/0c2a32646f1926f152b065734838fe14.bin
--- a/Game/Library/ShaderCache/0/0c78ba89782fd9830ae63959f60075ab.bin
+++ b/Game/Library/ShaderCache/0/0c78ba89782fd9830ae63959f60075ab.bin
--- a/Game/Library/ShaderCache/0/0cbf0bc5880ee653d4c9ffa1686de686.bin
+++ b/Game/Library/ShaderCache/0/0cbf0bc5880ee653d4c9ffa1686de686.bin
--- a/Game/Library/ShaderCache/0/0db449abd035bfda31bbd64fe0342d7b.bin
+++ b/Game/Library/ShaderCache/0/0db449abd035bfda31bbd64fe0342d7b.bin
--- a/Game/Library/ShaderCache/0/0e8c63121e8e2f338184c5e7a9e9503f.bin
+++ b/Game/Library/ShaderCache/0/0e8c63121e8e2f338184c5e7a9e9503f.bin
--- a/Game/Library/ShaderCache/0/0f05937ae60079c307451a41212586b3.bin
+++ b/Game/Library/ShaderCache/0/0f05937ae60079c307451a41212586b3.bin
--- a/Game/Library/ShaderCache/0/0fa3e4aecb26a9e10f1956e364000b4c.bin
+++ b/Game/Library/ShaderCache/0/0fa3e4aecb26a9e10f1956e364000b4c.bin
--- a/Game/Library/ShaderCache/0/0fda311067ae0e94423f025e4769d0dc.bin
+++ b/Game/Library/ShaderCache/0/0fda311067ae0e94423f025e4769d0dc.bin
--- a/Game/Library/ShaderCache/1/1053c5de55c42e58f785395f70c0d161.bin
+++ b/Game/Library/ShaderCache/1/1053c5de55c42e58f785395f70c0d161.bin
--- a/Game/Library/ShaderCache/1/10f32480dc821d988ec1c6c7ca2755d0.bin
+++ b/Game/Library/ShaderCache/1/10f32480dc821d988ec1c6c7ca2755d0.bin
--- a/Game/Library/ShaderCache/1/1175a2575dc86d67151eaa7618c9d146.bin
+++ b/Game/Library/ShaderCache/1/1175a2575dc86d67151eaa7618c9d146.bin
--- a/Game/Library/ShaderCache/1/11805260a10a11dacbdf60f612bb8995.bin
+++ b/Game/Library/ShaderCache/1/11805260a10a11dacbdf60f612bb8995.bin
--- a/Game/Library/ShaderCache/1/12fb7e58482ae277ae6a1b5d236c1b81.bin
+++ b/Game/Library/ShaderCache/1/12fb7e58482ae277ae6a1b5d236c1b81.bin
--- a/Game/Library/ShaderCache/1/13050c6e8e6483dd858318c73dc12d81.bin
+++ b/Game/Library/ShaderCache/1/13050c6e8e6483dd858318c73dc12d81.bin
--- a/Game/Library/ShaderCache/1/14673517a55f8b49a48cc208f1539275.bin
+++ b/Game/Library/ShaderCache/1/14673517a55f8b49a48cc208f1539275.bin
--- a/Game/Library/ShaderCache/1/14a804a81793cd5dc428ca7d49a61f13.bin
+++ b/Game/Library/ShaderCache/1/14a804a81793cd5dc428ca7d49a61f13.bin
--- a/Game/Library/ShaderCache/1/14ff3acc990a27f6dbd3965a039e7d6a.bin
+++ b/Game/Library/ShaderCache/1/14ff3acc990a27f6dbd3965a039e7d6a.bin
--- a/Game/Library/ShaderCache/1/151e136acb5a8d1c0efa024b8877a111.bin
+++ b/Game/Library/ShaderCache/1/151e136acb5a8d1c0efa024b8877a111.bin
--- a/Game/Library/ShaderCache/1/1727f9c91410d891442c840bd0769a17.bin
+++ b/Game/Library/ShaderCache/1/1727f9c91410d891442c840bd0769a17.bin
--- a/Game/Library/ShaderCache/1/17f0ec4bc2715e9e695ad5e19c3e753f.bin
+++ b/Game/Library/ShaderCache/1/17f0ec4bc2715e9e695ad5e19c3e753f.bin
--- a/Game/Library/ShaderCache/1/1856556a6eee4520387c8f3e5e4dbbf6.bin
+++ b/Game/Library/ShaderCache/1/1856556a6eee4520387c8f3e5e4dbbf6.bin
--- a/Game/Library/ShaderCache/1/1871d168e785071d4fe7c3a52d517f87.bin
+++ b/Game/Library/ShaderCache/1/1871d168e785071d4fe7c3a52d517f87.bin
--- a/Game/Library/ShaderCache/1/19516bc8b27ca0b8a5b6e9d9549c43b3.bin
+++ b/Game/Library/ShaderCache/1/19516bc8b27ca0b8a5b6e9d9549c43b3.bin
--- a/Game/Library/ShaderCache/1/198e336b210dc589374a47cefd912f29.bin
+++ b/Game/Library/ShaderCache/1/198e336b210dc589374a47cefd912f29.bin
--- a/Game/Library/ShaderCache/1/19aaaa0b76f94eab292c9b71de697e7c.bin
+++ b/Game/Library/ShaderCache/1/19aaaa0b76f94eab292c9b71de697e7c.bin
--- a/Game/Library/ShaderCache/1/19b9c3b31d47cb9851457677b31ddcf3.bin
+++ b/Game/Library/ShaderCache/1/19b9c3b31d47cb9851457677b31ddcf3.bin
--- a/Game/Library/ShaderCache/1/1a06e9f09aca642acd76b9744dda3350.bin
+++ b/Game/Library/ShaderCache/1/1a06e9f09aca642acd76b9744dda3350.bin
--- a/Game/Library/ShaderCache/1/1a7f94ea7a92a8a8aca1e3be2186c9b9.bin
+++ b/Game/Library/ShaderCache/1/1a7f94ea7a92a8a8aca1e3be2186c9b9.bin
--- a/Game/Library/ShaderCache/1/1a83fbae9095a30101899f35a7ceb66e.bin
+++ b/Game/Library/ShaderCache/1/1a83fbae9095a30101899f35a7ceb66e.bin
--- a/Game/Library/ShaderCache/1/1ab2d2333bce04a163db1b22f694f1fb.bin
+++ b/Game/Library/ShaderCache/1/1ab2d2333bce04a163db1b22f694f1fb.bin
--- a/Game/Library/ShaderCache/1/1abc7262e6d2945f847c0946dae4a80f.bin
+++ b/Game/Library/ShaderCache/1/1abc7262e6d2945f847c0946dae4a80f.bin
--- a/Game/Library/ShaderCache/1/1ac59e850ca733de06a7bd1665bbf90e.bin
+++ b/Game/Library/ShaderCache/1/1ac59e850ca733de06a7bd1665bbf90e.bin
--- a/Game/Library/ShaderCache/1/1adfda8801598a23bdc28130109eb051.bin
+++ b/Game/Library/ShaderCache/1/1adfda8801598a23bdc28130109eb051.bin
--- a/Game/Library/ShaderCache/1/1af80a193531673234602a4e3cc903c4.bin
+++ b/Game/Library/ShaderCache/1/1af80a193531673234602a4e3cc903c4.bin
--- a/Game/Library/ShaderCache/1/1b6af8b95c439e1d6de2a3acde0b14cb.bin
+++ b/Game/Library/ShaderCache/1/1b6af8b95c439e1d6de2a3acde0b14cb.bin
--- a/Game/Library/ShaderCache/1/1bbf18d1fc0a18e24500ef7033d3fdc3.bin
+++ b/Game/Library/ShaderCache/1/1bbf18d1fc0a18e24500ef7033d3fdc3.bin
--- a/Game/Library/ShaderCache/1/1c70739d9ca7a3600a57b32b570f2fbf.bin
+++ b/Game/Library/ShaderCache/1/1c70739d9ca7a3600a57b32b570f2fbf.bin
--- a/Game/Library/ShaderCache/1/1d0820798cdf77aceeb8b8675e1ce886.bin
+++ b/Game/Library/ShaderCache/1/1d0820798cdf77aceeb8b8675e1ce886.bin
--- a/Game/Library/ShaderCache/1/1e9b2b4053fd04b588b64137df9f33bf.bin
+++ b/Game/Library/ShaderCache/1/1e9b2b4053fd04b588b64137df9f33bf.bin
--- a/Game/Library/ShaderCache/1/1ebaf91c29ca8b7aa502641f87f28604.bin
+++ b/Game/Library/ShaderCache/1/1ebaf91c29ca8b7aa502641f87f28604.bin
--- a/Game/Library/ShaderCache/1/1ecb0a1d43919b1a556f357961942a0e.bin
+++ b/Game/Library/ShaderCache/1/1ecb0a1d43919b1a556f357961942a0e.bin
--- a/Game/Library/ShaderCache/1/1f1e739fb60d807245feec8ca97638b3.bin
+++ b/Game/Library/ShaderCache/1/1f1e739fb60d807245feec8ca97638b3.bin
--- a/Game/Library/ShaderCache/1/1fa1db53ace1eddc87460ff73ba58733.bin
+++ b/Game/Library/ShaderCache/1/1fa1db53ace1eddc87460ff73ba58733.bin
--- a/Game/Library/ShaderCache/1/1face33d2e7a5faf5f0286c5ae0e9008.bin
+++ b/Game/Library/ShaderCache/1/1face33d2e7a5faf5f0286c5ae0e9008.bin
--- a/Game/Library/ShaderCache/2/202cae83ddf48354ece665523f6d0672.bin
+++ b/Game/Library/ShaderCache/2/202cae83ddf48354ece665523f6d0672.bin
--- a/Game/Library/ShaderCache/2/209a88a6acfa571efe1cc7d4f9423614.bin
+++ b/Game/Library/ShaderCache/2/209a88a6acfa571efe1cc7d4f9423614.bin
--- a/Game/Library/ShaderCache/2/20e23a923e536c1447e23c3a7bf0d764.bin
+++ b/Game/Library/ShaderCache/2/20e23a923e536c1447e23c3a7bf0d764.bin
--- a/Game/Library/ShaderCache/2/20e3e15f6868a9e34ecb90b915614d89.bin
+++ b/Game/Library/ShaderCache/2/20e3e15f6868a9e34ecb90b915614d89.bin
--- a/Game/Library/ShaderCache/2/21182dd6c9a4b52cf433d473f12af119.bin
+++ b/Game/Library/ShaderCache/2/21182dd6c9a4b52cf433d473f12af119.bin
--- a/Game/Library/ShaderCache/2/21233a79fa455e777d777ec2e32ce9aa.bin
+++ b/Game/Library/ShaderCache/2/21233a79fa455e777d777ec2e32ce9aa.bin
--- a/Game/Library/ShaderCache/2/2125d82cff2bb35af7afcc485d8561e1.bin
+++ b/Game/Library/ShaderCache/2/2125d82cff2bb35af7afcc485d8561e1.bin
--- a/Game/Library/ShaderCache/2/2129236df735c760a6417aa52ce641cf.bin
+++ b/Game/Library/ShaderCache/2/2129236df735c760a6417aa52ce641cf.bin
--- a/Game/Library/ShaderCache/2/216a54752edce5f1eb75b1383d74dbe1.bin
+++ b/Game/Library/ShaderCache/2/216a54752edce5f1eb75b1383d74dbe1.bin
--- a/Game/Library/ShaderCache/2/22aa676810f1af9bccec822a140e9871.bin
+++ b/Game/Library/ShaderCache/2/22aa676810f1af9bccec822a140e9871.bin
--- a/Game/Library/ShaderCache/2/22de5a3d470fbc1027df0fe5b273fbc4.bin
+++ b/Game/Library/ShaderCache/2/22de5a3d470fbc1027df0fe5b273fbc4.bin
--- a/Game/Library/ShaderCache/2/22ea4e4b6c4b51cc3ff97aaf80d8e33b.bin
+++ b/Game/Library/ShaderCache/2/22ea4e4b6c4b51cc3ff97aaf80d8e33b.bin
--- a/Game/Library/ShaderCache/2/230b70f00cbfbecfe166641c5203b556.bin
+++ b/Game/Library/ShaderCache/2/230b70f00cbfbecfe166641c5203b556.bin
--- a/Game/Library/ShaderCache/2/23ec78578267ea458692fe77622bd03e.bin
+++ b/Game/Library/ShaderCache/2/23ec78578267ea458692fe77622bd03e.bin
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 ;0;-1
 ;0;-1