Merge remote-tracking branch 'origin/master' into HEAD

Conflicts: osu.Game.Resources/osu.Game.Resources.csproj
8 years ago · b50d8733ff
parent 8edf4ddc6d
commit b50d8733ff
203 changed files with 207 additions and 1 deletions
--- a/osu.Game.Resources/Properties/AssemblyInfo.cs
+++ b/osu.Game.Resources/Properties/AssemblyInfo.cs
@ -1,5 +1,4 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
--- a/osu.Game.Resources/Textures/Backgrounds/Drawings/background.png
+++ b/osu.Game.Resources/Textures/Backgrounds/Drawings/background.png
--- a/osu.Game.Resources/Textures/Drawings/visualiser-line.png
+++ b/osu.Game.Resources/Textures/Drawings/visualiser-line.png
--- a/osu.Game.Resources/Textures/Flags/AD.png
+++ b/osu.Game.Resources/Textures/Flags/AD.png
--- a/osu.Game.Resources/Textures/Flags/AE.png
+++ b/osu.Game.Resources/Textures/Flags/AE.png
--- a/osu.Game.Resources/Textures/Flags/AF.png
+++ b/osu.Game.Resources/Textures/Flags/AF.png
--- a/osu.Game.Resources/Textures/Flags/AG.png
+++ b/osu.Game.Resources/Textures/Flags/AG.png
--- a/osu.Game.Resources/Textures/Flags/AL.png
+++ b/osu.Game.Resources/Textures/Flags/AL.png
--- a/osu.Game.Resources/Textures/Flags/AM.png
+++ b/osu.Game.Resources/Textures/Flags/AM.png
--- a/osu.Game.Resources/Textures/Flags/AR.png
+++ b/osu.Game.Resources/Textures/Flags/AR.png
--- a/osu.Game.Resources/Textures/Flags/AT.png
+++ b/osu.Game.Resources/Textures/Flags/AT.png
--- a/osu.Game.Resources/Textures/Flags/AU.png
+++ b/osu.Game.Resources/Textures/Flags/AU.png
--- a/osu.Game.Resources/Textures/Flags/AZ.png
+++ b/osu.Game.Resources/Textures/Flags/AZ.png
--- a/osu.Game.Resources/Textures/Flags/BA.png
+++ b/osu.Game.Resources/Textures/Flags/BA.png
--- a/osu.Game.Resources/Textures/Flags/BB.png
+++ b/osu.Game.Resources/Textures/Flags/BB.png
--- a/osu.Game.Resources/Textures/Flags/BD.png
+++ b/osu.Game.Resources/Textures/Flags/BD.png
--- a/osu.Game.Resources/Textures/Flags/BE.png
+++ b/osu.Game.Resources/Textures/Flags/BE.png
--- a/osu.Game.Resources/Textures/Flags/BF.png
+++ b/osu.Game.Resources/Textures/Flags/BF.png
--- a/osu.Game.Resources/Textures/Flags/BG.png
+++ b/osu.Game.Resources/Textures/Flags/BG.png
--- a/osu.Game.Resources/Textures/Flags/BH.png
+++ b/osu.Game.Resources/Textures/Flags/BH.png
--- a/osu.Game.Resources/Textures/Flags/BI.png
+++ b/osu.Game.Resources/Textures/Flags/BI.png
--- a/osu.Game.Resources/Textures/Flags/BJ.png
+++ b/osu.Game.Resources/Textures/Flags/BJ.png
--- a/osu.Game.Resources/Textures/Flags/BN.png
+++ b/osu.Game.Resources/Textures/Flags/BN.png
--- a/osu.Game.Resources/Textures/Flags/BO.png
+++ b/osu.Game.Resources/Textures/Flags/BO.png
--- a/osu.Game.Resources/Textures/Flags/BR.png
+++ b/osu.Game.Resources/Textures/Flags/BR.png
--- a/osu.Game.Resources/Textures/Flags/BS.png
+++ b/osu.Game.Resources/Textures/Flags/BS.png
--- a/osu.Game.Resources/Textures/Flags/BT.png
+++ b/osu.Game.Resources/Textures/Flags/BT.png
--- a/osu.Game.Resources/Textures/Flags/BW.png
+++ b/osu.Game.Resources/Textures/Flags/BW.png
--- a/osu.Game.Resources/Textures/Flags/BY.png
+++ b/osu.Game.Resources/Textures/Flags/BY.png
--- a/osu.Game.Resources/Textures/Flags/BZ.png
+++ b/osu.Game.Resources/Textures/Flags/BZ.png
--- a/osu.Game.Resources/Textures/Flags/CA.png
+++ b/osu.Game.Resources/Textures/Flags/CA.png
--- a/osu.Game.Resources/Textures/Flags/CD.png
+++ b/osu.Game.Resources/Textures/Flags/CD.png
--- a/osu.Game.Resources/Textures/Flags/CF.png
+++ b/osu.Game.Resources/Textures/Flags/CF.png
--- a/osu.Game.Resources/Textures/Flags/CG.png
+++ b/osu.Game.Resources/Textures/Flags/CG.png
--- a/osu.Game.Resources/Textures/Flags/CH.png
+++ b/osu.Game.Resources/Textures/Flags/CH.png
--- a/osu.Game.Resources/Textures/Flags/CI.png
+++ b/osu.Game.Resources/Textures/Flags/CI.png
--- a/osu.Game.Resources/Textures/Flags/CL.png
+++ b/osu.Game.Resources/Textures/Flags/CL.png
--- a/osu.Game.Resources/Textures/Flags/CM.png
+++ b/osu.Game.Resources/Textures/Flags/CM.png
--- a/osu.Game.Resources/Textures/Flags/CN.png
+++ b/osu.Game.Resources/Textures/Flags/CN.png
--- a/osu.Game.Resources/Textures/Flags/CO.png
+++ b/osu.Game.Resources/Textures/Flags/CO.png
--- a/osu.Game.Resources/Textures/Flags/CR.png
+++ b/osu.Game.Resources/Textures/Flags/CR.png
--- a/osu.Game.Resources/Textures/Flags/CU.png
+++ b/osu.Game.Resources/Textures/Flags/CU.png
--- a/osu.Game.Resources/Textures/Flags/CV.png
+++ b/osu.Game.Resources/Textures/Flags/CV.png
--- a/osu.Game.Resources/Textures/Flags/CY.png
+++ b/osu.Game.Resources/Textures/Flags/CY.png
--- a/osu.Game.Resources/Textures/Flags/CZ.png
+++ b/osu.Game.Resources/Textures/Flags/CZ.png
--- a/osu.Game.Resources/Textures/Flags/DE.png
+++ b/osu.Game.Resources/Textures/Flags/DE.png
--- a/osu.Game.Resources/Textures/Flags/DJ.png
+++ b/osu.Game.Resources/Textures/Flags/DJ.png
--- a/osu.Game.Resources/Textures/Flags/DK.png
+++ b/osu.Game.Resources/Textures/Flags/DK.png
--- a/osu.Game.Resources/Textures/Flags/DM.png
+++ b/osu.Game.Resources/Textures/Flags/DM.png
--- a/osu.Game.Resources/Textures/Flags/DO.png
+++ b/osu.Game.Resources/Textures/Flags/DO.png
--- a/osu.Game.Resources/Textures/Flags/DZ.png
+++ b/osu.Game.Resources/Textures/Flags/DZ.png
--- a/osu.Game.Resources/Textures/Flags/EC.png
+++ b/osu.Game.Resources/Textures/Flags/EC.png
--- a/osu.Game.Resources/Textures/Flags/EE.png
+++ b/osu.Game.Resources/Textures/Flags/EE.png
--- a/osu.Game.Resources/Textures/Flags/EG.png
+++ b/osu.Game.Resources/Textures/Flags/EG.png
--- a/osu.Game.Resources/Textures/Flags/ER.png
+++ b/osu.Game.Resources/Textures/Flags/ER.png
--- a/osu.Game.Resources/Textures/Flags/ES.png
+++ b/osu.Game.Resources/Textures/Flags/ES.png
--- a/osu.Game.Resources/Textures/Flags/ET.png
+++ b/osu.Game.Resources/Textures/Flags/ET.png
--- a/osu.Game.Resources/Textures/Flags/FI.png
+++ b/osu.Game.Resources/Textures/Flags/FI.png
--- a/osu.Game.Resources/Textures/Flags/FJ.png
+++ b/osu.Game.Resources/Textures/Flags/FJ.png
--- a/osu.Game.Resources/Textures/Flags/FM.png
+++ b/osu.Game.Resources/Textures/Flags/FM.png
--- a/osu.Game.Resources/Textures/Flags/FR.png
+++ b/osu.Game.Resources/Textures/Flags/FR.png
--- a/osu.Game.Resources/Textures/Flags/GA.png
+++ b/osu.Game.Resources/Textures/Flags/GA.png
--- a/osu.Game.Resources/Textures/Flags/GB.png
+++ b/osu.Game.Resources/Textures/Flags/GB.png
--- a/osu.Game.Resources/Textures/Flags/GD.png
+++ b/osu.Game.Resources/Textures/Flags/GD.png
--- a/osu.Game.Resources/Textures/Flags/GE.png
+++ b/osu.Game.Resources/Textures/Flags/GE.png
--- a/osu.Game.Resources/Textures/Flags/GH.png
+++ b/osu.Game.Resources/Textures/Flags/GH.png
--- a/osu.Game.Resources/Textures/Flags/GM.png
+++ b/osu.Game.Resources/Textures/Flags/GM.png
--- a/osu.Game.Resources/Textures/Flags/GN.png
+++ b/osu.Game.Resources/Textures/Flags/GN.png
--- a/osu.Game.Resources/Textures/Flags/GQ.png
+++ b/osu.Game.Resources/Textures/Flags/GQ.png
--- a/osu.Game.Resources/Textures/Flags/GR.png
+++ b/osu.Game.Resources/Textures/Flags/GR.png
--- a/osu.Game.Resources/Textures/Flags/GT.png
+++ b/osu.Game.Resources/Textures/Flags/GT.png
--- a/osu.Game.Resources/Textures/Flags/GW.png
+++ b/osu.Game.Resources/Textures/Flags/GW.png
--- a/osu.Game.Resources/Textures/Flags/GY.png
+++ b/osu.Game.Resources/Textures/Flags/GY.png
--- a/osu.Game.Resources/Textures/Flags/HK.png
+++ b/osu.Game.Resources/Textures/Flags/HK.png
--- a/osu.Game.Resources/Textures/Flags/HN.png
+++ b/osu.Game.Resources/Textures/Flags/HN.png
--- a/osu.Game.Resources/Textures/Flags/HR.png
+++ b/osu.Game.Resources/Textures/Flags/HR.png
--- a/osu.Game.Resources/Textures/Flags/HT.png
+++ b/osu.Game.Resources/Textures/Flags/HT.png
--- a/osu.Game.Resources/Textures/Flags/HU.png
+++ b/osu.Game.Resources/Textures/Flags/HU.png
--- a/osu.Game.Resources/Textures/Flags/ID.png
+++ b/osu.Game.Resources/Textures/Flags/ID.png
--- a/osu.Game.Resources/Textures/Flags/IE.png
+++ b/osu.Game.Resources/Textures/Flags/IE.png
--- a/osu.Game.Resources/Textures/Flags/IL.png
+++ b/osu.Game.Resources/Textures/Flags/IL.png
--- a/osu.Game.Resources/Textures/Flags/IN.png
+++ b/osu.Game.Resources/Textures/Flags/IN.png
--- a/osu.Game.Resources/Textures/Flags/IQ.png
+++ b/osu.Game.Resources/Textures/Flags/IQ.png
--- a/osu.Game.Resources/Textures/Flags/IR.png
+++ b/osu.Game.Resources/Textures/Flags/IR.png
--- a/osu.Game.Resources/Textures/Flags/IS.png
+++ b/osu.Game.Resources/Textures/Flags/IS.png
--- a/osu.Game.Resources/Textures/Flags/IT.png
+++ b/osu.Game.Resources/Textures/Flags/IT.png
--- a/osu.Game.Resources/Textures/Flags/JM.png
+++ b/osu.Game.Resources/Textures/Flags/JM.png
--- a/osu.Game.Resources/Textures/Flags/JO.png
+++ b/osu.Game.Resources/Textures/Flags/JO.png
--- a/osu.Game.Resources/Textures/Flags/JP.png
+++ b/osu.Game.Resources/Textures/Flags/JP.png
--- a/osu.Game.Resources/Textures/Flags/KE.png
+++ b/osu.Game.Resources/Textures/Flags/KE.png
--- a/osu.Game.Resources/Textures/Flags/KG.png
+++ b/osu.Game.Resources/Textures/Flags/KG.png
--- a/osu.Game.Resources/Textures/Flags/KH.png
+++ b/osu.Game.Resources/Textures/Flags/KH.png
--- a/osu.Game.Resources/Textures/Flags/KI.png
+++ b/osu.Game.Resources/Textures/Flags/KI.png
--- a/osu.Game.Resources/Textures/Flags/KM.png
+++ b/osu.Game.Resources/Textures/Flags/KM.png
--- a/osu.Game.Resources/Textures/Flags/KN.png
+++ b/osu.Game.Resources/Textures/Flags/KN.png
--- a/osu.Game.Resources/Textures/Flags/KP.png
+++ b/osu.Game.Resources/Textures/Flags/KP.png
--- a/osu.Game.Resources/Textures/Flags/KR.png
+++ b/osu.Game.Resources/Textures/Flags/KR.png
--- a/osu.Game.Resources/Textures/Flags/KW.png
+++ b/osu.Game.Resources/Textures/Flags/KW.png
--- a/osu.Game.Resources/Textures/Flags/KZ.png
+++ b/osu.Game.Resources/Textures/Flags/KZ.png
--- a/osu.Game.Resources/Textures/Flags/LA.png
+++ b/osu.Game.Resources/Textures/Flags/LA.png
--- a/Show More
+++ b/Show More