godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Update GodotLib.java

Browse Source
This commit is contained in:
reduz
2014-03-13 20:26:38 -07:00
parent 0a717ffee2
commit bdb5d68e77
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/java/src/com/android/godot/GodotLib.java
View File

@@ -51,11 +51,7 @@ public class GodotLib {
public static native void step(); public static native void step();
public static native void touch(int what,int pointer,int howmany, int[] arr); public static native void touch(int what,int pointer,int howmany, int[] arr);
public static native void accelerometer(float x, float y, float z); public static native void accelerometer(float x, float y, float z);
<<<<<<< HEAD
public static native void key(int p_unicode_char, boolean p_pressed);
=======
public static native void key(int p_scancode, int p_unicode_char, boolean p_pressed); public static native void key(int p_scancode, int p_unicode_char, boolean p_pressed);
>>>>>>> 81757d2e977d959e6b0bc26f9fa990417ca91de9
public static native void focusin(); public static native void focusin();
public static native void focusout(); public static native void focusout();
public static native void audio(); public static native void audio();