デフォルトのJSONファイルが個別JSONファイルの設定を上書きしていた問題を修正

[mmo/main.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9598179..1586b35 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,31 +4,38 @@
 *.sln
 *.vcxproj
 *.vcxproj.filters
+*.ttf
+*.sdf
+*.user
+*.log
 log_*.txt
 /ipch
 /Release
 /Debug
 /Client/Log.txt
-/Client/*.user
 /Client/account.xml
 /Client/bin/account.xml
 /Client/bin/config.json
 /Client/bin/Log.txt
 /Client/bin/server
-/Server/*.sdf
-/Server/*.user
 /Server/server_key.pub
 /Server/server_key
 /Server/Debug
 /Client/Release
 /Client/Debug
 /client/resourse.aps
-/client/bin/resources/textures
 /client/buildversion.hpp
 /client/get_auto_ver_client.vbs
 /server/get_auto_ver_server.vbs
 /server/buildversion.hpp
 /server/Release
-/client/bin/resources/models
-/client/bin/resources/motions
-/client/bin/resources/fonts
+/ServerLauncher
+/client/bin/server
+/client/bin/tool
+/client/bin/widgets
+/client/bin/models
+/client/bin/motions
+/client/bin/screenshot
+/client/bin/log
+/client/bin/Log.txt
+/client/bin/user