Skip to content

Commit

Permalink
Upgraded to ModTools from 0.9.508. Release v0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Wheeler committed Dec 19, 2020
1 parent 058ca25 commit f1cd702
Show file tree
Hide file tree
Showing 31 changed files with 1,256 additions and 266 deletions.
2 changes: 1 addition & 1 deletion Assets/ModData.asset
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MonoBehaviour:
_steamTitle:
_steamVisibility: 0
_versionMajor: 0
_versionMinor: 3
_versionMinor: 4
_partCategories: []
_parts: []
_partStyleExtensions: []
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/Jundroo.ModTools.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/ModApi.Core.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/ModApi.Editor.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/ModApi.dll
Binary file not shown.
233 changes: 215 additions & 18 deletions Assets/ModTools/Assemblies/EditorAssemblies/ModApi.xml

Large diffs are not rendered by default.

Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/Packages.dll
Binary file not shown.
Binary file not shown.
504 changes: 395 additions & 109 deletions Assets/ModTools/Assemblies/EditorAssemblies/SimpleRockets2.xml

Large diffs are not rendered by default.

Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/ThirdParty.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/XmlLayout.Editor.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/EditorAssemblies/XmlLayout.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/Jundroo.ModTools.Core.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/Jundroo.ModTools.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/ModApi.Core.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/ModApi.dll
Binary file not shown.
233 changes: 215 additions & 18 deletions Assets/ModTools/Assemblies/ModApi.xml

Large diffs are not rendered by default.

Binary file modified Assets/ModTools/Assemblies/Packages.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/SimpleRockets2.dll
Binary file not shown.
504 changes: 395 additions & 109 deletions Assets/ModTools/Assemblies/SimpleRockets2.xml

Large diffs are not rendered by default.

Binary file modified Assets/ModTools/Assemblies/ThirdParty.dll
Binary file not shown.
Binary file modified Assets/ModTools/Assemblies/XmlLayout.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions Assets/ModTools/Parts/Parts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1844,9 +1844,9 @@
</PartStyles>
</Part>
<Part name="Label">
<PartType id="Label1" includeInBodyDrag="true" name="Label" prefabPath="Craft/Parts/Prefabs/Label1.prefab" mass="0" price="0" partCollisions="Default" defaultMaterials="0,1,2,3,4" subpartsSharePartStyle="false" stylesShareHeader="false">
<PartType id="Label1" includeInBodyDrag="true" name="Label" prefabPath="Craft/Parts/Prefabs/Label1.prefab" mass="0" price="0" partCollisions="Default" defaultMaterials="1,1,2,3,4" subpartsSharePartStyle="false" stylesShareHeader="false">
<Modifiers>
<Config autoActivateIfNoStageOrActivationGroup="true" buoyancyBaseScale="1" buoyancyUserScale="1" centerOfMass="0,0,0" collisionDisconnectImpulse="1000" collisionDisconnectVelocity="15" collisionExplodeImpulse="2000" collisionExplodeVelocity="30" collisionPreventExternalDisconnections="false" collisionVelocityMode="NormalOnly" dragScale="1" fuelLine="false" heatShield="0" includeInDrag="true" inertiaTensorBaseScale="1" inertiaTensorMin="0.05" inertiaTensorUserScale="1" massScale="1" maxDamage="100" maxTemperature="1500" occlusion="Auto" partCollisionHandling="Default" partCollisionResponse="Default" partScale="1,1,1" preventDebris="false" raiseWaterEventsEvenIfNotBuoyant="false" renderQueue="Default" stageActivationType="None" supportsActivation="false" thermalMassRatio="1" inspectorEnabled="true" partPropertiesEnabled="true" staticPriceAndMass="false" />
<Config autoActivateIfNoStageOrActivationGroup="true" buoyancyBaseScale="1" buoyancyUserScale="1" centerOfMass="0,0,0" collisionDisconnectImpulse="1000" collisionDisconnectVelocity="15" collisionExplodeImpulse="2000" collisionExplodeVelocity="30" collisionPreventExternalDisconnections="false" collisionVelocityMode="NormalOnly" dragScale="1" fuelLine="false" heatShield="0" includeInDrag="true" inertiaTensorBaseScale="1" inertiaTensorMin="0.05" inertiaTensorUserScale="1" massScale="1" maxDamage="100" maxTemperature="1500" occlusion="Auto" partCollisionHandling="Default" partCollisionResponse="Default" partScale="1,1,1" preventDebris="false" raiseWaterEventsEvenIfNotBuoyant="false" renderQueue="Default" stageActivationType="None" supportsActivation="false" supportsTransparency="true" thermalMassRatio="1" inspectorEnabled="true" partPropertiesEnabled="true" staticPriceAndMass="false" />
<Label designText="Text" fontSize="1" height="0.5" horizontalAlignment="Center" verticalAlignment="Middle" width="1" inspectorEnabled="true" partPropertiesEnabled="true" staticPriceAndMass="false" />
</Modifiers>
<AttachPoints>
Expand Down
4 changes: 2 additions & 2 deletions Assets/ModTools/Parts/PrefabData/Cockpit1.prefab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<GameObject name="Cockpit1" path="Craft/Parts/Prefabs/Cockpit1.prefab">
<GameObject name="CrewExit_forReferenceOnly" />
<GameObject name="Collider">
<Component type="UnityEngine.BoxCollider" />
<Component type="ModApi.Craft.Parts.PartColliderScript" />
<Component type="UnityEngine.MeshCollider" />
</GameObject>
<GameObject name="CockPit1">
<GameObject name="CockpitBase">
Expand Down Expand Up @@ -37,7 +37,7 @@
<Component type="UnityEngine.MeshRenderer" />
<Component type="ModApi.Craft.Parts.PartMeshScript" />
<Component type="ModApi.Craft.Parts.DepthMaskScript" />
<Component type="UnityEngine.CapsuleCollider" />
<Component type="UnityEngine.BoxCollider" />
</GameObject>
<GameObject name="Joystick">
<Component type="UnityEngine.MeshFilter" />
Expand Down
4 changes: 4 additions & 0 deletions Assets/ModTools/UI/Xml/Design/MenuPanel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
<TextMeshPro text="REPORT A BUG" />
</Button>
<Image class="separator" />
<Button class="btn" rectAlignment="LowerLeft" onClick="OnLaunchLocationButtonClicked();" tooltip="Change the current launch location.">
<TextMeshPro text="LAUNCH LOCATION" />
</Button>
<Image class="separator" />
<Button class="btn audio-btn-big" rectAlignment="LowerLeft" onClick="OnExitButtonClicked();" tooltip="Exit the designer back to the main menu.">
<TextMeshPro text="EXIT" />
</Button>
Expand Down
5 changes: 4 additions & 1 deletion Assets/ModTools/UI/Xml/Design/PaintPanel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,13 @@
<Slider id="detail-slider" />
</Panel>
<Panel class="slider">
<TextMeshPro class="label tooltip" text="Transparency" tooltip="The transparency strength for the current color" />
<TextMeshPro class="label tooltip" text="Transparency" tooltip="The transparency strength for the current color. This can cause some parts to render in strange and mysterious ways, so use with caution." />
<TextMeshPro id="transparency-slider-text" class="value" text="None" />
<Slider id="transparency-slider" />
</Panel>
<Button id="unlock-transparency" class="btn btn-primary" onClick="OnUnlockTransparencyButtonClicked();" tooltip="Unlock the transparency slider.">
<TextMeshPro text="UNLOCK TRANSPARENCY" />
</Button>
</VerticalLayout>
</VerticalLayout>
</VerticalScrollView>
Expand Down
6 changes: 6 additions & 0 deletions Assets/ModTools/UI/Xml/Vizzy/VizzyToolbox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<Style id="set-mfd-map" color="WidgetInstruction" format="set map (0) [x] to (1)" tooltip="Sets the property of MFD map widget with the specified name." />
<Style id="set-mfd-texture-setpixel" color="WidgetInstruction" format="set texture (0) pixel at x=(1), y=(2) to (3)" tooltip="Sets the pixel at the coordinate to the specified pixel. Note: Coordinates start at 1, not 0." />
<Style id="set-mfd-texture-initialize" color="WidgetInstruction" format="initialize texture (0) width (1) and height (2)" tooltip="Initializes the texture to the specified width and height." />
<Style id="prop-mfd-texture-getpixel" color="WidgetInstruction" format="get texture (0) pixel at x=(1), y=(2)" tooltip="Gets the pixel at the specified coordinates. Note: Coordinates start at 1, not 0." />
<Style id="prop-mfd-gauge" color="WidgetExpression" format="get gauge (0) [x]" tooltip="Returns information about the MFD gauge with the specified name." />
<Style id="set-mfd-gauge" color="WidgetInstruction" format="set gauge (0) [x] to (1)" tooltip="Sets the property of MFD gauge widget with the specified name." />
<Style id="set-mfd-line-points" color="WidgetInstruction" format="set line (0) from (1) to (2)" tooltip="Sets the line widget to connect the first point to the second point." />
Expand Down Expand Up @@ -569,6 +570,11 @@
<CraftProperty style="prop-mfd-gauge" property="Mfd.Gauge.Value">
<Constant text="name" />
</CraftProperty>
<CraftProperty style="prop-mfd-texture-getpixel" property="Mfd.Texture.GetPixel">
<Constant text="name" />
<Constant number="1" />
<Constant number="1" />
</CraftProperty>
<CraftProperty style="prop-mfd-pos" property="Mfd.LocaltoDisplay">
<Constant text="name" />
<Constant text="0,0" />
Expand Down
23 changes: 17 additions & 6 deletions Assets/ModTools/UI/Xml/Vizzy/VizzyUI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@
<Image class="edit-button" color="Button" sprite="Ui/Sprites/Design/IconButtonEdit" width="24" height="24" hoverClass="edit-hover" />
<Image class="edit-hover" color="ButtonHover" />
<TextMeshPro class="error" color="Red" />
<Panel class="column-left" width="50%" rectAlignment="MiddleLeft" />
<Panel class="column-right" width="50%" rectAlignment="MiddleRight" />
<TextMeshPro class="column-left" alignment="Left" />
<TextMeshPro class="column-right" alignment="Right" />
</Defaults>
<RectTransform class="safe-area">
<Panel id="program-container" raycastTarget="true" color="#2C2E33">
<Panel name="ProgramPanel" id="program-panel" anchorMin="0.5 1" anchorMax="0.5 1">
<Image sprite="Ui/Sprites/Common/Grid-32" color="#636363" opacity="0.075" width="100000" height="100000" raycastTarget="false" type="Tiled" />
</Panel>
<Image id="connection-hint-line" color="Primary" sprite="Ui/Vizzy/ConnectingLine" width="100" height="6" active="false" type="Sliced" />
<Panel id="program-container" raycastTarget="true" color="#2C2E33">
<Panel name="ProgramPanel" id="program-panel" anchorMin="0.5 1" anchorMax="0.5 1">
<Image id="grid" sprite="Ui/Sprites/Common/Grid-32" color="#636363" opacity="0.075" width="100000" height="100000" raycastTarget="false" type="Tiled" />
</Panel>
<Image id="connection-hint-line" color="Primary" sprite="Ui/Vizzy/ConnectingLine" width="100" height="6" active="false" type="Sliced" />
</Panel>
<RectTransform class="safe-area">
<Panel id="main-ui" opacity="1">
<Panel rectAlignment="MiddleLeft" width="52" class="panel" border="Border">
<VerticalLayout id="category-panel" class="no-image" childForceExpandHeight="false" width="50" offsetXY="0 0" rectAlignment="UpperLeft">
Expand Down Expand Up @@ -75,6 +79,13 @@
<TextMeshPro text="REDO" />
</Button>
</Panel>
<Image class="separator" />
<Panel class="no-image" preferredHeight="25">
<TextMeshPro class="label column-left" text="Grid" overflowMode="Overflow" enableWordWrapping="false" />
<Panel class="column-right">
<Toggle id="grid-toggle" toggleBackgroundImage="" anchorMax="1, .5" anchorMin="1, .5" pivot="1, .5" colors="Button|ButtonHover|ButtonPressed|ButtonDisabled" navigation="None" onValueChanged="OnGridEnabledChanged(this);" />
</Panel>
</Panel>
</VerticalLayout>
</Panel>
</Panel>
Expand Down

0 comments on commit f1cd702

Please sign in to comment.