mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 19:57:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Un-broke multiblock breaking, tweaked build script

Browse Source
This commit is contained in:
Anuken 2018-03-09 17:51:01 -05:00
parent 1c8b451ec8
commit 460496339b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/version.properties
View File

@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Fri Mar 09 17:11:02 EST 2018 #Fri Mar 09 17:44:08 EST 2018
version=release version=release
androidBuildCode=364 androidBuildCode=364
name=Mindustry name=Mindustry

3
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@ -157,7 +157,8 @@ public class DesktopInput extends InputHandler{
} }
boolean select(){ boolean select(){
return !Inputs.keyDown("select") && !Inputs.keyRelease("select"); return !Inputs.keyDown("select") && !Inputs.keyRelease("select") &&
!Inputs.keyDown("break") && !Inputs.keyRelease("break");
} }
public int tilex(){ public int tilex(){

6
upload-build.sh
View File

@ -24,9 +24,11 @@ fi
touch $FILE1 touch $FILE1
echo "### Build "$TRAVIS_BUILD_NUMBER", Commit "$TRAVIS_COMMIT"." >> $FILE1 echo "#### Latest Bleeding Edge Build: "$TRAVIS_BUILD_NUMBER"" >> $FILE1
echo "###### Commit: "$TRAVIS_COMMIT"" >> $FILE1
echo >> $FILE1 echo >> $FILE1
echo "Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1 echo "[Desktop JAR download.]("$DESKFILE")" >> $FILE1
echo "*Requires Java to run, as usual.*" >> $FILE1
git add $FILE1 git add $FILE1
git add $DESKFILE git add $DESKFILE