Try to fix short changelog, update mainui

gaerasimi · Nov 27, 2017 · e51c8ef · e51c8ef
1 parent 4493d80
commit e51c8ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/mainui b/mainui
diff --git a/scripts/.travis-deploy.sh.swp b/scripts/.travis-deploy.sh.swp
diff --git a/scripts/travis-deploy.sh b/scripts/travis-deploy.sh
@@ -16,12 +16,12 @@ else
  echo >> README.md
  echo Short changelog: >> README.md
  echo \`\`\` >> README.md
- (cd ..;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt`.. )| cut -d ' ' -f 1-3,5-100 >> README.md
+ (cd $TRAVIS_BUILD_DIR;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt`.. )| cut -d ' ' -f 1-3,5-100 >> README.md
  echo \`\`\` >> README.md
  echo >> README.md
- echo [code on github]\(https://github.com/FWGS/xash3d/tree/$TRAVIS_COMMIT\) >> README.md
+ echo [Code on GitHub]\(https://github.com/FWGS/xash3d/tree/$TRAVIS_COMMIT\) >> README.md
  echo >> README.md
- echo [full changelog for this build]\(https://github.com/FWGS/xash3d/commits/$TRAVIS_COMMIT\) >> README.md
+ echo [Full changelog for this build]\(https://github.com/FWGS/xash3d/commits/$TRAVIS_COMMIT\) >> README.md
  echo >> README.md
  for arg in $*; do
   echo \* [$arg]\(https://github.com/FWGS/xash3d-deploy/blob/$SOURCE_NAME-$TRAVIS_BRANCH/$arg\?raw\=true\) >> README.md
+1 −0		Android.mk
+1 −40		BaseMenu.cpp
+1 −1		CMakeLists.txt
+1 −0		Makefile.linux
+2 −2		controls/Action.cpp
+2 −0		controls/Action.h
+1 −1		controls/BaseWindow.cpp
+3 −0		controls/BaseWindow.h
+4 −4		controls/Bitmap.cpp
+5 −1		controls/Bitmap.h
+2 −2		controls/CheckBox.cpp
+2 −0		controls/CheckBox.h
+128 −0		controls/Editable.cpp
+33 −107		controls/Editable.h
+2 −2		controls/Field.cpp
+2 −0		controls/Field.h
+5 −5		controls/Framework.cpp
+2 −0		controls/Framework.h
+2 −2		controls/ItemsHolder.cpp
+2 −0		controls/ItemsHolder.h
+1 −1		controls/MessageBox.cpp
+2 −0		controls/MessageBox.h
+2 −2		controls/PicButton.cpp
+2 −0		controls/PicButton.h
+1 −1		controls/ProgressBar.cpp
+2 −0		controls/ProgressBar.h
+2 −2		controls/ScrollList.cpp
+2 −0		controls/ScrollList.h
+2 −2		controls/Slider.cpp
+2 −0		controls/Slider.h
+2 −2		controls/SpinControl.cpp
+2 −0		controls/SpinControl.h
+2 −2		controls/Switch.cpp
+2 −0		controls/Switch.h
+1 −1		controls/TabView.cpp
+2 −1		controls/TabView.h
+2 −2		controls/Table.cpp
+2 −0		controls/Table.h
+40 −1		controls/YesNoMessageBox.cpp
+4 −2		controls/YesNoMessageBox.h
+1 −1		menus/ConnectionProgress.cpp
+1 −1		menus/Credits.cpp
+2 −2		menus/GameOptions.cpp
+7 −4		menus/LoadGame.cpp