Merge remote-tracking branch 'upstream/tic_0.47.0' into tic_0.47.0

build/android/AndroidManifest.xml

@@ -4,12 +4,12 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.nesbox.tic"
-      android:versionCode="4600"
-      android:versionName="0.46.0"
+      android:versionCode="4601"
+      android:versionName="0.46.1"
       android:installLocation="auto">
 
     <!-- Android 2.3.3 -->
-    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
 
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" />

build/android/default.properties

@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-12

build/android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-12
+target=android-14

src/jsapi.c

@@ -200,7 +200,7 @@ static duk_ret_t duk_btn(duk_context* duk)
 		else
 		{
 			s32 index = duk_to_int(duk, 0) & 0xf;
-			duk_push_uint(duk, machine->memory.ram.vram.input.gamepad.data & (1 << index));
+			duk_push_boolean(duk, machine->memory.ram.vram.input.gamepad.data & (1 << index));
 		}
 
 		return 1;