Merge branch 'master' into another

.travis.yml

@@ -4,7 +4,7 @@ os:
 - osx
 sudo: required
 dist: xenial
-osx_image: xcode8
+osx_image: xcode9.4
 addons:
   ssh_known_hosts:
   - github.com
@@ -16,11 +16,23 @@ addons:
       - libgl1-mesa-dev
       - libglu-dev
       - p7zip-full
+  homebrew:
+    packages:
+      - freetype
+      - libevent
+      - sqlite
+      - dylibbundler
+      - p7zip
 env:
 - USE_IRRKLANG=1
 before_install:
 - git submodule update --init --recursive
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install freetype libevent sqlite dylibbundler p7zip; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
+  sudo rm -rf /usr/local/include/unistring;
+  sudo rm -rf /usr/local/include/lzma;
+  sudo rm -f /usr/local/include/CGAL/stddef.h; fi
+
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir irrlicht ; cd irrlicht ; curl --retry 5 --location https://github.com/moecube/irrlicht/releases/download/test/irrlicht-mycard-mac.tar.gz | tar zfx - ; cp libIrrlicht.a /usr/local/lib/ ; sudo cp -r include /usr/local/include/irrlicht ; cd .. ; fi
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     curl --location --retry 5 https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-macosx.tar.gz | tar zfx -;
@@ -30,8 +42,6 @@ before_install:
     curl --location --retry 5 https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -;
   fi
 
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir irrlicht ; cd irrlicht ; curl --retry 5 --location https://github.com/moecube/irrlicht/releases/download/test/irrlicht-mycard-mac.tar.gz | tar zfx - ; cp libIrrlicht.a /usr/local/lib/ ; sudo cp -r include /usr/local/include/irrlicht ; cd .. ; fi
-
 - git clone --depth=1 https://$NANAHIRA@github.com/purerosefallen/irrklang
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@@ -49,7 +59,8 @@ script:
 - cd ..
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv bin/release/ygopro ./; strip ygopro;
   fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+- |
+  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     mkdir -p ygopro.app/Contents/MacOS;
     mv bin/release/ygopro ygopro.app/Contents/MacOS;
     dylibbundler -x ygopro.app/Contents/MacOS/ygopro -b -d ygopro.app/Contents/Frameworks/ -p @executable_path/../Frameworks/ -cd;
@@ -59,10 +70,10 @@ script:
     defaults write "$PWD/ygopro.app/Contents/Info.plist" "CFBundleIdentifier" "moe.mycard.ygopro";
     if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
       echo $CERTIFICATE | base64 --decode --output cert.p12;
-      security create-keychain -p "" build.keychain; security unlock-keychain -p "" build.keychain;
-      security import cert.p12 -k build.keychain -P "$CERTIFICATE_PASSWORD" -T /usr/bin/codesign;
-      codesign --deep --keychain build.keychain --sign "$(security find-identity -v -p
-      codesigning build.keychain | head -1 | grep -o '".*"' | tr -d '"')" ygopro.app;
+      security create-keychain -p "" build.keychain; security default-keychain -s build.keychain; security unlock-keychain -p "" build.keychain;
+      security import cert.p12 -P "$CERTIFICATE_PASSWORD" -T /usr/bin/codesign;
+      security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain;
+      codesign --deep --sign "$(security find-identity -v -p codesigning build.keychain | head -1 | grep -o '".*"' | tr -d '"')" ygopro.app;
     fi
   fi
 before_deploy:

gframe/game.h

@@ -505,6 +505,13 @@ public:
 	irr::gui::IGUIButton* btnSideSort;
 	irr::gui::IGUIButton* btnSideReload;
 	irr::gui::IGUIEditBox* ebDeckname;
+	irr::gui::IGUIButton* btnRenameDeck;
+	//deck rename
+	irr::gui::IGUIWindow* wRenameDeck;
+	irr::gui::IGUIEditBox* ebREName;
+	irr::gui::IGUIButton* btnREYes;
+	irr::gui::IGUIButton* btnRENo;
+  //
 	irr::gui::IGUIStaticText* stBanlist;
 	irr::gui::IGUIStaticText* stDeck;
 	irr::gui::IGUIStaticText* stCategory;
@@ -516,12 +523,6 @@ public:
 	irr::gui::IGUIStaticText* stStar;
 	irr::gui::IGUIStaticText* stSearch;
 	irr::gui::IGUIStaticText* stScale;
-	irr::gui::IGUIButton* btnRenameDeck;
-	//deck rename
-	irr::gui::IGUIWindow* wRenameDeck;
-	irr::gui::IGUIEditBox* ebREName;
-	irr::gui::IGUIButton* btnREYes;
-	irr::gui::IGUIButton* btnRENo;
 	//filter
 	irr::gui::IGUIStaticText* wFilter;
 	irr::gui::IGUIScrollBar* scrFilter;

ocgcore @ 7e31c871

-Subproject commit 96821733e00b1dae57a2e60fffa99db84ff311bd
+Subproject commit 7e31c871906d86055479a1248965385a634997c1

script @ 3b2030ee

-Subproject commit 68a3de27cbd22e6cf74157feeaa2b8e5ee455636
+Subproject commit 3b2030eeaff8558f81a8c635451b5be95ccacb33

system.conf

@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4936
+pro_version = 4937
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi