dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Matheus Lessa 2017-10-16 15:34:36 -02:00
parent 0e4c79eddd 2e09116513
commit 0e38df48e3
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/android/AndroidManifest.xml
View File

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

11
build/android/default.properties
View File

@ -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

2
build/android/project.properties
View File

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

2
src/jsapi.c
View File

@ -200,7 +200,7 @@ static duk_ret_t duk_btn(duk_context* duk)
else else
{ {
s32 index = duk_to_int(duk, 0) & 0xf; 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; return 1;