Merge branch 'save-states'

amaiorano · Apr 1, 2015 · bfb3a47 · bfb3a47
2 parents 9923f29 + db6c1d9
commit bfb3a47
Show file tree

Hide file tree

Showing 29 changed files with 578 additions and 199 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ ipch/
 
 # Project-specific
 temp/
-*.dmp
+saves/
+dumps/
 *.log
 *.raw
diff --git a/nes-emu.vcxproj b/nes-emu.vcxproj
@@ -39,6 +39,7 @@
     <ClInclude Include="src\Ppu.h" />
     <ClInclude Include="src\Renderer.h" />
     <ClInclude Include="src\Rom.h" />
+    <ClInclude Include="src\Serializer.h" />
     <ClInclude Include="src\System.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/nes-emu.vcxproj.filters b/nes-emu.vcxproj.filters
@@ -94,6 +94,9 @@
     <ClInclude Include="src\AudioDriver.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\Serializer.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Cpu.cpp">
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ ipch/ @@
     # Project-specific
     temp/
-    *.dmp
+    saves/
+    dumps/
     *.log
     *.raw