From 2e08d95e4db38b36b7747417479dd16f982b079b Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Fri, 13 Jan 2023 16:35:56 -0500
Subject: [PATCH] fix colours

- update credits
---
 Assets/Resources/Credits.txt                  | 77 +++++++++++++++++++
 Assets/Resources/Credits.txt.meta             |  7 ++
 Assets/Scenes/Editor.unity                    | 63 +++++++--------
 Assets/Scripts/LevelEditor/Editor.cs          |  4 +-
 .../Scripts/LevelEditor/Timeline/Timeline.cs  |  6 +-
 5 files changed, 122 insertions(+), 35 deletions(-)
 create mode 100644 Assets/Resources/Credits.txt
 create mode 100644 Assets/Resources/Credits.txt.meta

diff --git a/Assets/Resources/Credits.txt b/Assets/Resources/Credits.txt
new file mode 100644
index 000000000..5d21817d7
--- /dev/null
+++ b/Assets/Resources/Credits.txt
@@ -0,0 +1,77 @@
+<align="center"><b>Programming</b></align>
+-<indent=5%>Megaminerzero</indent>
+-<indent=5%>Starpelly <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>
+-<indent=5%>minenice</indent>
+-<indent=5%>huantian</indent>
+-<indent=5%>Slaith12</indent>
+-<indent=5%>Mytiaoga</indent>
+-<indent=5%>Carson</indent>
+-<indent=5%>saladplainzone</indent>
+-<indent=5%>Pengu123</indent>
+-<indent=5%>Krıspy Kreme</indent>
+-<indent=5%>Demon Jake</indent>
+-<indent=5%>DPS2004</indent>
+-<indent=5%>Jellirby</indent>
+-<indent=5%>BookwormKevin</indent>
+-<indent=5%>Zeo</indent>
+
+<align="center"><b>Artwork</b></align>
+-<indent=5%>Ko Takeuchi <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>
+-<indent=5%>Nintendo <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>
+-<indent=5%>Starpelly <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>
+-<indent=5%>OctaHeart <alpha=#88>(Logo)<alpha=#FF></indent>
+-<indent=5%>ev <alpha=#88>(Editor UI)<alpha=#FF></indent>
+-<indent=5%>dexiedoo_octo</indent>
+-<indent=5%>Sofuto</indent>
+-<indent=5%>MilaDraws</indent>
+-<indent=5%>Talk</indent>
+-<indent=5%>saladplainzone</indent>
+-<indent=5%>Mocha</indent>
+-<indent=5%>Seanski2</indent>
+-<indent=5%>The Culinator</indent>
+-<indent=5%>Brandix</indent>
+-<indent=5%>Metasepia</indent>
+-<indent=5%>Jellirby</indent>
+-<indent=5%>Radomila</indent>
+-<indent=5%>UnbrokenMage</indent>
+-<indent=5%>GlennianHeroes</indent>
+-<indent=5%>Wes13</indent>
+-<indent=5%>flaticon.com</indent>
+
+<align="center"><b>Font</b></align>
+-<indent=5%>Super_Tailx_50 <alpha=#88>(Logo)<alpha=#FF></indent>
+-<indent=5%>Christian Robertson <alpha=#88>(Roboto)<alpha=#FF></indent>
+-<indent=5%>Nintendo <alpha=#88>(Rodin)<alpha=#FF></indent>
+-<indent=5%>minenice <alpha=#88>(Sprite Glyphs)<alpha=#FF></indent>
+
+<align="center"><b>Other Resources & Technologies</b></align>
+-<indent=5%>Nintendo <alpha=#88>(Concept, Sound, Design)<alpha=#FF></indent>
+-<indent=5%>Powered by Unity 2020.3.25f1</indent>
+-<indent=5%>JoyShockLibrary <alpha=#88>Jibb Smart, fork by minenice<alpha=#FF></indent>
+-<indent=5%>Adobe Photoshop 2022</indent>
+-<indent=5%>GIMP</indent>
+-<indent=5%>paint.net</indent>
+-<indent=5%>Krita</indent>
+-<indent=5%>Visual Studio 2022</indent>
+-<indent=5%>Visual Studio Code</indent>
+-<indent=5%>Newtonsoft.Json</indent>
+-<indent=5%>DOTween</indent>
+-<indent=5%>Starpelly Library</indent>
+-<indent=5%>StandaloneFileBrowser</indent>
+-<indent=5%>unity-gui-windows</indent>
+-<indent=5%>NaughtyBezierCurves</indent>
+-<indent=5%>VorbisPlugin</indent>
+-<indent=5%>RHRE SFX Database</indent>
+-<indent=5%>Github Copilot</indent>
+
+<align="center"><b>Legal</b>
+<color="red">Rhythm Heaven / Rhythm Tengoku is the intellectual property of Nintendo. This program is NOT endorsed nor sponsored in any way by Nintendo nor any of its affiliates.</color> 
+All used properties of Nintendo (such as names, audio, graphics, characters, design, etc.) in this software are not intended to maliciously infringe trademark rights. All other trademarks and assets are property of their respective owners. This is a community project and this is available for others to use according to the GPL-3.0 license, without charge.
+
+<b>THIS SOFTWARE MUST NOT BE SOLD, NEITHER ALONE NOR AS PART OF A BUNDLE.
+
+IF YOU PAID FOR THIS SOFTWARE OR RECIEVED IT AS PART OF A BUNDLE FOLLOWING PAYMENT, YOU HAVE BEEN SCAMMED. CONTACT THE SELLER AND DEMAND YOUR MONEY BACK IMMEDIATELY.</b>
+
+https://github.com/megaminerjenny/HeavenStudio
+https://discord.gg/5rdEq2SFNj
+</align>
\ No newline at end of file
diff --git a/Assets/Resources/Credits.txt.meta b/Assets/Resources/Credits.txt.meta
new file mode 100644
index 000000000..f07be583e
--- /dev/null
+++ b/Assets/Resources/Credits.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90394fafead02ca478f84380c3bce572
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 64dabd2b8..122b448c1 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -25486,7 +25486,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1589389271}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.9617209
+  m_Size: 0.99929184
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -27499,7 +27499,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0.000061035156}
-  m_SizeDelta: {x: 0, y: 3337.16}
+  m_SizeDelta: {x: 0, y: 3697.16}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &975391006
 MonoBehaviour:
@@ -28914,7 +28914,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1649292126}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.13893081
+  m_Size: 0.12540284
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -31033,7 +31033,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -408.97998, y: -17}
+  m_AnchoredPosition: {x: -408.98004, y: -17}
   m_SizeDelta: {x: -817.96, y: -46.29}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1118147045
@@ -32510,7 +32510,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 125.92819}
+  m_AnchoredPosition: {x: 0, y: 129.9108}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1154875944
@@ -33313,7 +33313,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -49.999878}
+  m_AnchoredPosition: {x: 0, y: -49.99991}
   m_SizeDelta: {x: -48, y: -148}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1182686745
@@ -45299,7 +45299,7 @@ RectTransform:
   m_Father: {fileID: 475433193}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.8610692}
+  m_AnchorMin: {x: 0, y: 0.8745972}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
@@ -45880,7 +45880,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 111.50012, y: -29.533966}
+  m_AnchoredPosition: {x: 111.50012, y: -29.533981}
   m_SizeDelta: {x: 223, y: -108.27}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1671351976
@@ -52661,7 +52661,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -29.529999}
+  m_AnchoredPosition: {x: 0, y: -29.529953}
   m_SizeDelta: {x: 0, y: -108.26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1980243267
@@ -53606,8 +53606,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 602.5, y: -1752.16}
-  m_SizeDelta: {x: 1165, y: 3160}
+  m_AnchoredPosition: {x: 602.5, y: -1932.16}
+  m_SizeDelta: {x: 1165, y: 3520}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2010444526
 MonoBehaviour:
@@ -53629,30 +53629,33 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "<align=\"center\"><b>Programming</b></align>\n-<indent=5%>Megaminerzero</indent>\n-<indent=5%>Starpelly
-    <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>\n-<indent=5%>minenice</indent>\n-<indent=5%>huantian</indent>\n-<indent=5%>Slaith12</indent>\n-<indent=5%>Mytiaoga</indent>\n-<indent=5%>Carson</indent>\n-<indent=5%>saladplainzone</indent>\n-<indent=5%>Pengu123</indent>\n\n<align=\"center\"><b>Artwork</b></align>\n-<indent=5%>Ko
-    Takeuchi <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>\n-<indent=5%>Starpelly
-    <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>\n-<indent=5%>OctaHeart <alpha=#88>(Logo)<alpha=#FF></indent>\n-<indent=5%>dexiedoo_octo</indent>\n-<indent=5%>Sofuto</indent>\n-<indent=5%>MilaDraws</indent>\n-<indent=5%>Talk</indent>\n-<indent=5%>saladplainzone</indent>\n-<indent=5%>Mocha</indent>\n-<indent=5%>Seanski2</indent>\n-<indent=5%>The
-    Culinator</indent>\n-<indent=5%>Brandix</indent>\n-<indent=5%>Metasepia</indent>\n-<indent=5%>Jellirby</indent>\n-<indent=5%>Radomila</indent>\n-<indent=5%>UnbrokenMage</indent>\n-<indent=5%>GlennianHeroes</indent>\n-<indent=5%>flaticon.com</indent>\n\n<align=\"center\"><b>Font</b></align>\n-<indent=5%>Super_Tailx_50
-    <alpha=#88>(Logo)<alpha=#FF></indent>\n-<indent=5%>Christian Robertson <alpha=#88>(Roboto)<alpha=#FF></indent>\n-<indent=5%>Nintendo
-    <alpha=#88>(Rodin)<alpha=#FF></indent>\n-<indent=5%>minenice <alpha=#88>(Sprite
-    Glyphs)<alpha=#FF></indent>\n\n<align=\"center\"><b>Other Resources & Technologies</b></align>\n-<indent=5%>Nintendo
-    <alpha=#88>(Concept, Sound, Design)<alpha=#FF></indent>\n-<indent=5%>Powered
-    by Unity 2020.3.25f1</indent>\n-<indent=5%>JoyShockLibrary <alpha=#88>Jibb Smart,
-    fork by minenice<alpha=#FF></indent>\n-<indent=5%>Adobe Photoshop 2022</indent>\n-<indent=5%>GIMP</indent>\n-<indent=5%>paint.net</indent>\n-<indent=5%>Krita</indent>\n-<indent=5%>Visual
-    Studio 2022</indent>\n-<indent=5%>Visual Studio Code</indent>\n-<indent=5%>Newtonsoft.Json</indent>\n-<indent=5%>DOTween</indent>\n-<indent=5%>Starpelly
-    Library</indent>\n-<indent=5%>StandaloneFileBrowser</indent>\n-<indent=5%>unity-gui-windows</indent>\n-<indent=5%>NaughtyBezierCurves</indent>\n-<indent=5%>VorbisPlugin</indent>\n-<indent=5%>RHRE
-    SFX Database</indent>\n-<indent=5%>Github Copilot</indent>\n\n<align=\"center\"><b>Legal</b>\n<color=\"red\">Rhythm
+  m_text: "<align=\"center\"><b>Programming</b></align>\r\n-<indent=5%>Megaminerzero</indent>\r\n-<indent=5%>Starpelly
+    <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>\r\n-<indent=5%>minenice</indent>\r\n-<indent=5%>huantian</indent>\r\n-<indent=5%>Slaith12</indent>\r\n-<indent=5%>Mytiaoga</indent>\r\n-<indent=5%>Carson</indent>\r\n-<indent=5%>saladplainzone</indent>\r\n-<indent=5%>Pengu123</indent>\r\n-<indent=5%>Kr\u0131spy
+    Kreme</indent>\r\n-<indent=5%>Demon Jake</indent>\r\n-<indent=5%>DPS2004</indent>\r\n-<indent=5%>Jellirby</indent>\r\n-<indent=5%>BookwormKevin</indent>\r\n-<indent=5%>Zeo</indent>\r\n\r\n<align=\"center\"><b>Artwork</b></align>\r\n-<indent=5%>Ko
+    Takeuchi <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>\r\n-<indent=5%>Nintendo
+    <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>\r\n-<indent=5%>Starpelly
+    <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>\r\n-<indent=5%>OctaHeart
+    <alpha=#88>(Logo)<alpha=#FF></indent>\r\n-<indent=5%>ev <alpha=#88>(Editor UI)<alpha=#FF></indent>\r\n-<indent=5%>dexiedoo_octo</indent>\r\n-<indent=5%>Sofuto</indent>\r\n-<indent=5%>MilaDraws</indent>\r\n-<indent=5%>Talk</indent>\r\n-<indent=5%>saladplainzone</indent>\r\n-<indent=5%>Mocha</indent>\r\n-<indent=5%>Seanski2</indent>\r\n-<indent=5%>The
+    Culinator</indent>\r\n-<indent=5%>Brandix</indent>\r\n-<indent=5%>Metasepia</indent>\r\n-<indent=5%>Jellirby</indent>\r\n-<indent=5%>Radomila</indent>\r\n-<indent=5%>UnbrokenMage</indent>\r\n-<indent=5%>GlennianHeroes</indent>\r\n-<indent=5%>Wes13</indent>\r\n-<indent=5%>flaticon.com</indent>\r\n\r\n<align=\"center\"><b>Font</b></align>\r\n-<indent=5%>Super_Tailx_50
+    <alpha=#88>(Logo)<alpha=#FF></indent>\r\n-<indent=5%>Christian Robertson <alpha=#88>(Roboto)<alpha=#FF></indent>\r\n-<indent=5%>Nintendo
+    <alpha=#88>(Rodin)<alpha=#FF></indent>\r\n-<indent=5%>minenice <alpha=#88>(Sprite
+    Glyphs)<alpha=#FF></indent>\r\n\r\n<align=\"center\"><b>Other Resources & Technologies</b></align>\r\n-<indent=5%>Nintendo
+    <alpha=#88>(Concept, Sound, Design)<alpha=#FF></indent>\r\n-<indent=5%>Powered
+    by Unity 2020.3.25f1</indent>\r\n-<indent=5%>JoyShockLibrary <alpha=#88>Jibb
+    Smart, fork by minenice<alpha=#FF></indent>\r\n-<indent=5%>Adobe Photoshop 2022</indent>\r\n-<indent=5%>GIMP</indent>\r\n-<indent=5%>paint.net</indent>\r\n-<indent=5%>Krita</indent>\r\n-<indent=5%>Visual
+    Studio 2022</indent>\r\n-<indent=5%>Visual Studio Code</indent>\r\n-<indent=5%>Newtonsoft.Json</indent>\r\n-<indent=5%>DOTween</indent>\r\n-<indent=5%>Starpelly
+    Library</indent>\r\n-<indent=5%>StandaloneFileBrowser</indent>\r\n-<indent=5%>unity-gui-windows</indent>\r\n-<indent=5%>NaughtyBezierCurves</indent>\r\n-<indent=5%>VorbisPlugin</indent>\r\n-<indent=5%>RHRE
+    SFX Database</indent>\r\n-<indent=5%>Github Copilot</indent>\r\n\r\n<align=\"center\"><b>Legal</b>\r\n<color=\"red\">Rhythm
     Heaven / Rhythm Tengoku is the intellectual property of Nintendo. This program
     is NOT endorsed nor sponsored in any way by Nintendo nor any of its affiliates.</color>
-    \nAll used properties of Nintendo (such as names, audio, graphics, characters,
+    \r\nAll used properties of Nintendo (such as names, audio, graphics, characters,
     design, etc.) in this software are not intended to maliciously infringe trademark
     rights. All other trademarks and assets are property of their respective owners.
     This is a community project and this is available for others to use according
-    to the GPL-3.0 license, without charge.\n\n<b>THIS SOFTWARE MUST NOT BE SOLD,
-    NEITHER ALONE NOR AS PART OF A BUNDLE.\n\nIF YOU PAID FOR THIS SOFTWARE OR RECIEVED
-    IT AS PART OF A BUNDLE FOLLOWING PAYMENT, YOU HAVE BEEN SCAMMED. CONTACT THE
-    SELLER AND DEMAND YOUR MONEY BACK IMMEDIATELY.</b>\n\nhttps://github.com/megaminerjenny/HeavenStudio\nhttps://discord.gg/5rdEq2SFNj\n</align>"
+    to the GPL-3.0 license, without charge.\r\n\r\n<b>THIS SOFTWARE MUST NOT BE SOLD,
+    NEITHER ALONE NOR AS PART OF A BUNDLE.\r\n\r\nIF YOU PAID FOR THIS SOFTWARE OR
+    RECIEVED IT AS PART OF A BUNDLE FOLLOWING PAYMENT, YOU HAVE BEEN SCAMMED. CONTACT
+    THE SELLER AND DEMAND YOUR MONEY BACK IMMEDIATELY.</b>\r\n\r\nhttps://github.com/megaminerjenny/HeavenStudio\r\nhttps://discord.gg/5rdEq2SFNj\r\n</align>"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 4810e200fa0cb24438bac52343d7674b, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 6d4610587e293f74ca2b71ec1cf59da3, type: 2}
diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs
index 549fafb2d..9f2edc09a 100644
--- a/Assets/Scripts/LevelEditor/Editor.cs
+++ b/Assets/Scripts/LevelEditor/Editor.cs
@@ -197,12 +197,12 @@ namespace HeavenStudio.Editor
             #endregion
 
             if (CommandManager.instance.canUndo())
-                UndoBTN.transform.GetChild(0).GetComponent<Image>().color = "BD8CFF".Hex2RGB();
+                UndoBTN.transform.GetChild(0).GetComponent<Image>().color = Color.white;
             else
                 UndoBTN.transform.GetChild(0).GetComponent<Image>().color = Color.gray;
 
             if (CommandManager.instance.canRedo())
-                RedoBTN.transform.GetChild(0).GetComponent<Image>().color = "FFD800".Hex2RGB();
+                RedoBTN.transform.GetChild(0).GetComponent<Image>().color = Color.white;
             else
                 RedoBTN.transform.GetChild(0).GetComponent<Image>().color = Color.gray;
 
diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs
index bca6a5b34..70bf1c17b 100644
--- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs
+++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs
@@ -528,7 +528,7 @@ namespace HeavenStudio.Editor.Track
         {
             if (playEnabled)
             {
-                PlayBTN.transform.GetChild(0).GetComponent<Image>().color = Color.green;
+                PlayBTN.transform.GetChild(0).GetComponent<Image>().color = Color.white;
                 PlayBTN.enabled = true;
             }
             else
@@ -540,7 +540,7 @@ namespace HeavenStudio.Editor.Track
             if (pauseEnabled)
             {
                 PauseBTN.enabled = true;
-                PauseBTN.transform.GetChild(0).GetComponent<Image>().color = Color.blue;
+                PauseBTN.transform.GetChild(0).GetComponent<Image>().color = Color.white;
             }
             else
             {   PauseBTN.transform.GetChild(0).GetComponent<Image>().color = Color.gray;
@@ -550,7 +550,7 @@ namespace HeavenStudio.Editor.Track
             if (stopEnabled)
             {
                 StopBTN.enabled = true;
-                StopBTN.transform.GetChild(0).GetComponent<Image>().color = Color.red;
+                StopBTN.transform.GetChild(0).GetComponent<Image>().color = Color.white;
             }
             else
             {