ref: 24d8f318e573bbddc8f057f5686bcfb175204a05
parent: 7450952a240258bcbad5032a46a1ff7836471f9e
parent: 46ca9b4d4ab07c6a40c6e4da192196e414b47a3d
author: Clownacy <Clownacy@users.noreply.github.com>
date: Mon Apr 20 09:08:51 EDT 2020
Merge branch 'accurate' into portable
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@
/game_english/DoConfig_debug
/game_english/CSE2
/game_english/DoConfig
+/game_english/CSE2_debug.rpx
+/game_english/CSE2.rpx
/game_japanese/CSE2_debug.exe
/game_japanese/DoConfig_debug.exe
/game_japanese/CSE2.exe
@@ -21,19 +23,33 @@
/game_japanese/DoConfig_debug
/game_japanese/CSE2
/game_japanese/DoConfig
+/game_japanese/CSE2_debug.rpx
+/game_japanese/CSE2.rpx
# Exclude save data
/game_english/Config.dat
/game_english/Profile.dat
/game_english/290.rec
+/game_english/window.rect
/game_japanese/Config.dat
/game_japanese/Profile.dat
/game_japanese/290.rec
+/game_japanese/window.rect
-####
-# Accurate branch
-####
+# Exclude configuration files
+/game_english/fps
+/game_english/mute
+/game_english/save
+/game_english/s_reverse
+/game_japanese/fps
+/game_japanese/mute
+/game_japanese/save
+/game_japanese/s_reverse
+###################
+# Accurate branch #
+###################
+
# Exclude devilution-comparer assembly output
/devilution/orig.asm
/devilution/compare.asm
@@ -50,9 +66,20 @@
/vs2003/Debug (Japanese)
/vs2003/Release (Japanese)
-####
-# Portable branch
-####
+###################
+# Portable branch #
+###################
+# Exclude Wii U build directory
+/buildwiiu
+
# Exclude converted resource files
/src/Resource
+
+###################
+# Enhanced branch #
+###################
+
+# Exclude CSE2E configuration file
+/game_english/ConfigCSE2E.dat
+/game_japanese/ConfigCSE2E.dat