diff --git a/assets/shoot.png b/assets/shoot.png index 7ecadf2a..e00e45b4 100644 Binary files a/assets/shoot.png and b/assets/shoot.png differ diff --git a/assets/use.png b/assets/use.png index 8acffb10..91acf891 100644 Binary files a/assets/use.png and b/assets/use.png differ diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d index e3d4a112..8e493fcd 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit e3d4a112afeb0e11a8ac85a55d39067e77f42ef0 +Subproject commit 8e493fcd57ae8f2ab183a5e1d69580f0aa679740 diff --git a/jni/src/XashXT/XashXT b/jni/src/XashXT/XashXT index 2e584501..222d4845 160000 --- a/jni/src/XashXT/XashXT +++ b/jni/src/XashXT/XashXT @@ -1 +1 @@ -Subproject commit 2e584501093a9ef1d51d469e21f2444b104592a6 +Subproject commit 222d4845a6b0cf8926775bcf3c207ef0d31eb53b diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java index d2795eb2..b6665cb5 100644 --- a/src/org/libsdl/app/SDLActivity.java +++ b/src/org/libsdl/app/SDLActivity.java @@ -152,8 +152,8 @@ public class SDLActivity extends Activity { Log.v("SDL", "Model: " + android.os.Build.MODEL); Log.v("SDL", "onCreate():" + mSingleton); super.onCreate(savedInstanceState); - - // fullscreen + + // fullscreen requestWindowFeature(Window.FEATURE_NO_TITLE); getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); @@ -1330,7 +1330,7 @@ class DummyEdit extends View implements View.OnKeyListener { public boolean onKey(View v, int keyCode, KeyEvent event) { // This handles the hardware keyboard input - if (event.isPrintingKey()) { + if (event.isPrintingKey()|| keyCode == 62) { if (event.getAction() == KeyEvent.ACTION_DOWN) { ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1); } @@ -1392,7 +1392,7 @@ class SDLInputConnection extends BaseInputConnection { */ int keyCode = event.getKeyCode(); if (event.getAction() == KeyEvent.ACTION_DOWN) { - if (event.isPrintingKey()) { + if (event.isPrintingKey()|| keyCode == 62) { commitText(String.valueOf((char) event.getUnicodeChar()), 1); } SDLActivity.onNativeKeyDown(keyCode);