From 27c1257d97ba7f94a36b6ecd871d9e28b7df3c2e Mon Sep 17 00:00:00 2001 From: mittorn Date: Fri, 12 Aug 2016 21:28:05 +0000 Subject: [PATCH 1/4] Update branches --- xash-extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xash-extras b/xash-extras index 593aecc7..5bd72a90 160000 --- a/xash-extras +++ b/xash-extras @@ -1 +1 @@ -Subproject commit 593aecc741514518312146d9da7586bc5f2a924a +Subproject commit 5bd72a90a3fd3bf674a7de3d48cb5ca213e83cb1 From 8d26578c332f84bb0962c0888fd4c93101d91d9f Mon Sep 17 00:00:00 2001 From: mittorn Date: Fri, 12 Aug 2016 21:40:08 +0000 Subject: [PATCH 2/4] Update test build script --- build-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-test.sh b/build-test.sh index 29b15e48..039b2d79 100644 --- a/build-test.sh +++ b/build-test.sh @@ -17,7 +17,8 @@ sh gen-version.sh test build rm 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 -$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/ $AAPT package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned zip bin/xash3d.apk.unaligned assets/* From a5a51792dc9b4dc2536d92f9675fcc816eb36288 Mon Sep 17 00:00:00 2001 From: mittorn Date: Sat, 13 Aug 2016 17:02:48 +0000 Subject: [PATCH 3/4] Update hlsdk --- jni/src/hlsdk-xash3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d index 2f317acc..39662908 160000 --- a/jni/src/hlsdk-xash3d +++ b/jni/src/hlsdk-xash3d @@ -1 +1 @@ -Subproject commit 2f317acc241911dcf07ff8a70a0d374d9d744ecd +Subproject commit 396629081c3d89cb9e89c1a69cb34b43b4fa01c5 From a5a6dfb0dfe8034504879a3857064cab9a750b1a Mon Sep 17 00:00:00 2001 From: mittorn Date: Sat, 13 Aug 2016 20:31:00 +0000 Subject: [PATCH 4/4] Fix enter key in some keyboards --- src/in/celest/xash3d/XashActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java index 2f44f055..1fd17a13 100644 --- a/src/in/celest/xash3d/XashActivity.java +++ b/src/in/celest/xash3d/XashActivity.java @@ -822,6 +822,11 @@ class XashInputConnection extends BaseInputConnection { public boolean commitText(CharSequence text, int 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()); return super.commitText(text, newCursorPosition);