Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7389 from Dhilan007/v3-gc-nibiru 

Update Nibiru SDK and remove prompt box of install driver .
This commit is contained in:
minggo 2014-07-11 13:36:19 +08:00
parent a0b16a29d1 900d4b36fc
commit 7cf8cf42d3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cocos/platform/android/ControllerManualAdapter/libs/nibiru_lib_2_1_7.jar
View File

Binary file not shown.

BIN
cocos/platform/android/ControllerManualAdapter/libs/nibiru_lib_2_1_8.jar Normal file
View File

Binary file not shown.

2
cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerNibiru.java
View File

@ -73,7 +73,7 @@ OnSimpleStickListener, OnAccListener, OnGyroListener, OnStateListener, GameContr
mControllerService.setEnableLR2(true);
mControllerService.setAutoKeyUpMode(false);
mControllerService.checkNibiruInstall(mContext, true);
mControllerService.checkNibiruInstall(mContext, false);
}
}

6
tests/game-controller-test/proj.android/src/org/cocos2dx/game_controller_test/AppActivity.java
View File

@ -37,8 +37,8 @@ public class AppActivity extends GameControllerActivity {
//The standard controller,without doing anything special. e.g: Amazon Fire TV
//Manually specify an adapter.
//this.connectController(DRIVERTYPE_NIBIRU);
//this.connectController(DRIVERTYPE_MOGA);
//this.connectController(DRIVERTYPE_OUYA);
this.connectController(DRIVERTYPE_NIBIRU);
this.connectController(DRIVERTYPE_MOGA);
this.connectController(DRIVERTYPE_OUYA);
}
}