Fun-Makers-Studios · kikofp02 · Apr 23, 2023 · Apr 24, 2023 · Apr 24, 2023 · Apr 24, 2023
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+/.vs
diff --git a/.vs/NEW TEMPLATE/v17/.wsuo b/.vs/NEW TEMPLATE/v17/.wsuo
diff --git a/.vs/Project2_TheToyBox/v16/.suo b/.vs/Project2_TheToyBox/v16/.suo
diff --git a/.vs/Project2_TheToyBox/v16/Browse.VC.db b/.vs/Project2_TheToyBox/v16/Browse.VC.db
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
@@ -2,6 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
-  "SelectedNode": "\\Development.sln",
+  "SelectedNode": "\\TheToyBox.sln",
   "PreviewInSolutionExplorer": false
 }
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/Project2_Template-master/.vs/Development/v16/.suo b/Project2_Template-master/.vs/Development/v16/.suo
diff --git a/Project2_Template-master/.vs/Development/v16/Browse.VC.db b/Project2_Template-master/.vs/Development/v16/Browse.VC.db
diff --git a/TheToyBox_Template/.vs/TheToyBox/v16/.suo b/TheToyBox_Template/.vs/TheToyBox/v16/.suo
diff --git a/TheToyBox_Template/.vs/TheToyBox/v16/Browse.VC.db b/TheToyBox_Template/.vs/TheToyBox/v16/Browse.VC.db
diff --git a/TheToyBox_Template/.vs/TheToyBox/v16/ipch/AutoPCH/3af787265415d56a/MAIN.ipch b/TheToyBox_Template/.vs/TheToyBox/v16/ipch/AutoPCH/3af787265415d56a/MAIN.ipch
diff --git a/TheToyBox_Template/.vs/TheToyBox/v16/ipch/AutoPCH/4a7406d154e56f68/APP.ipch b/TheToyBox_Template/.vs/TheToyBox/v16/ipch/AutoPCH/4a7406d154e56f68/APP.ipch
diff --git a/TheToyBox_Template/.vs/TheToyBox/v16/ipch/AutoPCH/f531457e48030c2b/WINDOW.ipch b/TheToyBox_Template/.vs/TheToyBox/v16/ipch/AutoPCH/f531457e48030c2b/WINDOW.ipch
diff --git a/TheToyBox_Template/Output/Assets/Textures/spritesheet.png b/TheToyBox_Template/Output/Assets/Textures/spritesheet.png
diff --git a/TheToyBox_Template/Output/Assets/UI/CombatMenu/CombatMenuTemplate.psd b/TheToyBox_Template/Output/Assets/UI/CombatMenu/CombatMenuTemplate.psd
diff --git a/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimAchievementsHover.psd b/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimAchievementsHover.psd
diff --git a/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimControlsHover.psd b/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimControlsHover.psd
diff --git a/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimCreditsHover.psd b/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimCreditsHover.psd
diff --git a/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimPlayHover.psd b/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimPlayHover.psd
diff --git a/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimSettingsHover.psd b/TheToyBox_Template/Output/Assets/UI/MainMenuScreen&Anims/AnimSettingsHover.psd
diff --git a/TheToyBox_Template/Output/Assets/UI/PauseMenu/PauseMenuTemplate.png b/TheToyBox_Template/Output/Assets/UI/PauseMenu/PauseMenuTemplate.png
diff --git a/TheToyBox_Template/Output/Assets/UI/PauseMenu/PauseMenuTemplate.psd b/TheToyBox_Template/Output/Assets/UI/PauseMenu/PauseMenuTemplate.psd
diff --git a/Wiki/ArtAndAudio/AngryShopkeeper_Sprite.png b/Wiki/ArtAndAudio/AngryShopkeeper_Sprite.png
diff --git a/Wiki/ArtAndAudio/Clown_Sprite.png b/Wiki/ArtAndAudio/Clown_Sprite.png
diff --git a/Wiki/ArtAndAudio/IMG-20230301-WA0011.png b/Wiki/ArtAndAudio/IMG-20230301-WA0011.png
diff --git a/Wiki/ArtAndAudio/Imp_Sprite.png b/Wiki/ArtAndAudio/Imp_Sprite.png
diff --git a/Wiki/ArtAndAudio/Kids_Sprites.png b/Wiki/ArtAndAudio/Kids_Sprites.png
diff --git a/Wiki/ArtAndAudio/Sophie_Sprite.png b/Wiki/ArtAndAudio/Sophie_Sprite.png
diff --git a/Wiki/ArtAndAudio/Wizard_Sprite.png b/Wiki/ArtAndAudio/Wizard_Sprite.png
diff --git a/Wiki/ArtAndAudio/Zero_Sprite.png b/Wiki/ArtAndAudio/Zero_Sprite.png
diff --git a/Wiki/ArtAndAudio/ashley.png b/Wiki/ArtAndAudio/ashley.png
diff --git a/Wiki/ArtAndAudio/concept1.png b/Wiki/ArtAndAudio/concept1.png
diff --git a/Wiki/ArtAndAudio/concept2.png b/Wiki/ArtAndAudio/concept2.png
diff --git a/Wiki/ArtAndAudio/concept3.png b/Wiki/ArtAndAudio/concept3.png
diff --git a/Wiki/ArtAndAudio/gabriel.png b/Wiki/ArtAndAudio/gabriel.png
diff --git a/Wiki/ArtAndAudio/imp.png b/Wiki/ArtAndAudio/imp.png
diff --git a/Wiki/ArtAndAudio/johnny.png b/Wiki/ArtAndAudio/johnny.png
diff --git a/Wiki/ArtAndAudio/mago pixel art.png b/Wiki/ArtAndAudio/mago pixel art.png
diff --git a/Wiki/ArtAndAudio/sophie.png b/Wiki/ArtAndAudio/sophie.png
diff --git a/Wiki/ArtAndAudio/zero.png b/Wiki/ArtAndAudio/zero.png
diff --git a/Wiki/ArtAndAudio/zeroUnderworld.png b/Wiki/ArtAndAudio/zeroUnderworld.png
diff --git a/Wiki/GDD/AngryShopkeeper_Sprite.png b/Wiki/GDD/AngryShopkeeper_Sprite.png
diff --git a/Wiki/GDD/Clown_Sprite.png b/Wiki/GDD/Clown_Sprite.png
diff --git a/Wiki/GDD/Imp_Sprite.png b/Wiki/GDD/Imp_Sprite.png
diff --git a/Wiki/GDD/Kids_Sprites.png b/Wiki/GDD/Kids_Sprites.png
diff --git a/Wiki/GDD/Sophie_Sprite.png b/Wiki/GDD/Sophie_Sprite.png
diff --git a/Wiki/GDD/Wizard_Sprite.png b/Wiki/GDD/Wizard_Sprite.png
diff --git a/Wiki/GDD/Zero_Sprite.png b/Wiki/GDD/Zero_Sprite.png
diff --git a/Wiki/GDD/floor1.jpg b/Wiki/GDD/floor1.jpg
diff --git a/Wiki/GDD/floor2.jpg b/Wiki/GDD/floor2.jpg
diff --git a/Wiki/GDD/floor3.jpg b/Wiki/GDD/floor3.jpg
diff --git a/Wiki/GDD/floor4.jpg b/Wiki/GDD/floor4.jpg
diff --git a/Wiki/GDD/gamestate.jpg b/Wiki/GDD/gamestate.jpg
diff --git a/Wiki/GDD/gdd.txt b/Wiki/GDD/gdd.txt
diff --git a/Wiki/GDD/store.jpg b/Wiki/GDD/store.jpg
diff --git a/Wiki/GDD/town.jpg b/Wiki/GDD/town.jpg
diff --git a/Wiki/GUIdocs/GUI.md b/Wiki/GUIdocs/GUI.md
diff --git a/Wiki/GUIdocs/menuflow.png b/Wiki/GUIdocs/menuflow.png
diff --git a/Wiki/Home/Team_photo_FM.png b/Wiki/Home/Team_photo_FM.png
diff --git a/Wiki/ProductionPlan/Co-working_Costs.png b/Wiki/ProductionPlan/Co-working_Costs.png
diff --git a/Wiki/ProductionPlan/GanttDiagram_17.04.2023.png b/Wiki/ProductionPlan/GanttDiagram_17.04.2023.png
diff --git a/Wiki/ProductionPlan/Material_Costs.png b/Wiki/ProductionPlan/Material_Costs.png
diff --git a/Wiki/ProductionPlan/Meetings_Record.png b/Wiki/ProductionPlan/Meetings_Record.png
diff --git a/Wiki/ProductionPlan/Milestones_17.04.2023.png b/Wiki/ProductionPlan/Milestones_17.04.2023.png
diff --git a/Wiki/ProductionPlan/Other_Costs.png b/Wiki/ProductionPlan/Other_Costs.png
diff --git a/Wiki/ProductionPlan/Registration_Taxes.png b/Wiki/ProductionPlan/Registration_Taxes.png
diff --git a/Wiki/ProductionPlan/Risks_And_Contingencies_Table.png b/Wiki/ProductionPlan/Risks_And_Contingencies_Table.png
diff --git a/Wiki/ProductionPlan/Sprints_17.04.2023.png b/Wiki/ProductionPlan/Sprints_17.04.2023.png
diff --git a/Wiki/ProductionPlan/Work_Time.png b/Wiki/ProductionPlan/Work_Time.png
diff --git a/Wiki/ProductionPlan/Working_Time_Costs.png b/Wiki/ProductionPlan/Working_Time_Costs.png
diff --git a/Wiki/QA/Template.png b/Wiki/QA/Template.png
diff --git a/Wiki/QA/hello b/Wiki/QA/hello
diff --git a/Wiki/QA/labels.png b/Wiki/QA/labels.png
diff --git a/Wiki/QA/utilities.png b/Wiki/QA/utilities.png
diff --git a/Wiki/TDD/branching_policy.png b/Wiki/TDD/branching_policy.png
diff --git a/Wiki/TDD/build_release.png b/Wiki/TDD/build_release.png
diff --git a/Wiki/TDD/files_directories_example.png b/Wiki/TDD/files_directories_example.png
diff --git a/citm_desvj_project_template-L07/.gitignore b/citm_desvj_project_template-L07/.gitignore
@@ -35,6 +35,7 @@
 !Game/Source/External/Optick/lib/debugLib/OptickCore.lib
 !Game/Source/External/Optick/lib/releaseLib/OptickCore.lib
 !Game/Source/External/SDL_ttf/libx86/SDL2_ttf.lib
+!Game/Source/External/PhysFS/libx86/physfs.lib
 
 # Executables
 *.exe

diff --git a/citm_desvj_project_template-L07/Game/Game.vcxproj b/citm_desvj_project_template-L07/Game/Game.vcxproj
@@ -64,8 +64,8 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;OptickCore.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)Source\External\SDL_ttf\libx86;$(ProjectDir)Source\External\Optick\lib\releaseLib;$(ProjectDir)Source\External\Optick\lib\debugLib;$(ProjectDir)Source\External\SDL\libx86;$(ProjectDir)Source\External\SDL_image\libx86;$(ProjectDir)Source\External\SDL_mixer\libx86;$(ProjectDir)Source\External\Box2D\libx86\DebugLib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib;physfs.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;OptickCore.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)Source\External\PhysFS\libx86;$(ProjectDir)Source\External\SDL_ttf\libx86;$(ProjectDir)Source\External\Optick\lib\releaseLib;$(ProjectDir)Source\External\Optick\lib\debugLib;$(ProjectDir)Source\External\SDL\libx86;$(ProjectDir)Source\External\SDL_image\libx86;$(ProjectDir)Source\External\SDL_mixer\libx86;$(ProjectDir)Source\External\Box2D\libx86\DebugLib</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)Build\$(Configuration)\$(ProjectName).exe" "$(SolutionDir)Output\$(ProjectName).exe"</Command>
@@ -87,88 +87,156 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;OptickCore.lib;SDL2_ttf.lib;Box2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)Source\External\SDL_ttf\libx86;$(ProjectDir)Source\External\Optick\lib\releaseLib;$(ProjectDir)Source\External\Optick\lib\debugLib;$(ProjectDir)Source\External\SDL\libx86;$(ProjectDir)Source\External\SDL_image\libx86;$(ProjectDir)Source\External\SDL_mixer\libx86;$(ProjectDir)Source\External\Box2D\libx86\ReleaseLib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib;physfs.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;OptickCore.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)Source\External\PhysFS\libx86;$(ProjectDir)Source\External\SDL_ttf\libx86;$(ProjectDir)Source\External\Optick\lib\releaseLib;$(ProjectDir)Source\External\Optick\lib\debugLib;$(ProjectDir)Source\External\SDL\libx86;$(ProjectDir)Source\External\SDL_image\libx86;$(ProjectDir)Source\External\SDL_mixer\libx86;$(ProjectDir)Source\External\Box2D\libx86\ReleaseLib</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)Build\$(Configuration)\$(ProjectName).exe" "$(SolutionDir)Output\$(ProjectName).exe"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Source\AlternatingBars.cpp" />
+    <ClCompile Include="Source\AssetsManager.cpp" />
+    <ClCompile Include="Source\ButtonOrderPuzzle.cpp" />
+    <ClCompile Include="Source\CollectQuest.cpp" />
+    <ClCompile Include="Source\Dissolve.cpp" />
+    <ClCompile Include="Source\Easing.cpp" />
+    <ClCompile Include="Source\ExpandingBars.cpp" />
+    <ClCompile Include="Source\FadeToColor.cpp" />
+    <ClCompile Include="Source\GoToQuest.cpp" />
+    <ClCompile Include="Source\GuiCheckBox.cpp" />
+    <ClCompile Include="Source\GuiSlider.cpp" />
+    <ClCompile Include="Source\ImposibleQuest.cpp" />
     <ClCompile Include="Source\KidEnemy.cpp" />
-    <ClCompile Include="Source\Coin.cpp" />
     <ClCompile Include="Source\Color.cpp" />
     <ClCompile Include="Source\Debug.cpp" />
     <ClCompile Include="Source\DIalogue.cpp" />
     <ClCompile Include="Source\DialogueManager.cpp" />
-    <ClCompile Include="Source\EndingScreen.cpp" />
+    <ClCompile Include="Source\MenuCredits.cpp" />
+    <ClCompile Include="Source\MenuFight.cpp" />
+    <ClCompile Include="Source\MenuManager.cpp" />
+    <ClCompile Include="Source\MenuParty.cpp" />
+    <ClCompile Include="Source\MenuPause.cpp" />
+    <ClCompile Include="Source\MenuQuest.cpp" />
+    <ClCompile Include="Source\MenuSettings.cpp" />
+    <ClCompile Include="Source\MenuTabs.cpp" />
+    <ClCompile Include="Source\MenuTitle.cpp" />
+    <ClCompile Include="Source\MirrorPuzzle.cpp" />
+    <ClCompile Include="Source\PuzzleManager.cpp" />
+    <ClCompile Include="Source\PuzzlePiece.cpp" />
+    <ClCompile Include="Source\PartyMembersQuest.cpp" />
+    <ClCompile Include="Source\QuestManager.cpp" />
+    <ClCompile Include="Source\SceneEnding.cpp" />
     <ClCompile Include="Source\EntityManager.cpp" />
     <ClCompile Include="Source\Fonts.cpp" />
     <ClCompile Include="Source\GuiButton.cpp" />
     <ClCompile Include="Source\GuiManager.cpp" />
     <ClCompile Include="Source\Item.cpp" />
-    <ClCompile Include="Source\LogoScreen.cpp" />
+    <ClCompile Include="Source\SceneLogo.cpp" />
     <ClCompile Include="Source\Main.cpp" />
     <ClCompile Include="Source\App.cpp" />
     <ClCompile Include="Source\Audio.cpp" />
     <ClCompile Include="Source\Input.cpp" />
     <ClCompile Include="Source\Map.cpp" />
     <ClCompile Include="Source\ModuleController.cpp" />
-    <ClCompile Include="Source\ModuleFadeToBlack.cpp" />
     <ClCompile Include="Source\NPC.cpp" />
+    <ClCompile Include="Source\Particle.cpp" />
+    <ClCompile Include="Source\ParticleSystem.cpp" />
+    <ClCompile Include="Source\ParticleSystemManager.cpp" />
     <ClCompile Include="Source\PartyManager.cpp" />
     <ClCompile Include="Source\Pathfinding.cpp" />
     <ClCompile Include="Source\PerfTimer.cpp" />
-    <ClCompile Include="Source\Physics.cpp" />
+    <ClCompile Include="Source\Collisions.cpp" />
     <ClCompile Include="Source\Player.cpp" />
-    <ClCompile Include="Source\Scene.cpp" />
+    <ClCompile Include="Source\SceneGame.cpp" />
     <ClCompile Include="Source\Render.cpp" />
     <ClCompile Include="Source\SceneFight.cpp" />
-    <ClCompile Include="Source\SlimeEnemy.cpp" />
+    <ClCompile Include="Source\SceneManager.cpp" />
+    <ClCompile Include="Source\Slide.cpp" />
+    <ClCompile Include="Source\Spline.cpp" />
+    <ClCompile Include="Source\TalkQuest.cpp" />
     <ClCompile Include="Source\Textures.cpp" />
     <ClCompile Include="Source\Timer.cpp" />
-    <ClCompile Include="Source\TitleScreen.cpp" />
-    <ClCompile Include="Source\UI.cpp" />
+    <ClCompile Include="Source\SceneTitle.cpp" />
+    <ClCompile Include="Source\TransitionManager.cpp" />
     <ClCompile Include="Source\Window.cpp" />
+    <ClCompile Include="Source\Wipe.cpp" />
+    <ClCompile Include="Source\ZoomToTexture.cpp" />
+    <ClInclude Include="Source\AlternatingBars.h" />
     <ClInclude Include="Source\Animation.h" />
+    <ClInclude Include="Source\AssetsManager.h" />
+    <ClInclude Include="Source\Bar.h" />
+    <ClInclude Include="Source\ButtonOrderPuzzle.h" />
+    <ClInclude Include="Source\CollectQuest.h" />
+    <ClInclude Include="Source\Dissolve.h" />
+    <ClInclude Include="Source\Easing.h" />
+    <ClInclude Include="Source\ExpandingBars.h" />
+    <ClInclude Include="Source\FadeToColor.h" />
+    <ClInclude Include="Source\GoToQuest.h" />
+    <ClInclude Include="Source\GuiCheckBox.h" />
+    <ClInclude Include="Source\GuiSlider.h" />
+    <ClInclude Include="Source\ImposibleQuest.h" />
     <ClInclude Include="Source\KidEnemy.h" />
-    <ClInclude Include="Source\Coin.h" />
     <ClInclude Include="Source\Color.h" />
     <ClInclude Include="Source\Debug.h" />
     <ClInclude Include="Source\Dialogue.h" />
     <ClInclude Include="Source\DialogueManager.h" />
-    <ClInclude Include="Source\EndingScreen.h" />
+    <ClInclude Include="Source\MenuTabs.h" />
+    <ClInclude Include="Source\MirrorPuzzle.h" />
+    <ClInclude Include="Source\Puzzle.h" />
+    <ClInclude Include="Source\PuzzleManager.h" />
+    <ClInclude Include="Source\PuzzlePiece.h" />
+    <ClInclude Include="Source\PartyMembersQuest.h" />
+    <ClInclude Include="Source\Quest.h" />
+    <ClInclude Include="Source\QuestManager.h" />
+    <ClInclude Include="Source\Menu.h" />
+    <ClInclude Include="Source\MenuCredits.h" />
+    <ClInclude Include="Source\MenuFight.h" />
+    <ClInclude Include="Source\MenuManager.h" />
+    <ClInclude Include="Source\MenuParty.h" />
+    <ClInclude Include="Source\MenuPause.h" />
+    <ClInclude Include="Source\MenuQuest.h" />
+    <ClInclude Include="Source\MenuSettings.h" />
+    <ClInclude Include="Source\MenuTitle.h" />
+    <ClInclude Include="Source\SceneEnding.h" />
     <ClInclude Include="Source\Fonts.h" />
     <ClInclude Include="Source\GuiButton.h" />
     <ClInclude Include="Source\GuiControl.h" />
     <ClInclude Include="Source\GuiManager.h" />
     <ClInclude Include="Source\ModuleController.h" />
     <ClInclude Include="Source\NPC.h" />
+    <ClInclude Include="Source\Particle.h" />
+    <ClInclude Include="Source\ParticleSystem.h" />
+    <ClInclude Include="Source\ParticleSystemManager.h" />
     <ClInclude Include="Source\PartyManager.h" />
     <ClInclude Include="Source\PerfTimer.h" />
     <ClInclude Include="Source\Scale.h" />
+    <ClInclude Include="Source\Scene.h" />
     <ClInclude Include="Source\SceneFight.h" />
-    <ClInclude Include="Source\SlimeEnemy.h" />
     <ClInclude Include="Source\Entity.h" />
     <ClInclude Include="Source\EntityManager.h" />
     <ClInclude Include="Source\Item.h" />
-    <ClInclude Include="Source\LogoScreen.h" />
+    <ClInclude Include="Source\SceneLogo.h" />
     <ClInclude Include="Source\Map.h" />
-    <ClInclude Include="Source\ModuleFadeToBlack.h" />
     <ClInclude Include="Source\Pathfinding.h" />
-    <ClInclude Include="Source\Physics.h" />
+    <ClInclude Include="Source\Collisions.h" />
     <ClInclude Include="Source\Player.h" />
     <ClInclude Include="Source\Queue.h" />
-    <ClInclude Include="Source\Scene.h" />
+    <ClInclude Include="Source\SceneGame.h" />
     <ClInclude Include="Source\Audio.h" />
     <ClInclude Include="Source\Input.h" />
     <ClInclude Include="Source\App.h" />
     <ClInclude Include="Source\Module.h" />
     <ClInclude Include="Source\Render.h" />
+    <ClInclude Include="Source\SceneManager.h" />
+    <ClInclude Include="Source\Slide.h" />
+    <ClInclude Include="Source\Spline.h" />
+    <ClInclude Include="Source\TalkQuest.h" />
     <ClInclude Include="Source\Textures.h" />
     <ClInclude Include="Source\Timer.h" />
-    <ClInclude Include="Source\TitleScreen.h" />
-    <ClInclude Include="Source\UI.h" />
+    <ClInclude Include="Source\SceneTitle.h" />
+    <ClInclude Include="Source\Transition.h" />
+    <ClInclude Include="Source\TransitionManager.h" />
     <ClInclude Include="Source\Window.h" />
     <ClInclude Include="Source\Defs.h" />
     <ClInclude Include="Source\List.h" />
@@ -180,10 +248,21 @@
     <ClInclude Include="Source\External\PugiXml\src\pugiconfig.hpp" />
     <ClInclude Include="Source\External\PugiXml\src\pugixml.hpp" />
     <ClCompile Include="Source\External\PugiXml\src\pugixml.cpp" />
+    <ClInclude Include="Source\Wipe.h" />
+    <ClInclude Include="Source\ZoomToTexture.h" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="..\Output\config.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Output\Assets\Maps\circusOne.tmx" />
+    <None Include="..\Output\Assets\Maps\circusTwo.tmx" />
+    <None Include="..\Output\Assets\Maps\housebasement.tmx" />
+    <None Include="..\Output\Assets\Maps\housefloor.tmx" />
+    <None Include="..\Output\Assets\Maps\inn.tmx" />
+    <None Include="..\Output\Assets\Maps\map_town.tmx" />
+    <None Include="..\Output\Assets\Maps\tavern.tmx" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>