Merge branch 'develop' into Better_Graphics_Handling
Conflicts: VocaluxeLib/Menu/CNameSelection.cs VocaluxeLib/Menu/CPlaylist.cs VocaluxeLib/Menu/CText.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Structs.cs VocaluxeLib/VocaluxeLib.csproj VocaluxeLib/Xml/CXMLReader.cs
This commit is contained in:
commit
355d7b4b5f
52 files changed
+1407
-653
No files matched your search
@@ -78,6 +78,7 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="CEncoding.cs" />
|
||||
<Compile Include="CFading.cs" />
|
||||
<Compile Include="CFont.cs" />
|
||||
<Compile Include="CVideoStream.cs" />
|
||||
<Compile Include="Extensions.cs" />
|
||||
<Compile Include="GlobalSuppressions.cs" />
|
||||
@@ -103,7 +104,8 @@
|
||||
<Compile Include="Menu\CText.cs" />
|
||||
<Compile Include="Menu\CScreenSetting.cs" />
|
||||
<Compile Include="Draw\CTextureRef.cs" />
|
||||
<Compile Include="CXMLReader.cs" />
|
||||
<Compile Include="Xml\CXmlDeserializer.cs" />
|
||||
<Compile Include="Xml\CXMLReader.cs" />
|
||||
<Compile Include="Enums.cs" />
|
||||
<Compile Include="Menu\IMenu.cs" />
|
||||
<Compile Include="Menu\IMenuElement.cs" />
|
||||
@@ -139,6 +141,7 @@
|
||||
<Compile Include="Utils\CWavFile.cs" />
|
||||
<Compile Include="Utils\Player\CSongPlayer.cs" />
|
||||
<Compile Include="Utils\Player\CSoundPlayer.cs" />
|
||||
<Compile Include="Xml\CXmlReaderBase.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
|
||||
Reference in new issue
Block a user