Merge branch 'master' into master

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>

Assets/Resources/Credits.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90394fafead02ca478f84380c3bce572
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Fonts/roboto/Roboto-Medium.asset

@@ -2734,7 +2734,7 @@ Material:
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
     - _GlowColor: {r: 0, g: 0, b: 0, a: 1}
     - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _OutlineColor: {r: 0.03433981, g: 0.03433981, b: 0.03433981, a: 1}
     - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Sprites/Editor/UI/add-music.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 6dd981c3e3319f243b56549e3f26fb72
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Editor/UI/grid-snap.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 57971d0838f02124080be29466f8f638
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat

@@ -82,7 +82,7 @@ Material:
     m_Colors:
     - _AddColor: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1}
+    - _ColorAlpha: {r: 1, g: 0.8706616, b: 0.16639495, a: 1}
     - _ColorBravo: {r: 1, g: 0, b: 0, a: 1}
     - _ColorDelta: {r: 0.81, g: 0.81, b: 0.81, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

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;
 

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
             {

README.md

@@ -17,7 +17,8 @@
 
 [Bug Report Form](https://docs.google.com/forms/d/e/1FAIpQLSfu0p2ZjrfwwEvpLgJ4Hw-AAN3jh4QNSEk0U7mjDvwiIkoRAw/viewform?usp=pp_url)
 
-![image](https://i.ibb.co/pjFgyZX/hs-github-image.png)
+![prCapture](https://user-images.githubusercontent.com/43734252/212429715-1971929f-fee1-442f-8ba2-694e1732590a.png)
+
 
 
 ## Prebuilt Binaries