mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-14 21:32:39 -08:00
Code Issues 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.
#Mon Feb 19 20:43:00 EST 2018
#Tue Feb 20 17:36:29 EST 2018
version=beta
androidBuildCode=248
androidBuildCode=249
name=Mindustry
code=3.3
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)){
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);
}

5
upload-build.sh
View file

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