v1.1 release

ThatDumbPan · Dec 18, 2023 · 7490519 · 7490519
1 parent 10286fd
commit 7490519
Show file tree

Hide file tree

Showing 26 changed files with 881 additions and 781 deletions.
diff --git a/.vs/JellyEditor3/v16/.suo b/.vs/JellyEditor3/v16/.suo
diff --git a/JelloEditor/Form1.Designer.cs b/JelloEditor/Form1.Designer.cs
diff --git a/JelloEditor/Form1.cs b/JelloEditor/Form1.cs
@@ -243,10 +243,6 @@ public Form1()
             updateSceneTree();
             redrawImage();
 
-            groupBoxMaterial.Enabled = false;
-            groupBoxTransformation.Enabled = false;
-            groupBoxSettings.Enabled = false;
-
             // check for command-line argument to load a file.
             if (Environment.GetCommandLineArgs().Length > 1)
                 openScene(Environment.GetCommandLineArgs()[1]);
@@ -2200,7 +2196,7 @@ private void butSceneRemoveObject_Click(object sender, EventArgs e)
 
                 if (count == 0)
                 {
-                    // no more references to this game body, it can be removed from ths list.
+                    // no more references to this game body, it can be removed from the list.
                     mSceneBodies.Remove(b);
                     if (b.Name == "goal")
                     {
@@ -2773,10 +2769,23 @@ private void selectObject(int i, bool updateTree)
             mSelectedObject = i;
             if (mSelectedObject != -1)
             {
-                groupBoxMaterial.Enabled = true;
                 groupBoxTransformation.Enabled = true;
-                groupBoxSettings.Enabled = true;
+                tabControlSceneObjectSettings.Enabled = true;
+                groupBox1.Enabled = true;
+                butSceneCloneObject.Enabled = true;
+                butSceneRemoveObject.Enabled = true;
                 objectToolStripMenuItem.Visible = true;
+                moveUpButton.Enabled = true;
+                moveDownButton.Enabled = true;
+
+                if (mSelectedObject == 0)
+                {
+                    moveUpButton.Enabled = false;
+                }
+                else if (mSelectedObject + 1 == mSceneObjects.Count)
+                {
+                    moveDownButton.Enabled = false;
+                }
 
                 checkBoxIsTrigger.Checked = mSceneObjects[mSelectedObject].isTrigger;
                 checkBoxTriggerNoCam.Checked = mSceneObjects[mSelectedObject].triggerNoCam;
@@ -2807,9 +2816,11 @@ private void selectObject(int i, bool updateTree)
             }
             else
             {
-                groupBoxMaterial.Enabled = false;
                 groupBoxTransformation.Enabled = false;
-                groupBoxSettings.Enabled = false;
+                tabControlSceneObjectSettings.Enabled = false;
+                groupBox1.Enabled = false;
+                butSceneCloneObject.Enabled = false;
+                butSceneRemoveObject.Enabled = false;
                 objectToolStripMenuItem.Visible = false;
                 labelMaterial.Text = "No object selected";
             }
@@ -3858,18 +3869,18 @@ private void buttonTriggerTarget_Click(object sender, EventArgs e)
 
         private void radioButton2_CheckedChanged(object sender, EventArgs e)
         {
-            tabControlSceneObjectSettings.SelectedIndex = 1;
             if (mSelectedObject != -1)
                 mSceneObjects[mSelectedObject].isPath = true;
+            tabControlSceneObjectSettings.SelectedIndex = 1;
 
             redrawImage();
         }
 
         private void radioButton1_CheckedChanged(object sender, EventArgs e)
         {
-            tabControlSceneObjectSettings.SelectedIndex = 0;
             if (mSelectedObject != -1)
                 mSceneObjects[mSelectedObject].isPath = false;
+            tabControlSceneObjectSettings.SelectedIndex = 0;
 
             redrawImage();
         }
@@ -4303,6 +4314,45 @@ private void toggleEditorThemeToolStripMenuItem_Click(object sender, EventArgs e
             }
             redrawImage();
         }
+
+        private void tabControlSceneObjectSettings_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (tabControlSceneObjectSettings.SelectedIndex)
+            {
+                case 0:
+                    if (mSceneObjects[mSelectedObject].isPath)
+                    {
+                        MessageBox.Show("Selected object is a path, must use \"Path\" tab!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        tabControlSceneObjectSettings.SelectedIndex = 1;
+                    }
+                    break;
+                case 1:
+                    if (!mSceneObjects[mSelectedObject].isPath)
+                    {
+                        MessageBox.Show("Selected object is not a path, must use \"Scene Object\" tab!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        tabControlSceneObjectSettings.SelectedIndex = 0;
+                    }
+                    break;
+            }
+        }
+
+        private void moveUpButton_Click(object sender, EventArgs e)
+        {
+            SceneObject obj = mSceneObjects[mSelectedObject];
+            int newIndex = mSelectedObject - 1;
+            mSceneObjects.RemoveAt(mSelectedObject);
+            mSceneObjects.Insert(newIndex, obj);
+            selectObject(newIndex);
+        }
+
+        private void moveDownButton_Click(object sender, EventArgs e)
+        {
+            SceneObject obj = mSceneObjects[mSelectedObject];
+            int newIndex = mSelectedObject + 1;
+            mSceneObjects.RemoveAt(mSelectedObject);
+            mSceneObjects.Insert(newIndex, obj);
+            selectObject(newIndex);
+        }
     }
 }
 #endregion
diff --git a/JelloEditor/MotionSettings.Designer.cs b/JelloEditor/MotionSettings.Designer.cs
diff --git a/JelloEditor/MotionSettings.cs b/JelloEditor/MotionSettings.cs
@@ -137,10 +137,5 @@ private void checkBox1_CheckedChanged(object sender, EventArgs e)
         {
             noRope = checkBox1.Checked;
         }
-
-        private void comboBoxMotorTriggerBehavior_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
     }
 }
diff --git a/JelloEditor/MotionSettings.resx b/JelloEditor/MotionSettings.resx
@@ -120,9 +120,6 @@
   <metadata name="help.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="help.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="label6.HelpString" xml:space="preserve">
     <value>This option decides how long to wait (in seconds) before looping back to the start when done with motion. It is HIGHLY recommended to set this option to something other than 0 for moving platforms that you jump onto. *cough cough* johark *cough cough*</value>
   </data>

diff --git a/JelloEditor/bin/Release/JellyEditor3.exe b/JelloEditor/bin/Release/JellyEditor3.exe
diff --git a/JelloEditor/bin/Release/JellyEditor3.pdb b/JelloEditor/bin/Release/JellyEditor3.pdb
diff --git a/JelloEditor/bin/Release/JellyPhysics_Small.dll b/JelloEditor/bin/Release/JellyPhysics_Small.dll
diff --git a/JelloEditor/bin/Release/JellyPhysics_Small.pdb b/JelloEditor/bin/Release/JellyPhysics_Small.pdb
diff --git a/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferences.cache b/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/JelloEditor/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.AssemblyReference.cache b/JelloEditor/obj/Release/JellyEditor3.csproj.AssemblyReference.cache
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.CoreCompileInputs.cache b/JelloEditor/obj/Release/JellyEditor3.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f6370c12932fbdbf730288d9c16c04c7cf2e3c3f
+757dce4f1d7cf164bb15b817ee60f8dd1a8cba20
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.FileListAbsolute.txt b/JelloEditor/obj/Release/JellyEditor3.csproj.FileListAbsolute.txt
@@ -16,3 +16,21 @@ C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.Cor
 C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.CopyComplete
 C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.exe
 C:\root\core\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyEditor3.exe
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyEditor3.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyPhysics_Small.dll
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\bin\Release\JellyPhysics_Small.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.AssemblyReference.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.About.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.CreateCircle.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.Form1.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.GridSettings.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.MotionSettings.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.PointSpecialMass.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.Properties.Resources.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JelloEditor.SceneSettings.resources
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.GenerateResource.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.CoreCompileInputs.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.csproj.CopyComplete
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.exe
+C:\Users\Adam\Documents\github\JellyEditor3\JelloEditor\obj\Release\JellyEditor3.pdb
diff --git a/JelloEditor/obj/Release/JellyEditor3.csproj.GenerateResource.cache b/JelloEditor/obj/Release/JellyEditor3.csproj.GenerateResource.cache
diff --git a/JelloEditor/obj/Release/JellyEditor3.exe b/JelloEditor/obj/Release/JellyEditor3.exe
diff --git a/JelloEditor/obj/Release/JellyEditor3.pdb b/JelloEditor/obj/Release/JellyEditor3.pdb
diff --git a/JelloEditor/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/JelloEditor/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/JellyPhysics_Small/bin/Release/JellyPhysics_Small.dll b/JellyPhysics_Small/bin/Release/JellyPhysics_Small.dll
diff --git a/JellyPhysics_Small/bin/Release/JellyPhysics_Small.pdb b/JellyPhysics_Small/bin/Release/JellyPhysics_Small.pdb
diff --git a/JellyPhysics_Small/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/JellyPhysics_Small/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.AssemblyReference.cache b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.AssemblyReference.cache
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.FileListAbsolute.txt b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.csproj.FileListAbsolute.txt
@@ -3,3 +3,9 @@ C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\bin\Rele
 C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\obj\Release\JellyPhysics_Small.csproj.CoreCompileInputs.cache
 C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\obj\Release\JellyPhysics_Small.dll
 C:\Users\Adam\Desktop\Visual Studio Projects\JE3_Src\JellyPhysics_Small\obj\Release\JellyPhysics_Small.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\bin\Release\JellyPhysics_Small.dll
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\bin\Release\JellyPhysics_Small.pdb
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.csproj.AssemblyReference.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.csproj.CoreCompileInputs.cache
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.dll
+C:\Users\Adam\Documents\github\JellyEditor3\JellyPhysics_Small\obj\Release\JellyPhysics_Small.pdb
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.dll b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.dll
diff --git a/JellyPhysics_Small/obj/Release/JellyPhysics_Small.pdb b/JellyPhysics_Small/obj/Release/JellyPhysics_Small.pdb
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 noRope = checkBox1.Checked;
             }
-            private void comboBoxMotorTriggerBehavior_SelectedIndexChanged(object sender, EventArgs e)
-            {
-            }
         }
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f6370c12932fbdbf730288d9c16c04c7cf2e3c3f
		757dce4f1d7cf164bb15b817ee60f8dd1a8cba20