Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Possible build upload script fix

Browse Source
This commit is contained in:
Anuken
2018-02-20 19:40:19 -05:00
parent d52d9bec81
commit f2a952fcfe
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Mon Feb 19 20:43:00 EST 2018 #Tue Feb 20 17:36:29 EST 2018
version=beta version=beta
androidBuildCode=248 androidBuildCode=249
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=custom build build=custom build

2
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -354,7 +354,7 @@ public class Control extends Module{
if(!state.is(State.menu)){ if(!state.is(State.menu)){
input.update(); input.update();
if(Inputs.keyTap("pause") && !ui.restart.isShown() && !Net.active() && (state.is(State.paused) || state.is(State.playing))){ if(Inputs.keyTap("pause") && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){
state.set(state.is(State.playing) ? State.paused : State.playing); state.set(state.is(State.playing) ? State.paused : State.playing);
} }

5
upload-build.sh
View File

@@ -17,8 +17,9 @@ if [ ! -e $FILE1 ]; then
touch $FILE1 touch $FILE1
fi fi
NEWLINE="\n" echo "### Commit #"$TRAVIS_COMMIT"." >> $FILE1
echo "### Commit #"$TRAVIS_COMMIT".${NEWLINE}Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 echo >> $FILE1
echo "Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1
git add $FILE1 git add $FILE1
git add $DESKFILE git add $DESKFILE