ref: c831031ba4545543445bbbf8dc8366edda3d94ad
parent: 242aa059204cce3cf40f56e1e3a4ecaf20279a92
parent: 3c7a1b285d5c36c1ddf863e5dcacb6f0e0e38f36
author: Clownacy <[email protected]>
date: Thu Jan 9 01:39:34 EST 2020
Merge branch 'accurate' into portable
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,4 +7,7 @@
# Do not change external files
external/** -text
-DoConfig/fltk/** -text
\ No newline at end of file
+DoConfig/fltk/** -text
+
+# TSC files are not text, but 'git diff' likes to think they are
+*.tsc binary
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,44 @@
# Exclude obj directory (object files for Makefile build)
/obj
-# Exclude converted resource files
-src/Resource
-
# Exclude build output directory
/game
+####
+# Accurate branch
+####
+
+# Exclude devilution-comparer assembly output
+/devilution/orig.asm
+/devilution/compare.asm
+
+# Exclude MSVC IntelliSense database
+/vs2003/CSE2.ncb
+
+# Exclude MSVC Solution User Options file
+/vs2003/CSE2.suo
+
+# Exclude MSVC build folders
+/vs2003/Debug
+/vs2003/Release
+/vs2003/Debug (Japanese)
+/vs2003/Release (Japanese)
+
+# Exclude Visual Studio 2017 files
+/vs2017/Debug
+/vs2017/Release
+/vs2017/Debug (Japanese)
+/vs2017/Release (Japanese)
+/vs2017/x64
+/vs2017/.vs
+/vs2017/CSE2.vcxproj.user
+
+####
+# Portable branch
+####
+
+# Exclude converted resource files
+/src/Resource
+
# Exclude the (recommended) CMake build directory
-build/*
+/build