Merge branch 'master' of https://github.com/chibicitiberiu/frica-de-gaze

Conflicts: FricaDeGaze/FricaDeGaze-csharp.sln FricaDeGaze/FricaDeGaze.sln FricaDeGaze/Library/CurrentLayout.dwlt FricaDeGaze/Library/CurrentMaximizeLayout.dwlt
2024-02-24 08:23:32 +00:00 · 2015-01-14 20:12:41 +02:00
parent 0ea76a156f 2a8d2ffe51
commit f319d12e88
172 changed files with 989 additions and 258 deletions
--- a/FricaDeGaze/Library/EditorUserBuildSettings.asset
+++ b/FricaDeGaze/Library/EditorUserBuildSettings.asset
--- a/FricaDeGaze/Library/InspectorExpandedItems.asset
+++ b/FricaDeGaze/Library/InspectorExpandedItems.asset
--- a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
+++ b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
--- a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
+++ b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
--- a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp.dll
+++ b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp.dll
--- a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
+++ b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
--- a/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
+++ b/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
--- a/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
+++ b/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
--- a/FricaDeGaze/Library/assetDatabase3
+++ b/FricaDeGaze/Library/assetDatabase3
--- a/FricaDeGaze/Library/expandedItems
+++ b/FricaDeGaze/Library/expandedItems
--- a/FricaDeGaze/Library/guidmapper
+++ b/FricaDeGaze/Library/guidmapper
--- a/FricaDeGaze/Library/metadata/00/00d7e64775d1332438c4996b372b953f
+++ b/FricaDeGaze/Library/metadata/00/00d7e64775d1332438c4996b372b953f
--- a/FricaDeGaze/Library/metadata/02/0297ba494720f704c9a00ba328669481
+++ b/FricaDeGaze/Library/metadata/02/0297ba494720f704c9a00ba328669481
--- a/FricaDeGaze/Library/metadata/04/0484c79947cb4f0478d716ea39a2a477
+++ b/FricaDeGaze/Library/metadata/04/0484c79947cb4f0478d716ea39a2a477
--- a/FricaDeGaze/Library/metadata/05/0568ecdd797316641b0203860b3929d9
+++ b/FricaDeGaze/Library/metadata/05/0568ecdd797316641b0203860b3929d9
--- a/FricaDeGaze/Library/metadata/05/05f6c978afe090d4d8f0af42a61bbe7f
+++ b/FricaDeGaze/Library/metadata/05/05f6c978afe090d4d8f0af42a61bbe7f
--- a/FricaDeGaze/Library/metadata/09/0904e339eb6fdd546b8539bd04db10ed
+++ b/FricaDeGaze/Library/metadata/09/0904e339eb6fdd546b8539bd04db10ed
--- a/FricaDeGaze/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
+++ b/FricaDeGaze/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
--- a/FricaDeGaze/Library/metadata/0c/0c2216c65b2d8cb409b1331bebd3bed8
+++ b/FricaDeGaze/Library/metadata/0c/0c2216c65b2d8cb409b1331bebd3bed8
--- a/FricaDeGaze/Library/metadata/11/1167c0a28d11119930004d8a4241aa39
+++ b/FricaDeGaze/Library/metadata/11/1167c0a28d11119930004d8a4241aa39
--- a/FricaDeGaze/Library/metadata/11/11f62baee581a48498f4d97b47844f9e
+++ b/FricaDeGaze/Library/metadata/11/11f62baee581a48498f4d97b47844f9e
--- a/FricaDeGaze/Library/metadata/16/16522f49031ff414abdf1f83f1b6a36c
+++ b/FricaDeGaze/Library/metadata/16/16522f49031ff414abdf1f83f1b6a36c
--- a/FricaDeGaze/Library/metadata/16/16dd8248d31591f4fbea40ca5d506411
+++ b/FricaDeGaze/Library/metadata/16/16dd8248d31591f4fbea40ca5d506411
--- a/FricaDeGaze/Library/metadata/19/195c271a9118d224c8562ae67cf47a66
+++ b/FricaDeGaze/Library/metadata/19/195c271a9118d224c8562ae67cf47a66
--- a/FricaDeGaze/Library/metadata/1d/1da31b5f0cf126543b66c7d9d24a574c
+++ b/FricaDeGaze/Library/metadata/1d/1da31b5f0cf126543b66c7d9d24a574c
--- a/FricaDeGaze/Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
+++ b/FricaDeGaze/Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
--- a/FricaDeGaze/Library/metadata/23/23a02ac18d11c9ffa0009c58a8ad6659
+++ b/FricaDeGaze/Library/metadata/23/23a02ac18d11c9ffa0009c58a8ad6659
--- a/FricaDeGaze/Library/metadata/24/24790edfa3167c143a45084afa6a2cf0
+++ b/FricaDeGaze/Library/metadata/24/24790edfa3167c143a45084afa6a2cf0
--- a/FricaDeGaze/Library/metadata/2c/2c29c08dd1c0b6749b7cd0fcff7a29fd
+++ b/FricaDeGaze/Library/metadata/2c/2c29c08dd1c0b6749b7cd0fcff7a29fd
--- a/FricaDeGaze/Library/metadata/2c/2c93b54a9ce1c314b809b4c11cf9cdb6
+++ b/FricaDeGaze/Library/metadata/2c/2c93b54a9ce1c314b809b4c11cf9cdb6
--- a/FricaDeGaze/Library/metadata/2f/2fd658d74558a1a4090b8cef4b940993
+++ b/FricaDeGaze/Library/metadata/2f/2fd658d74558a1a4090b8cef4b940993
--- a/FricaDeGaze/Library/metadata/30/30c27eb7e090f9942a0bea7796059bf6
+++ b/FricaDeGaze/Library/metadata/30/30c27eb7e090f9942a0bea7796059bf6
--- a/FricaDeGaze/Library/metadata/32/32ef381921b3f7f479831b042c113762
+++ b/FricaDeGaze/Library/metadata/32/32ef381921b3f7f479831b042c113762
--- a/FricaDeGaze/Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
+++ b/FricaDeGaze/Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
--- a/FricaDeGaze/Library/metadata/35/3596652f82a84a6488d81ef553a58c96
+++ b/FricaDeGaze/Library/metadata/35/3596652f82a84a6488d81ef553a58c96
--- a/FricaDeGaze/Library/metadata/39/39a8706a9bd02c64783c071fb7438ecf
+++ b/FricaDeGaze/Library/metadata/39/39a8706a9bd02c64783c071fb7438ecf
--- a/FricaDeGaze/Library/metadata/42/427ff48b098658742bdcce953d607e78
+++ b/FricaDeGaze/Library/metadata/42/427ff48b098658742bdcce953d607e78
--- a/FricaDeGaze/Library/metadata/45/454585cca07f953479b902a00ead3015
+++ b/FricaDeGaze/Library/metadata/45/454585cca07f953479b902a00ead3015
--- a/FricaDeGaze/Library/metadata/4e/4e5915773de69b14fb8e8a5f0fdd1d3d
+++ b/FricaDeGaze/Library/metadata/4e/4e5915773de69b14fb8e8a5f0fdd1d3d
--- a/FricaDeGaze/Library/metadata/4f/4fd37b2432bb6b34091e49e364de0668
+++ b/FricaDeGaze/Library/metadata/4f/4fd37b2432bb6b34091e49e364de0668
--- a/FricaDeGaze/Library/metadata/51/517a230447c0af548a7679cdf69c3e56
+++ b/FricaDeGaze/Library/metadata/51/517a230447c0af548a7679cdf69c3e56
--- a/FricaDeGaze/Library/metadata/51/51dc82ef9d11c594d000e7c9e39e7c39
+++ b/FricaDeGaze/Library/metadata/51/51dc82ef9d11c594d000e7c9e39e7c39
--- a/FricaDeGaze/Library/metadata/53/53412155bc1016547b1a77b2333c0380
+++ b/FricaDeGaze/Library/metadata/53/53412155bc1016547b1a77b2333c0380
--- a/FricaDeGaze/Library/metadata/58/5861c55756febc148902667397405ff9
+++ b/FricaDeGaze/Library/metadata/58/5861c55756febc148902667397405ff9
--- a/FricaDeGaze/Library/metadata/5b/5ba172cd3918d7c44aa6d04446119a00
+++ b/FricaDeGaze/Library/metadata/5b/5ba172cd3918d7c44aa6d04446119a00
--- a/FricaDeGaze/Library/metadata/5d/5dbdf7dfcf86afa418926ee28fab2b1d
+++ b/FricaDeGaze/Library/metadata/5d/5dbdf7dfcf86afa418926ee28fab2b1d
--- a/FricaDeGaze/Library/metadata/5f/5f75ef29233ec634facc1ba1e1f64725
+++ b/FricaDeGaze/Library/metadata/5f/5f75ef29233ec634facc1ba1e1f64725
--- a/FricaDeGaze/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
+++ b/FricaDeGaze/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
--- a/FricaDeGaze/Library/metadata/64/641bb2dce818a8a499b537a1963889ac
+++ b/FricaDeGaze/Library/metadata/64/641bb2dce818a8a499b537a1963889ac
--- a/FricaDeGaze/Library/metadata/66/661663e7fa00ae64fa29cf54677bbef4
+++ b/FricaDeGaze/Library/metadata/66/661663e7fa00ae64fa29cf54677bbef4
--- a/FricaDeGaze/Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
+++ b/FricaDeGaze/Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
--- a/FricaDeGaze/Library/metadata/67/67de91b5513a4d8489588fb65de75caa
+++ b/FricaDeGaze/Library/metadata/67/67de91b5513a4d8489588fb65de75caa
--- a/FricaDeGaze/Library/metadata/68/68287fe10cd30434b9c21ff1c55f613f
+++ b/FricaDeGaze/Library/metadata/68/68287fe10cd30434b9c21ff1c55f613f
--- a/FricaDeGaze/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
+++ b/FricaDeGaze/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
--- a/FricaDeGaze/Library/metadata/69/69680b688d11eb9d30009b3b4241aa39
+++ b/FricaDeGaze/Library/metadata/69/69680b688d11eb9d30009b3b4241aa39
--- a/FricaDeGaze/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e
+++ b/FricaDeGaze/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e
--- a/FricaDeGaze/Library/metadata/6d/6dda5f499bc82c442aab32e4a6bdbe40
+++ b/FricaDeGaze/Library/metadata/6d/6dda5f499bc82c442aab32e4a6bdbe40
--- a/FricaDeGaze/Library/metadata/6e/6e362b2e20aed9e459a1adcbb1c529ca
+++ b/FricaDeGaze/Library/metadata/6e/6e362b2e20aed9e459a1adcbb1c529ca
--- a/FricaDeGaze/Library/metadata/6e/6eef515e7c40d3244ad62dcdf6e8096a
+++ b/FricaDeGaze/Library/metadata/6e/6eef515e7c40d3244ad62dcdf6e8096a
--- a/FricaDeGaze/Library/metadata/75/752b01b0aec6184468996505d2ab8a9c
+++ b/FricaDeGaze/Library/metadata/75/752b01b0aec6184468996505d2ab8a9c
--- a/FricaDeGaze/Library/metadata/7a/7a3134e5f9749c449ad2289cfe93f5d5
+++ b/FricaDeGaze/Library/metadata/7a/7a3134e5f9749c449ad2289cfe93f5d5
--- a/FricaDeGaze/Library/metadata/7a/7a410311ab974f04d8f4e4518d2392f1
+++ b/FricaDeGaze/Library/metadata/7a/7a410311ab974f04d8f4e4518d2392f1
--- a/FricaDeGaze/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
+++ b/FricaDeGaze/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
--- a/FricaDeGaze/Library/metadata/87/87e98f563747ec04e8cd93b3fc3b1a29
+++ b/FricaDeGaze/Library/metadata/87/87e98f563747ec04e8cd93b3fc3b1a29
--- a/FricaDeGaze/Library/metadata/88/8875f087af7fc344cbb4daf5e3606444
+++ b/FricaDeGaze/Library/metadata/88/8875f087af7fc344cbb4daf5e3606444
--- a/FricaDeGaze/Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
+++ b/FricaDeGaze/Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
--- a/FricaDeGaze/Library/metadata/8c/8ca0735e520b5fc40a4e41b42fc288ea
+++ b/FricaDeGaze/Library/metadata/8c/8ca0735e520b5fc40a4e41b42fc288ea
--- a/FricaDeGaze/Library/metadata/8c/8caa437b19957a045866b84c6218a0db
+++ b/FricaDeGaze/Library/metadata/8c/8caa437b19957a045866b84c6218a0db
--- a/FricaDeGaze/Library/metadata/91/91c222ac5463b7243849bc078d53e72c
+++ b/FricaDeGaze/Library/metadata/91/91c222ac5463b7243849bc078d53e72c
--- a/FricaDeGaze/Library/metadata/93/931987be26c9646429c56f8a4692bb81
+++ b/FricaDeGaze/Library/metadata/93/931987be26c9646429c56f8a4692bb81
--- a/FricaDeGaze/Library/metadata/93/93bc7d6f0e1793c47a5f88178ecc75fe
+++ b/FricaDeGaze/Library/metadata/93/93bc7d6f0e1793c47a5f88178ecc75fe
--- a/FricaDeGaze/Library/metadata/95/956c1c0113bcd4c4388a3c239be09820
+++ b/FricaDeGaze/Library/metadata/95/956c1c0113bcd4c4388a3c239be09820
--- a/FricaDeGaze/Library/metadata/97/9785a5533d9270849a276a4bfbfa9418
+++ b/FricaDeGaze/Library/metadata/97/9785a5533d9270849a276a4bfbfa9418
--- a/FricaDeGaze/Library/metadata/99/998364551f10b174c93126406e10665f
+++ b/FricaDeGaze/Library/metadata/99/998364551f10b174c93126406e10665f
--- a/FricaDeGaze/Library/metadata/9b/9ba05f538ee36044da5cd2a4f14a8b18
+++ b/FricaDeGaze/Library/metadata/9b/9ba05f538ee36044da5cd2a4f14a8b18
--- a/FricaDeGaze/Library/metadata/9c/9c47b6421c139f34991c12875828e632
+++ b/FricaDeGaze/Library/metadata/9c/9c47b6421c139f34991c12875828e632
--- a/FricaDeGaze/Library/metadata/9d/9d2a2ce9c718dc24dae3b1ee427b27ee
+++ b/FricaDeGaze/Library/metadata/9d/9d2a2ce9c718dc24dae3b1ee427b27ee
--- a/FricaDeGaze/Library/metadata/9e/9ef26a39a400bec44a36b85fd38a2d65
+++ b/FricaDeGaze/Library/metadata/9e/9ef26a39a400bec44a36b85fd38a2d65
--- a/FricaDeGaze/Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
+++ b/FricaDeGaze/Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
--- a/FricaDeGaze/Library/metadata/a6/a6c23ad66d37f0e4c8c86d7c5293ac7c
+++ b/FricaDeGaze/Library/metadata/a6/a6c23ad66d37f0e4c8c86d7c5293ac7c
--- a/FricaDeGaze/Library/metadata/a6/a6dbb96b9d112024d000e929e39e7c39
+++ b/FricaDeGaze/Library/metadata/a6/a6dbb96b9d112024d000e929e39e7c39
--- a/FricaDeGaze/Library/metadata/a6/a6de6086ecd5fe84699b0bc7e00608a4
+++ b/FricaDeGaze/Library/metadata/a6/a6de6086ecd5fe84699b0bc7e00608a4
--- a/FricaDeGaze/Library/metadata/a7/a7aacd6607f6ecd45ad071abc741de60
+++ b/FricaDeGaze/Library/metadata/a7/a7aacd6607f6ecd45ad071abc741de60
--- a/FricaDeGaze/Library/metadata/ad/ada97eb6567e9a6498bb1160924d034a
+++ b/FricaDeGaze/Library/metadata/ad/ada97eb6567e9a6498bb1160924d034a
--- a/FricaDeGaze/Library/metadata/bb/bbba6214b1838a64ebc939ac9a08726d
+++ b/FricaDeGaze/Library/metadata/bb/bbba6214b1838a64ebc939ac9a08726d
--- a/FricaDeGaze/Library/metadata/bb/bbc9fde9047893846b7a5d96a9f2fb35
+++ b/FricaDeGaze/Library/metadata/bb/bbc9fde9047893846b7a5d96a9f2fb35
--- a/FricaDeGaze/Library/metadata/be/be7c377d128f1ff46a22853ecdb9e6d1
+++ b/FricaDeGaze/Library/metadata/be/be7c377d128f1ff46a22853ecdb9e6d1
--- a/FricaDeGaze/Library/metadata/c4/c419698c0038a6e40868e7a0da6198dd
+++ b/FricaDeGaze/Library/metadata/c4/c419698c0038a6e40868e7a0da6198dd
--- a/FricaDeGaze/Library/metadata/c6/c64c7d6dbb8aa1049b06acc13410688f
+++ b/FricaDeGaze/Library/metadata/c6/c64c7d6dbb8aa1049b06acc13410688f
--- a/FricaDeGaze/Library/metadata/c7/c76b3032d5d1c9e47a4f64134730c565
+++ b/FricaDeGaze/Library/metadata/c7/c76b3032d5d1c9e47a4f64134730c565
--- a/FricaDeGaze/Library/metadata/c8/c8223ea34b68a7c4eaa0faa97c3e6d15
+++ b/FricaDeGaze/Library/metadata/c8/c8223ea34b68a7c4eaa0faa97c3e6d15
--- a/FricaDeGaze/Library/metadata/c8/c8d7b6d00b9e9fb41820f68dd8bb7eef
+++ b/FricaDeGaze/Library/metadata/c8/c8d7b6d00b9e9fb41820f68dd8bb7eef
--- a/FricaDeGaze/Library/metadata/cb/cb590ec5fc2eabb48b6d30c0abecea34
+++ b/FricaDeGaze/Library/metadata/cb/cb590ec5fc2eabb48b6d30c0abecea34
--- a/FricaDeGaze/Library/metadata/cc/cc2e0695659497144afe5a45ed3227ea
+++ b/FricaDeGaze/Library/metadata/cc/cc2e0695659497144afe5a45ed3227ea
--- a/FricaDeGaze/Library/metadata/d1/d12adab5d9699aa48a8fd9a05c04daf8
+++ b/FricaDeGaze/Library/metadata/d1/d12adab5d9699aa48a8fd9a05c04daf8
--- a/FricaDeGaze/Library/metadata/d4/d4d16ca3d56fb7142a32d49bbd323836
+++ b/FricaDeGaze/Library/metadata/d4/d4d16ca3d56fb7142a32d49bbd323836
--- a/FricaDeGaze/Library/metadata/d7/d778192052093ff488fa5fa4c8ba70a3
+++ b/FricaDeGaze/Library/metadata/d7/d778192052093ff488fa5fa4c8ba70a3
--- a/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932
+++ b/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932
--- a/FricaDeGaze/Library/metadata/da/da976b1a4f7ebb949b0f71341e4f1821
+++ b/FricaDeGaze/Library/metadata/da/da976b1a4f7ebb949b0f71341e4f1821
--- a/FricaDeGaze/Library/metadata/db/db6ded423daf6e449ac50a3e1f99a36a
+++ b/FricaDeGaze/Library/metadata/db/db6ded423daf6e449ac50a3e1f99a36a
--- a/Show More
+++ b/Show More