Merge branch 'accurate' into portable

This commit is contained in:
Clownacy 2020-04-20 13:08:51 +01:00
commit 24d8f318e5

39
.gitignore vendored
View file

@ -13,6 +13,8 @@
/game_english/DoConfig_debug /game_english/DoConfig_debug
/game_english/CSE2 /game_english/CSE2
/game_english/DoConfig /game_english/DoConfig
/game_english/CSE2_debug.rpx
/game_english/CSE2.rpx
/game_japanese/CSE2_debug.exe /game_japanese/CSE2_debug.exe
/game_japanese/DoConfig_debug.exe /game_japanese/DoConfig_debug.exe
/game_japanese/CSE2.exe /game_japanese/CSE2.exe
@ -21,18 +23,32 @@
/game_japanese/DoConfig_debug /game_japanese/DoConfig_debug
/game_japanese/CSE2 /game_japanese/CSE2
/game_japanese/DoConfig /game_japanese/DoConfig
/game_japanese/CSE2_debug.rpx
/game_japanese/CSE2.rpx
# Exclude save data # Exclude save data
/game_english/Config.dat /game_english/Config.dat
/game_english/Profile.dat /game_english/Profile.dat
/game_english/290.rec /game_english/290.rec
/game_english/window.rect
/game_japanese/Config.dat /game_japanese/Config.dat
/game_japanese/Profile.dat /game_japanese/Profile.dat
/game_japanese/290.rec /game_japanese/290.rec
/game_japanese/window.rect
#### # Exclude configuration files
# Accurate branch /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 # Exclude devilution-comparer assembly output
/devilution/orig.asm /devilution/orig.asm
@ -50,9 +66,20 @@
/vs2003/Debug (Japanese) /vs2003/Debug (Japanese)
/vs2003/Release (Japanese) /vs2003/Release (Japanese)
#### ###################
# Portable branch # Portable branch #
#### ###################
# Exclude Wii U build directory
/buildwiiu
# Exclude converted resource files # Exclude converted resource files
/src/Resource /src/Resource
###################
# Enhanced branch #
###################
# Exclude CSE2E configuration file
/game_english/ConfigCSE2E.dat
/game_japanese/ConfigCSE2E.dat