vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/FWGS/xash3d-android-project

Browse source
This commit is contained in:
a1batross 2016-08-14 00:01:55 +06:00
commit c9febff75f
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build-test.sh
View file

@ -17,7 +17,8 @@ sh gen-version.sh test build
rm assets/extras.pak rm assets/extras.pak
python2.7 makepak.py xash-extras assets/extras.pak python2.7 makepak.py xash-extras assets/extras.pak
$AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
$JAVAC -d bin/classes -s bin/classes -cp $ANDROID_JAR gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java echo "package in.celest.xash3d.hl;public final class BuildConfig {public final static boolean DEBUG = true;}" > gen/in/celest/xash3d/hl/BuildConfig.java
$JAVAC -d bin/classes -s bin/classes -cp $ANDROID_JAR gen/in/celest/xash3d/hl/* src/in/celest/xash3d/*.java
$DX --dex --output=bin/classes.dex bin/classes/ $DX --dex --output=bin/classes.dex bin/classes/
$AAPT package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned $AAPT package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
zip bin/xash3d.apk.unaligned assets/* zip bin/xash3d.apk.unaligned assets/*

5
src/in/celest/xash3d/XashActivity.java
View file

@ -822,6 +822,11 @@ class XashInputConnection extends BaseInputConnection {
public boolean commitText(CharSequence text, int newCursorPosition) { public boolean commitText(CharSequence text, int newCursorPosition) {
//nativeCommitText(text.toString(), newCursorPosition); //nativeCommitText(text.toString(), newCursorPosition);
if(text.toString().equals("\n"))
{
XashActivity.nativeKey(KeyEvent.KEYCODE_ENTER,1);
XashActivity.nativeKey(KeyEvent.KEYCODE_ENTER,0);
}
XashActivity.nativeString(text.toString()); XashActivity.nativeString(text.toString());
return super.commitText(text, newCursorPosition); return super.commitText(text, newCursorPosition);