From 875a5c4c345b7068b1247f557189bd2c8b2ab4f7 Mon Sep 17 00:00:00 2001 From: Arthur Nishimoto Date: Thu, 18 Oct 2018 15:47:29 -0500 Subject: [PATCH] UPDATE: module-omicron v3.4 --- Assets/getReal3D.meta | 9 --- Assets/getReal3D/Resources.meta | 9 --- Assets/getReal3D/Resources/editor_config.xml | 73 ------------------ .../Resources/editor_config.xml.meta | 4 - Assets/module-omicron | 2 +- ProjectSettings/ProjectSettings.asset | Bin 39997 -> 45069 bytes ProjectSettings/ProjectVersion.txt | 3 +- 7 files changed, 3 insertions(+), 97 deletions(-) delete mode 100644 Assets/getReal3D.meta delete mode 100644 Assets/getReal3D/Resources.meta delete mode 100644 Assets/getReal3D/Resources/editor_config.xml delete mode 100644 Assets/getReal3D/Resources/editor_config.xml.meta diff --git a/Assets/getReal3D.meta b/Assets/getReal3D.meta deleted file mode 100644 index c1c75dc..0000000 --- a/Assets/getReal3D.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a1814b858ef8b3a4aa54e7389772141e -folderAsset: yes -timeCreated: 1508203678 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/getReal3D/Resources.meta b/Assets/getReal3D/Resources.meta deleted file mode 100644 index 47bdc9d..0000000 --- a/Assets/getReal3D/Resources.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5487b4eeab48e4b4cb3ebe274f5d15fe -folderAsset: yes -timeCreated: 1508203678 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/getReal3D/Resources/editor_config.xml b/Assets/getReal3D/Resources/editor_config.xml deleted file mode 100644 index e2ffd73..0000000 --- a/Assets/getReal3D/Resources/editor_config.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - diff --git a/Assets/getReal3D/Resources/editor_config.xml.meta b/Assets/getReal3D/Resources/editor_config.xml.meta deleted file mode 100644 index 3c579bf..0000000 --- a/Assets/getReal3D/Resources/editor_config.xml.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: b462574f8dbcba94695b54e4249eadc8 -TextScriptImporter: - userData: diff --git a/Assets/module-omicron b/Assets/module-omicron index 59acd2f..699ec33 160000 --- a/Assets/module-omicron +++ b/Assets/module-omicron @@ -1 +1 @@ -Subproject commit 59acd2f63e16e33e9cda0639c53b3b480b864f17 +Subproject commit 699ec33585cee56e7296be8c04f1f5b9b9eb43a0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c3f7e08c5ba93d305c7b9c784d30f30656ef9c3a..70932e34acdd3be2f9a91caedb93e69b98aba01c 100644 GIT binary patch delta 7037 zcmZ{piFZ>~5XNuX;t|gAXcbWuL}jaMfudqj2#Nx-G*Bq+n$n2Dl49DT#pMOu#R{cv z#U1y$fpq~9#U0!iz+G_{SJXd1=ezf2^5(wV$4N+jGk3o4&Aj^(!iKd)t=o(CQ0ngY zlv=%;Qfha4y|ZnPzI`rQ`{C%sqdhB2p18B$;B}27{w`7K+p;xdJ8Ofgfl9?Fw;v%K zG5Rw_sa(?X{tnMtet^T5SU$kvD=a_I;j0V})Im<5%Pu(B;hQZV=6@AH_VT>%Tw97(Kc~;ry{kIz0vp;@}0Rgw!Z-`Wrkf za4d5pP&C*GRANyM`Lh0K5&0g0@mxoqz)8$a{iU{ka54pyM_>XLcmyVLAt^A4xe<8B3YI6agcL4xa`eo(kdr*psvlnpT#(G23s zBT$WekHAc>BTrx!b5nmh>IbwhYbc;R0<*EeBXBAgk^-kOHv(7M6F8l?^3*?rc;FK_ zlM6|KvzQx!l~&+v;>sg%4)WvC5uD3)iUYBalN>MtomQZhxY~$9av#s>Mxc)C$P-90 zk15BJ}GuK7~ z{V4>t5KnZtExm{rNTU}M_Ze*g*L9@PMa+%S0oo|-ze`v^w)9fwvZa@SYXLd?%Q;^f z)gz9>l$?Ez@?&)U=|K3?Y%v0w8>gdeOP8>KGBQasV&&i)2oAY0l>+-LMga9u|lUB=uP zJ>ME#UV{GTut+*>qXmYuQ*CqwI32FhcFvbZZzAq9dNVlc1awh^XMamRKw<3roOOCD z3rM54F_%U=z#*XI>{oKWF{0>M)TlzS2Y4izjEg+3P$@vAN0cO9N0zRi}z;z+n(x;dk zqdTq9E*6kRpJpzNKBK??dz?PY3kptQ^f?H}VM^Xg*MfVDu48VD_9`)4KB{s0>}V4Rj&r!TXBH2Mm2Y4lZaI^2E#8s|%+ z!Rr+8Iei0M7m~AolesZE&Kljs0@CPa=F;d};Pm}7;`D7^Af3KL+-LM%aF5aVm>Z*K zS)=cBeHaZ2pMD>3Ksx;pTnotAf5iFH=*Pr;Mz?_LI-!o@^JgmujMEnDbQ=rEmVUxq z8vPWU4tMsSalSPAIdS{_Uv8%_C=hW$UqN6a)<~mYgXfH){0|O5-{6T3 zG8%}l&)a!{bowoEUrWCO*M&kYrT5=6xBrf?Mt|V?d80Ic+*p2O0ol@@xRCsZ#Lvu) zz&b1NOGLob-_cF|Ujr^A1%6|01YWlSzjq_>M>hh0avfR!FUw2wzxQn+0km>w*PioE z7#NJp)MXpeb(NJhGb$@nnPhE!N=;2QWg7&URx!R>fJAkL^M0iBeya06F+zaqJY9~wyllI*^`nK1%mIo9`)F)d~*>F_NPN!!H zaB6MC#T7>ni?Aw3I$b5tylJ5W8k@4|%-lq_VL>X})H1EBvvoj`udQ|CQw!5`QjO8} za>Q*j2b^|?xM(}`AW<#)&w)g>oC62!JmfeEQSVqd92rl*p~#%Vk?5QXQDl(Ry%dSChB74!p zw~msFR7knArr+?DGiLm*PfU#1GM;XrcPt9JquraBcdEquAm*K^QZOAEC^7KJ zG*x@Aj+y{c{%vQ@)!lsPmuHT;kKpbeL?4{-=^onA_2gSud)xBfU3DFsiUPRZpB|pE z@Z|eaJTe}RDzz`g-7)3E`%ugoS3aaD7PxZ@2Pww$!}vG`L3fP#V1J5v$C*!{_yNe# zV-4I}Xdw${9hq+-tPqdPITVKx@32ET`{L`4JN0}VWARKsAJ${@Tm>9Q>z%8CW9T5R yij%_k^?Vc`d%Mu1YEE-~b0fV79f;w-(r`WlWlwTDy*PQU;aOsj0Qdc delta 1968 zcmZ{lNlX+$6oy~-4AFxNcmRnjOpoF=f(xLCjJOO6E`Z{S3Mwu)FJ7yoHxm<08xBY^ z9+i`3JQx$>axgI(59rA)985fV;Xc0CuYB;FnwrdH=Bs-DS5-Y-eP_yl`P{DrxVs2o zyd3}*;`hdTm9^EmOwFS=qs>#_if^lLzxzCRH3{%L{j_6Z*z~6WJRG|e5j78AJpkc| z<;#d?nO7wsyotPsZ8`CfxbHRLH+mCaAv^&;kuAX*LM!P5n+FN#LUxVEn_`_5Bvnv7 zaxY5-6)Gr2JPxXWUJRii`W*=OV!^1LXj=01L|4W6hG#T;rmH0=p#%-WS@7Np)|3&f zjRmFo>m&#B(Jw1lFC8qHwt@|11er2|jgq4m&?ubq>jD5n*Q^OUAf%bc<2L`8E1&Ma0qO`ztdGp&#IgN% zWEM}zczt4?M9w>*Ps~%q;~afro