From f0d705ba171c3d6a76d732a6aa605ad3860db10c Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 5 Apr 2015 08:35:19 +0200 Subject: [PATCH 01/15] lower waiting time for the multi-player game --- source/glest_game/network/network_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/glest_game/network/network_interface.cpp b/source/glest_game/network/network_interface.cpp index 8ff4d236..f4a55263 100644 --- a/source/glest_game/network/network_interface.cpp +++ b/source/glest_game/network/network_interface.cpp @@ -32,7 +32,7 @@ namespace Glest{ namespace Game{ // class NetworkInterface // ===================================================== -const int NetworkInterface::readyWaitTimeout= 180000; // 3 minutes +const int NetworkInterface::readyWaitTimeout= 105000; // 1 minute and 45 seconds bool NetworkInterface::allowGameDataSynchCheck = false; bool NetworkInterface::allowDownloadDataSynch = false; From 52478d9c0937842c85e0a3d2b6b5ef42ca6bee4a Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 00:46:08 +0100 Subject: [PATCH 02/15] compilation after installation of deps --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c630ffbf..eceae6b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ before_install: - sudo apt-get update -qq # UPDATE REPOS #- sudo apt-get upgrade -qq # UPGRADE SYSTEM TO LATEST PATCH LEVEL - sudo apt-get install -y -qq - - sudo ./.travis-before_install.sh - sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL OUR DEPENDENCIES + - sudo ./.travis-before_install.sh script: # ALL THE BUILD COMMANDS HERE From 53d1f6374152b92236a708841dcf880abfe67099 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Sun, 27 Dec 2015 00:53:09 +0100 Subject: [PATCH 03/15] Make git a bit more usable --- mk/linux/git_update.sh | 28 ++++++++++++++++++++++++++++ mk/linux/mg_git.sh | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 mk/linux/git_update.sh diff --git a/mk/linux/git_update.sh b/mk/linux/git_update.sh new file mode 100755 index 00000000..281981c4 --- /dev/null +++ b/mk/linux/git_update.sh @@ -0,0 +1,28 @@ +#!/bin/bash +LANG=en_US.utf-8 + +cd "$(dirname $(readlink -f $0))" + +echo STAGE 1/3 - GIT PULL +echo +echo Entering ../.. +git pull +echo +git submodule foreach 'git pull; echo' + +echo +echo +echo STAGE 2/3 - GIT BRANCH +echo +echo Entering ../.. +git branch +echo +git submodule foreach 'git branch; echo' + +echo +echo STAGE 3/3 - GIT STATUS +echo +echo Entering ../.. +git status +echo +git submodule foreach 'git status; echo' diff --git a/mk/linux/mg_git.sh b/mk/linux/mg_git.sh index 3ed8271a..d59e3d31 100755 --- a/mk/linux/mg_git.sh +++ b/mk/linux/mg_git.sh @@ -12,7 +12,7 @@ usage() { case $1 in - pull ) + pull|status|branch ) echo '==> Running "git '"$1"'" on main repository...' cd $(dirname $0) git $1 From a561f6dfdfe9635bb20c869a5231a22f832cafcd Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 12:16:15 +0100 Subject: [PATCH 04/15] travis test, 1 --- .travis.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eceae6b4..e12b25b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,25 @@ -# http://docs.travis-ci.com/user/build-configuration/ +# https://docs.travis-ci.com/user/customizing-the-build/ language: cpp compiler: - gcc - clang +env: + - GCC_VERSION="5" + - GCC_VERSION="native" + - LLVM_VERSION="3.7" + - LLVM_VERSION="3.6" + - LLVM_VERSION="3.5" + - LLVM_VERSION="native" + matrix: #include: # - compiler: gcc # - compiler: clang allow_failures: - compiler: clang + #- env: LLVM_VERSION=3.5 git: submodules: false @@ -20,10 +29,20 @@ git: # - master before_install: + - if [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi + # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi + # http://llvm.org/apt/ + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi - sudo apt-get update -qq # UPDATE REPOS #- sudo apt-get upgrade -qq # UPGRADE SYSTEM TO LATEST PATCH LEVEL - sudo apt-get install -y -qq + - if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then sudo apt-get install -qq gcc-${GCC_VERSION} g++-${GCC_VERSION}; fi + - if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION}; fi + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL OUR DEPENDENCIES + - $CXX --version - sudo ./.travis-before_install.sh script: From 430d1edb04e7223a6a2e309af3eb770b495a7a12 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 12:38:46 +0100 Subject: [PATCH 05/15] travis test, 2 --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e12b25b7..3f8f530d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,15 @@ # https://docs.travis-ci.com/user/customizing-the-build/ language: cpp +sudo: required + compiler: - gcc - clang env: - - GCC_VERSION="5" - - GCC_VERSION="native" - - LLVM_VERSION="3.7" - - LLVM_VERSION="3.6" - - LLVM_VERSION="3.5" - - LLVM_VERSION="native" + - GCC_VERSION="5" LLVM_VERSION="3.7" + - GCC_VERSION="native" LLVM_VERSION="native" matrix: #include: @@ -39,7 +37,7 @@ before_install: - sudo apt-get install -y -qq - if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then sudo apt-get install -qq gcc-${GCC_VERSION} g++-${GCC_VERSION}; fi - if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION}; fi + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL OUR DEPENDENCIES - $CXX --version From b1262075d0685d4bdf12b2f3d5db36c8a8cf3597 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 12:55:11 +0100 Subject: [PATCH 06/15] travis test, 3 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3f8f530d..0f81abba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ before_install: - if [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main'; fi # http://llvm.org/apt/ - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi - sudo apt-get update -qq # UPDATE REPOS From 03303598bb54602db1b95e4ceb0b7f884314326d Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 12:58:34 +0100 Subject: [PATCH 07/15] travis test, 4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f81abba..75f3b4e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - if [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi - - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main'; fi + - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"; fi # http://llvm.org/apt/ - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi - sudo apt-get update -qq # UPDATE REPOS From 7b6baab8b7a13404884a3db9332cfd29746af631 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 13:57:01 +0100 Subject: [PATCH 08/15] travis test, 5 --- .travis.yml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75f3b4e3..85218680 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,21 +3,36 @@ language: cpp sudo: required +os: + - linux + - osx + compiler: - gcc - clang env: - - GCC_VERSION="5" LLVM_VERSION="3.7" - - GCC_VERSION="native" LLVM_VERSION="native" + - GCC_VERSION="5" + - GCC_VERSION="native" + - LLVM_VERSION="3.7" + - LLVM_VERSION="native" matrix: - #include: - # - compiler: gcc - # - compiler: clang - allow_failures: + exclude: + - compiler: gcc + env: LLVM_VERSION="3.7" + - compiler: gcc + env: LLVM_VERSION="native" - compiler: clang - #- env: LLVM_VERSION=3.5 + env: GCC_VERSION="5" + - compiler: clang + env: GCC_VERSION="native" + - compiler: clang + env: LLVM_VERSION="native" # broken compiler + - os: osx + compiler: gcc # broken compiler + - os: osx + compiler: clang # missing configuration here git: submodules: false From 3786c8db8cf277c2a78d2228714c6c2faa144481 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 14:40:31 +0100 Subject: [PATCH 09/15] travis test, 6 --- .travis.yml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85218680..54d71705 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,16 @@ matrix: env: GCC_VERSION="5" - compiler: clang env: GCC_VERSION="native" - - compiler: clang + - os: linux + compiler: clang env: LLVM_VERSION="native" # broken compiler - os: osx compiler: gcc # broken compiler - os: osx - compiler: clang # missing configuration here + compiler: clang + env: LLVM_VERSION="3.7" # missing configuration here + allow_failures: + - os: osx # remove when native clang will work git: submodules: false @@ -42,26 +46,28 @@ git: # - master before_install: - - if [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test - - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi - - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"; fi # http://llvm.org/apt/ - - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi - - sudo apt-get update -qq # UPDATE REPOS - #- sudo apt-get upgrade -qq # UPGRADE SYSTEM TO LATEST PATCH LEVEL - - sudo apt-get install -y -qq - - if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then sudo apt-get install -qq gcc-${GCC_VERSION} g++-${GCC_VERSION}; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi # UPDATE REPOS + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi + #- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get upgrade -qq; fi # UPGRADE SYSTEM TO LATEST PATCH LEVEL + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -y -qq; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then sudo apt-get install -qq gcc-${GCC_VERSION} g++-${GCC_VERSION}; fi - if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - - sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL OUR DEPENDENCIES + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES - $CXX --version - - sudo ./.travis-before_install.sh + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi script: # ALL THE BUILD COMMANDS HERE - - mk/linux/build-mg.sh -c 4 + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then mk/linux/build-mg.sh -c 4; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macosx/build-mg.sh -c 4; fi notifications: irc: From a97a29392c62ff2b3274c7beec244c8b9d492f6f Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 15:52:39 +0100 Subject: [PATCH 10/15] travis test, 7 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 54d71705..1bbdb8d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,9 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pkg-config sdl2 lua jpeg libpng freetype ftgl libogg glew libvorbis cppunit fribidi miniupnpc wxmac; fi - $CXX --version + - cmake --version - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi script: From 06a5833f663efc4b9752b011afc4f2cb3aaa2c10 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 15:59:17 +0100 Subject: [PATCH 11/15] travis test, 8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1bbdb8d5..cbcce5db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pkg-config sdl2 lua jpeg libpng freetype ftgl libogg glew libvorbis cppunit fribidi miniupnpc wxmac; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit fribidi miniupnpc wxmac; fi - $CXX --version - cmake --version - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi From 4a0bd2d2d866789edc3783b7f97915f73ad94719 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 16:19:01 +0100 Subject: [PATCH 12/15] travis test, 9 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbcce5db..0c1f41e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,10 @@ matrix: compiler: clang env: LLVM_VERSION="native" # broken compiler - os: osx - compiler: gcc # broken compiler + compiler: gcc # unsupported compiler - os: osx compiler: clang - env: LLVM_VERSION="3.7" # missing configuration here + env: LLVM_VERSION="3.7" # missing compiler by brew allow_failures: - os: osx # remove when native clang will work @@ -61,7 +61,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi - if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit fribidi miniupnpc wxmac; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit glib fribidi miniupnpc wxmac; fi - $CXX --version - cmake --version - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi From 4c8483191f48f10ff71869e858afb4804268b657 Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 16:34:54 +0100 Subject: [PATCH 13/15] travis test, end - osx failure not allowed --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c1f41e5..b526d9ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,8 @@ matrix: - os: osx compiler: clang env: LLVM_VERSION="3.7" # missing compiler by brew - allow_failures: - - os: osx # remove when native clang will work + #allow_failures: + # - os: osx git: submodules: false From 1f1156b9b6665714e5fff65e28354bc6e5d7c92a Mon Sep 17 00:00:00 2001 From: filux Date: Sun, 27 Dec 2015 19:12:00 +0100 Subject: [PATCH 14/15] few second less + should look better on the loading screen --- source/glest_game/network/network_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/glest_game/network/network_interface.cpp b/source/glest_game/network/network_interface.cpp index f4a55263..a880a5c0 100644 --- a/source/glest_game/network/network_interface.cpp +++ b/source/glest_game/network/network_interface.cpp @@ -32,7 +32,7 @@ namespace Glest{ namespace Game{ // class NetworkInterface // ===================================================== -const int NetworkInterface::readyWaitTimeout= 105000; // 1 minute and 45 seconds +const int NetworkInterface::readyWaitTimeout= 99000; // 99 seconds to 0 looks good on the screen bool NetworkInterface::allowGameDataSynchCheck = false; bool NetworkInterface::allowDownloadDataSynch = false; From c873e72a4fe87061379b86770e18260ccd1e9196 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 28 Dec 2015 12:54:44 -0800 Subject: [PATCH 15/15] - attempt to see if thsi helsp network play to be more smooth --- source/glest_game/network/network_interface.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/glest_game/network/network_interface.cpp b/source/glest_game/network/network_interface.cpp index 36fd7b90..ddd62357 100644 --- a/source/glest_game/network/network_interface.cpp +++ b/source/glest_game/network/network_interface.cpp @@ -168,19 +168,19 @@ NetworkMessageType NetworkInterface::getNextMessageType(int waitMilliseconds) { ((waitMilliseconds <= 0 && socket->hasDataToRead() == true) || (waitMilliseconds > 0 && socket->hasDataToReadWithWait(waitMilliseconds) == true))) { //peek message type - int dataSize = socket->getDataToRead(); - if(dataSize >= (int)sizeof(messageType)) { - if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] socket->getDataToRead() dataSize = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,dataSize); + //int dataSize = socket->getDataToRead(); + //if(dataSize >= (int)sizeof(messageType)) { + // if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] socket->getDataToRead() dataSize = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,dataSize); //int iPeek = socket->peek(&messageType, sizeof(messageType)); //if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] socket->getDataToRead() iPeek = %d, messageType = %d [size = %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,iPeek,messageType,sizeof(messageType)); int bytesReceived = socket->receive(&messageType, sizeof(messageType), true); if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] socket->getDataToRead() iPeek = %d, messageType = %d [size = %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,bytesReceived,messageType,sizeof(messageType)); - } - else { - if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] PEEK WARNING, socket->getDataToRead() messageType = %d [size = %d], dataSize = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,messageType,sizeof(messageType),dataSize); - } + //} + //else { + // if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] PEEK WARNING, socket->getDataToRead() messageType = %d [size = %d], dataSize = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,messageType,sizeof(messageType),dataSize); + //} //sanity check new message type if(messageType < 0 || messageType >= nmtCount) {