ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up residue errors from refactoring in other project

Browse Source
This commit is contained in:
Harrison Deng 2018-12-04 23:37:05 -06:00
parent d92f036a5d
commit e0959b2578
10 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RhythmBullet.sln
View File

@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.28010.2019
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhythmBullet", "RhythmBullet\RhythmBullet.csproj", "{4242553D-40F9-40F0-9AE6-CB6771DD9CF9}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhythmBullet", "RhythmBullet\RhythmBullet.csproj", "{4242553D-40F9-40F0-9AE6-CB6771DD9CF9}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recrowned-Athenaeum", "..\Recrowned-Athenaeum\Recrowned-Athenaeum\Recrowned-Athenaeum.csproj", "{95A926DC-1482-4368-91DA-8D30AC04740A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecrownedAthenaeum", "..\RecrownedAthenaeum\RecrownedAthenaeum\RecrownedAthenaeum.csproj", "{95A926DC-1482-4368-91DA-8D30AC04740A}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
RhythmBullet/ContentResolvers/FontContentResolver.cs
View File

@ -1,4 +1,4 @@
using RecrownedAthenaeum.sdfoieroiesopeopweir.ContentSystem; using RecrownedAthenaeum.ContentSystem;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

5
RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
View File

@ -1,7 +1,6 @@
using RecrownedAthenaeum.Preferences; using RecrownedAthenaeum.Preferences;
using RecrownedAthenaeum.sdfoieroiesopeopweir; using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ContentSystem; using RecrownedAthenaeum.DataTypes;
using RecrownedAthenaeum.sdfoieroiesopeopweir.DataTypes;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

4
RhythmBullet/Preferences/Controls.cs
View File

@ -1,9 +1,9 @@
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using RecrownedAthenaeum.sdfoieroiesopeopweir.Persistence; using RecrownedAthenaeum.Persistence;
namespace RecrownedAthenaeum.Preferences namespace RecrownedAthenaeum.Preferences
{ {
public class Controls : sdfoieroiesopeopweir.Persistence.Preferences public class Controls : Persistence.Preferences
{ {
public Keys Forward = Keys.Up; public Keys Forward = Keys.Up;
public Keys Backward = Keys.Down; public Keys Backward = Keys.Down;

6
RhythmBullet/Preferences/General.cs
View File

@ -1,11 +1,11 @@
using System; using System;
using System.Xml.Serialization; using System.Xml.Serialization;
using RecrownedAthenaeum.sdfoieroiesopeopweir.DataTypes; using RecrownedAthenaeum.DataTypes;
using RecrownedAthenaeum.sdfoieroiesopeopweir.Persistence; using RecrownedAthenaeum.Persistence;
namespace RecrownedAthenaeum.Preferences namespace RecrownedAthenaeum.Preferences
{ {
public class General : sdfoieroiesopeopweir.Persistence.Preferences public class General : Persistence.Preferences
{ {
public Resolution Resolution = new Resolution(1920, 1080); public Resolution Resolution = new Resolution(1920, 1080);
public bool Fullscreen = false; public bool Fullscreen = false;

4
RhythmBullet/RhythmBullet.csproj
View File

@ -133,9 +133,9 @@
<Folder Include="Screens\UI\" /> <Folder Include="Screens\UI\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Recrowned-Athenaeum\Recrowned-Athenaeum\Recrowned-Athenaeum.csproj"> <ProjectReference Include="..\..\RecrownedAthenaeum\RecrownedAthenaeum\RecrownedAthenaeum.csproj">
<Project>{95a926dc-1482-4368-91da-8d30ac04740a}</Project> <Project>{95a926dc-1482-4368-91da-8d30ac04740a}</Project>
<Name>Recrowned-Athenaeum</Name> <Name>RecrownedAthenaeum</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

13
RhythmBullet/RhythmBulletGame.cs
View File

@ -5,13 +5,12 @@ using RecrownedAthenaeum.Audio;
using RecrownedAthenaeum.ContentResolvers; using RecrownedAthenaeum.ContentResolvers;
using RecrownedAthenaeum.Preferences; using RecrownedAthenaeum.Preferences;
using RecrownedAthenaeum.Screens.MainMenu; using RecrownedAthenaeum.Screens.MainMenu;
using RecrownedAthenaeum.sdfoieroiesopeopweir; using RecrownedAthenaeum.Camera;
using RecrownedAthenaeum.sdfoieroiesopeopweir.Camera; using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ContentSystem; using RecrownedAthenaeum.DataTypes;
using RecrownedAthenaeum.sdfoieroiesopeopweir.DataTypes; using RecrownedAthenaeum.Input;
using RecrownedAthenaeum.sdfoieroiesopeopweir.Input; using RecrownedAthenaeum.Persistence;
using RecrownedAthenaeum.sdfoieroiesopeopweir.Persistence; using RecrownedAthenaeum.ScreenSystem;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ScreenSystem;
using System; using System;
using System.Diagnostics; using System.Diagnostics;

6
RhythmBullet/Screens/MainMenu/MainPage.cs
View File

@ -1,9 +1,9 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.UI.Book; using RecrownedAthenaeum.UI.Book;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ContentSystem; using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.sdfoieroiesopeopweir.UI.Modular.Modules; using RecrownedAthenaeum.UI.Modular.Modules;
using RecrownedAthenaeum.sdfoieroiesopeopweir.UI.Modular.Modules.Interactive; using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
namespace RecrownedAthenaeum.Screens.MainMenu namespace RecrownedAthenaeum.Screens.MainMenu
{ {

6
RhythmBullet/Screens/MainMenu/MainScreen.cs
View File

@ -5,9 +5,9 @@ using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using RecrownedAthenaeum.Screens.Transitions; using RecrownedAthenaeum.Screens.Transitions;
using RecrownedAthenaeum.UI.Book; using RecrownedAthenaeum.UI.Book;
using RecrownedAthenaeum.sdfoieroiesopeopweir.Camera; using RecrownedAthenaeum.Camera;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ContentSystem; using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ScreenSystem; using RecrownedAthenaeum.ScreenSystem;
using System; using System;
namespace RecrownedAthenaeum.Screens.MainMenu namespace RecrownedAthenaeum.Screens.MainMenu

4
RhythmBullet/Screens/Transitions/FadeAwayTransition.cs
View File

@ -1,7 +1,7 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.sdfoieroiesopeopweir.UI; using RecrownedAthenaeum.UI;
using RecrownedAthenaeum.sdfoieroiesopeopweir.ScreenSystem; using RecrownedAthenaeum.ScreenSystem;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;