Commit 263d33a1 authored by mercury233's avatar mercury233

Merge branch 'master' into test

parents fe784299 e8cd5080
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <dirent.h> #include <dirent.h>
#endif #endif
const unsigned short PRO_VERSION = 0x1341; const unsigned short PRO_VERSION = 0x1342;
namespace ygo { namespace ygo {
......
1 ICON "ygopro.ico" 1 ICON "ygopro.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1, 0, 34, 1 FILEVERSION 1, 0, 34, 2
PRODUCTVERSION 1, 0, 34, 1 PRODUCTVERSION 1, 0, 34, 2
FILEOS 0x4 FILEOS 0x4
FILETYPE 0x1 FILETYPE 0x1
...@@ -16,8 +16,8 @@ VALUE "InternalName", "YGOPro" ...@@ -16,8 +16,8 @@ VALUE "InternalName", "YGOPro"
VALUE "LegalCopyright", "Copyright (C) 2017 Fluorohydride" VALUE "LegalCopyright", "Copyright (C) 2017 Fluorohydride"
VALUE "OriginalFilename", "YGOPro_test.exe" VALUE "OriginalFilename", "YGOPro_test.exe"
VALUE "ProductName", "YGOPro" VALUE "ProductName", "YGOPro"
VALUE "FileVersion", "1.034.1.233" VALUE "FileVersion", "1.034.2.233"
VALUE "ProductVersion", "1.034.1.233" VALUE "ProductVersion", "1.034.2.233"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
Subproject commit edc8387e017e8c366ef09a87b90e35f2db4e20e1 Subproject commit 0abc46fdd0ec78371d79ea352eab2eb4e556cb4a
#config file #config file
#nickname & gamename should be less than 20 characters #nickname & gamename should be less than 20 characters
use_d3d = 0 use_d3d = 0
use_image_scale = 1
antialias = 2 antialias = 2
errorlog = 1 errorlog = 1
nickname = YGO233 Player nickname = YGO233 Player
...@@ -24,10 +25,11 @@ hide_hint_button = 0 ...@@ -24,10 +25,11 @@ hide_hint_button = 0
control_mode = 0 control_mode = 0
draw_field_spell = 1 draw_field_spell = 1
separate_clear_button = 1 separate_clear_button = 1
#auto_search_limit >= 0: Start search automatically when the user enters N chars. #auto_search_limit >= 0: Start search automatically when the user enters N chars
auto_search_limit = 0 auto_search_limit = -1
ignore_deck_changes = 0 ignore_deck_changes = 0
default_ot = 1 default_ot = 1
enable_bot_mode = 1
enable_sound = 1 enable_sound = 1
enable_music = 1 enable_music = 1
#Volume of sound and music, between 0 and 100 #Volume of sound and music, between 0 and 100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment