Merge branch 'develop'

Former-commit-id: 18270e126afbf3bda2d3e3c2e8dc1132cbb2e85c [formerly dd95dd33a38889604f53ecfd9260e3899bc3b102] [formerly 9f86f1e332974459cabf304f0856d7fd506028a7 [formerly 24ba363152e7bbc35d86ee478a1d3a802977a308]] Former-commit-id: 9b2e168db12bc3a32e26ea956faa0445cc668b93 [formerly dcc17948d6faef65373dac53ee425d76be122ae4] Former-commit-id: 639af30a6fadb0caff3fea1e85a782272a8e0a45
OpenArkStudio · May 29, 2018 · 58e5a93 · 58e5a93
2 parents f654f53 + 893ecb1
commit 58e5a93
Show file tree

Hide file tree

Showing 242 changed files with 19,126 additions and 28,435 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 sudo: false
 language: cpp
 
+env:
+  global:
+    - LANG="en_US.UTF-8"
+    - COVERAGE=false
+
 compiler:
   - gcc
 
@@ -16,7 +21,12 @@ addons:
       #- g++-4.9
       - cmake-data
       - cmake
-
+      - lcov
+    #sonarcloud
+    sonarcloud:
+        organization: "ark-game"
+        token:
+            secure: "ddzOfx+RRNCBteyQbwhTzB/r/gj8dTeTNOu5V9+4cAhMyaUoGzRMe2QYdknid/ichhNJ4eOcwAnmhil7XR1cIobpL52r05WL/+SYogy3U2cXAS9K4y/7To38GxdRXSx9mk0VTWjRW8A8wwVGOteOAuieW0jbXivgxUrGZEybqinzNj9ndLJ1iPapihVWQFy7GmQC3gIkLVLLa1d/ueYiilMOvIsbWjGdVFm3pyNXq2TUQurYuxYAVCYv9BTlj0EeyVHjKcL+OcMDJGSd8rUlLKl/HueM9pBXNi4w3zlVBZpccpJxYbXezf/DDSO7zJlYkBAZ+x6fzGFILVjvEhvdotz49f03/orJa3ofw+oOGYZn8wKQ0DnWSEva39+kLZsqMC+hEMbxcnc/4hUGmFia5HWYdjX3lTiWBGU8H+nhuVQ4XlJaBsN7fUCgfQFDiz0GrwwvXNxHkh2w484oYXVBCHi+T8Fxjmy7JetwkVf2UbCQ+g921peaQr+LeGno0VviJRSqvINlRaMqEu+1+X2/njee9VAQmkXe18bMOzrZjmSHZct5hAIjGNDl67gmZqQ7afI33+rQ7sG32v7jWp66hilYbDVgFnsYVCZKZqtDx/EDL22awKg+zMSrokORwcWIZVAe6R4LEJcUtiOIkpkqqZ7b8a5L2vOc0G0p4GBktR0="
 before_install:
   # run build_dep.sh
   - pwd
@@ -25,16 +35,24 @@ before_install:
   - ./build_dep.sh
   - cd ..
 
+install:
+    #- sudo pip install --upgrade pip
+    #- sudo pip install codecov
+
 before_script:
   # cmake
   - if [-d "build" ]; then rm -rf build; fi
   - mkdir build && cd build
-  - cmake -G "Unix Makefiles" ..
+  - cmake -G "Unix Makefiles" -DENABLE_COVERAGE=ON ..
 
 script:
   # make
   - make -j 8
-
-env:
-  global:
-    - LANG="en_US.UTF-8"
+
+after_success:
+  #- bash <(curl -s https://codecov.io/bash)
+
+notifications:
+  email:
+    - [email protected]
+    - [email protected]
diff --git a/Bin/Examples/Debug/log/.gitignore b/Bin/Examples/Debug/log/.gitignore
diff --git a/Bin/Examples/Release/log/.gitignore b/Bin/Examples/Release/log/.gitignore
diff --git a/Bin/Server/Debug/AFGameServer/log.conf b/Bin/Server/Debug/AFGameServer/log.conf
diff --git a/Bin/Server/Debug/AFGameServer/log_win.conf b/Bin/Server/Debug/AFGameServer/log_win.conf
diff --git a/Bin/Server/Debug/AFLoginServer/log.conf b/Bin/Server/Debug/AFLoginServer/log.conf
diff --git a/Bin/Server/Debug/AFLoginServer/log_win.conf b/Bin/Server/Debug/AFLoginServer/log_win.conf
diff --git a/Bin/Server/Debug/AFMasterServer/log.conf b/Bin/Server/Debug/AFMasterServer/log.conf
diff --git a/Bin/Server/Debug/AFMasterServer/log_win.conf b/Bin/Server/Debug/AFMasterServer/log_win.conf
diff --git a/Bin/Server/Debug/AFProxyServer/log.conf b/Bin/Server/Debug/AFProxyServer/log.conf
diff --git a/Bin/Server/Debug/AFProxyServer/log_win.conf b/Bin/Server/Debug/AFProxyServer/log_win.conf
diff --git a/Bin/Server/Debug/AFWorldServer/log.conf b/Bin/Server/Debug/AFWorldServer/log.conf
diff --git a/Bin/Server/Debug/AFWorldServer/log_win.conf b/Bin/Server/Debug/AFWorldServer/log_win.conf
diff --git a/Bin/Server/Debug/log/.gitignore b/Bin/Server/Debug/log/.gitignore