From cb23e19edd9bfc79d337d657a5dc0574e5ac5654 Mon Sep 17 00:00:00 2001 From: Bob Palmer Date: Tue, 29 Mar 2016 20:48:05 -0400 Subject: [PATCH] 1.1 --- .../WarpDrive/CHANGELOG.txt | 4 ++++ .../WarpDrive/WarpDrive.version | 16 +++++++------- .../WarpDrive/WarpEngine.dll | Bin 17408 -> 17408 bytes .../WarpEngine/USI_ModuleWarpEngine.cs | 20 +++++++++--------- .../WarpEngine/WarpEngine/WarpEngine.csproj | 8 +++++++ 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/CHANGELOG.txt index 69c1568..47a15db 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/CHANGELOG.txt @@ -1,3 +1,7 @@ +0.4.0 - 2016.03.29 +------------ +Compatibility with KSP 1.1 + 0.3.2 - 2016.01.18 ------------------ Fixed an issue with warp drive performance diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/WarpDrive.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/WarpDrive.version index d800eaa..ed68f87 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/WarpDrive.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/WarpDrive.version @@ -9,23 +9,23 @@ }, "VERSION":{ "MAJOR":0, - "MINOR":3, - "PATCH":2, + "MINOR":4, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/WarpEngine.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WarpDrive/WarpEngine.dll index 8b0601d4f23643f78a79dca9cbda64d1e9c0df29..b76954f7c4b0c39c2ddf606b0243f7b15587e6d4 100644 GIT binary patch delta 1966 zcma)-eN0t#7{{OI{LVf1yk5AxdKJ*yC4*qdRhV3qe8B|LQX(*;CTJK;0uh$D(hJiG zh^e&x6zD7VeYl1pq1R zJ1IXAF7PSY+_0Wkb}Az89vN*Sx6B$@T~x7rt=Mh z?2@J>HFYmF+E-NV0a)xHUug-PN&<)^pRb^_Xd0a_o3Wk+4v8#>x!jW%jDp{3lPbiD zHbb0)#3(qt=Nns#=#jj#C)(x zv1_j@cGVrC1fx{DYML5{Dy&lNiy0)31pA39%=m*`D!Aw_x}ZR_lLpC_pi8&QzSr$W z7l{)1j4~JwEu5y&W=OEb7-H0p^Stqu$wr*byU*GHAwsMm`ovCR7Pn_|KF3+d*&;qg z(Raiy;tp{M@qn3_a3$Cwt_KB9`DjG&1soFnw7(aV!|JT~HYxdGTeZSPaT{o`_K~o< zDfWU6!%}Ru8tzk_4u7VFW17QOw==?O6jukwgjJTqOR=WRu*#oL(ttvLSe8<%3)07i zRgI&c)QJZw=oo+q$Qc)oZKPNPy!JqCClv`N9;n@<+>nqR&OC1ZoH!yl%jgng$bsOd zr%`}tB7-<0!m$5j5|1WxrgDz|AIzg10rGj~LSvb^GO00GC|3)qP$n-CJXkCDf(M)B zZM4%>auj&rb$ONG#Si38!4F5}F2RrA$o&w&LV2^`2764Y_>N5pX zls$qQbCn_LJVQA|_I$<8S)^>HoTZAN`rBjFVNMWjv0AwxG(bqXA;dtB0xSV`Dp4$e z`;>U*fzOoyZRHr}IbtQ++pR&Sj;0pTs*m#H)m~`8bkz?vn5Cu>XR4`e8CIxcSPeF) zIZWrBlX>SDcvUT6$y62Wg;sn+?Sx|JQ7fPU`iLF4Tdm^DFJf-mb+s@T4$=a1;X7Jj zE?iLSiC5GByoE_pGwa4AEkIRi+H%%`V~8Ofr`cCLQCmrUZpm$|5{tEUtPkgDsl;01 zGHlc~2I&;kwy+}T)ZS;6ut^(at=O#{VGXcHJH`g^GtJ)C*V?zN7|xJAfWL6wBzE9^ z?F?0k`g!UQt6w5EYFCLP_1~yNhCWD~N*urv{T}(}>#{h2ZmA85pq4zrB50zr0c_PH z#JxBN{je7|>+zxox^?@uZ`bXie5kLaLG0E2;Kw1|3w}7PXVB|)lGuT#^>N}5)#ivE z{8gVMeu;PW$EgD|%ETgY8|7pVH@x)R>{FJCZcH_ni+-G7B!WK&r&Ayu?1fvg+UOCp z$o@z?kNw6c;zXL+1#udmSp$4(++*o{-ghwG>ht>1u|n7&^qW6CG|Ba&V~F0QTbxWX z(|v0~qh01f-*EfO|F7d3Gf(?QM>Wy^g8os^EaZbFR6!!M)a2XDIiqBDX;V$Dg(;Py ztDveWzy9UL^>tNsP4Kj}IDH#h-i*u4d~$56l{vQ15xMl_$M4PlYyadmBdfdnCgUWl zeSD)JXCfqlLq+pmAjh1LyGT&c>djp%7)|uU{pVO`PRSb~w3M3*^WL;vkKJX$)(Mt- K>U9idI{yZJNPg7- delta 1943 zcma)-eQZs47{|ZQ`JH=uUT<5w%1u>Vw`i@(^%8CAW@DpZciH*lbDr<>_WPaRb573k z)wFyyZCEWzX?t^17OiVOP!=3K4JZR&6+l}CHQNkyLu zEdfK{n_?nc_m}S{Ig}a1E6AWACg?u5Fg3JtK@i8KeZ?<^VfYL(JK>sW7g4M?{Mx&Q zU-dInLvPcs8f#{di8Xv^8cwiB!x^TDmx#~LM2H#0c*{>Z!M28NwqJI~_8WcA)R5~; zMFv($Zgt*vH0*WS1-FyD>s)e0<~PL;MFR*aY6UY>ZDQt0dz9oP$u}eysS`N*j=G8Y zo*HK!ceA?PPt>dHVc<%XM}+hERE_ceW@abVWpxKDy_c`*aZTL=3v2r%)jhQZHoE5c zY84)GosGYqPR2yQSC8_Os;g9I`zKXiAi}W)1Cnak>nt6Ni6!NDP7NZD-(!El%0Mft zOHb6oKpRp~Fen*Y%du1}d7^f*O2efm>JY1RbQ_Y)>~Qa8WhSOLo750H2!;kIu$Tft zCL!%VnIWUyBqNgj{|AR~j)Gw_^G&DDUD17hVuU_h$wiqSSHd(?Z$X%9^gX=OC3+`> zu~J{AL};JBQi|e(ige!fY^59>yg)f_@B-!d&a7ts zY!+fGWoV1U`;=`Ja#hS)DjI1BvzZDl|B0WsR&byDdV{E>GHabUKvh;QGtR7|I%{Ks zZ!4{xq6E#>K~aev))7%p`>iiTElyb%MH_u?`P;f|eJx6Ho9#AwAo-BlNCEpASDE%L z?vQDJ%dE40VD_?q;|_!EBg`?(HY&IOX8&wkSKG+Y8c>2bdlDsB%w=uVV5h1dQ5nVX z5$(3SsA254{bO&n{h=JQSMVS{v15qQXLbZJT(tA~^Sa7xq?`62wVi7V)G+;OKdW9K zI4^Jq!wCl}3Sk9WFgtyDr_FZj$KLfJ6POMm_+Y95gC5A;lS5C8xG diff --git a/Source/WarpEngine/WarpEngine/USI_ModuleWarpEngine.cs b/Source/WarpEngine/WarpEngine/USI_ModuleWarpEngine.cs index f4d3113..47dad7b 100644 --- a/Source/WarpEngine/WarpEngine/USI_ModuleWarpEngine.cs +++ b/Source/WarpEngine/WarpEngine/USI_ModuleWarpEngine.cs @@ -55,7 +55,7 @@ public void ToggleBubbleGuide() { var gobj = FindEditorWarpBubble(); if (gobj != null) - gobj.renderer.enabled = !gobj.renderer.enabled; + gobj.GetComponent().enabled = !gobj.GetComponent().enabled; } @@ -203,20 +203,20 @@ private void SetPartState(bool stiffenJoints) BreakingForce = vp.breakingForce, BreakingTorque = vp.breakingTorque, CrashTolerance = vp.crashTolerance, - Constraints = vp.rigidbody.constraints + Constraints = vp.GetComponent().constraints }); vp.breakingForce = Mathf.Infinity; vp.breakingTorque = Mathf.Infinity; vp.crashTolerance = Mathf.Infinity; } - vessel.rigidbody.constraints &= RigidbodyConstraints.FreezeRotation; + vessel.GetComponent().constraints &= RigidbodyConstraints.FreezeRotation; } else { print("Unstiffening"); //Stop vessel - vessel.rigidbody.AddTorque(-vessel.rigidbody.angularVelocity); + vessel.GetComponent().AddTorque(-vessel.GetComponent().angularVelocity); //Reset part state if (_shipParts != null) { @@ -225,14 +225,14 @@ private void SetPartState(bool stiffenJoints) if (vessel.parts.Contains(sp.ShipPart)) { print("[WARP] Relaxing " + sp.ShipPart.name); - sp.ShipPart.rigidbody.AddTorque(-sp.ShipPart.rigidbody.angularVelocity); + sp.ShipPart.GetComponent().AddTorque(-sp.ShipPart.GetComponent().angularVelocity); sp.ShipPart.breakingForce = sp.BreakingForce; sp.ShipPart.breakingTorque = sp.BreakingTorque; sp.ShipPart.crashTolerance = sp.CrashTolerance; - sp.ShipPart.rigidbody.constraints = sp.Constraints; + sp.ShipPart.GetComponent().constraints = sp.Constraints; } } - vessel.rigidbody.constraints &= ~RigidbodyConstraints.FreezeRotation; + vessel.GetComponent().constraints &= ~RigidbodyConstraints.FreezeRotation; } } } @@ -443,7 +443,7 @@ private void PlayWarpAnimation(float speed) //Set our color var rgb = ColorUtils.HSL2RGB(Math.Abs(speed - 1), 0.5, speed / 2); var c = new Color(rgb[0], rgb[1], rgb[2]); - warpBubble.renderer.material.SetColor("_Color", c); + warpBubble.GetComponent().material.SetColor("_Color", c); } catch (Exception) @@ -490,7 +490,7 @@ private void CheckBubbleDeployment(int speed) if (_state != StartState.Editor) { if (editorBubble != null) - editorBubble.renderer.enabled = false; + editorBubble.GetComponent().enabled = false; } } catch (Exception) @@ -502,7 +502,7 @@ private GameObject FindEditorWarpBubble() { foreach (var gobj in GameObject.FindObjectsOfType()) { - if (gobj.name == "EditorWarpBubble" && gobj.renderer != null) + if (gobj.name == "EditorWarpBubble" && gobj.GetComponent() != null) return gobj; } diff --git a/Source/WarpEngine/WarpEngine/WarpEngine.csproj b/Source/WarpEngine/WarpEngine/WarpEngine.csproj index b3add67..5d8f9e5 100644 --- a/Source/WarpEngine/WarpEngine/WarpEngine.csproj +++ b/Source/WarpEngine/WarpEngine/WarpEngine.csproj @@ -34,6 +34,10 @@ ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll False + + ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\KSPUtil.dll + False + @@ -45,6 +49,10 @@ ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll False + + ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.UI.dll + False +