Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,170 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

415 Commits

Author SHA1 Message Date
samuele3hu 71b03ecdb9 replace tabs with spaces 2013-09-18 17:09:08 +08:00
samuele3hu 1ee7f72276 Modify handle_key_input function for responding the onKeyReleased 2013-09-18 17:02:32 +08:00
Dhilan007 fd3a03a6ee 1.android platform:handle key event 
2.android platform:fix Accelerometer value error
 2013-09-18 12:04:35 +08:00
Dhilan007 a3524f420d . 2013-09-17 23:22:16 +08:00
Dhilan007 509bea531a android platform:fix EditBox not show input box and crash. 2013-09-17 23:16:32 +08:00
James Chen cdcfda1f2c issue #2087: [dispatcher] Removing unused codes. 2013-09-17 17:00:37 +08:00
minggo 3072144ad5 implement Cocos2dxHelperListener 2013-09-17 11:44:33 +08:00
boyu0 c726765b4a closed #2745: fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke() 2013-09-16 17:13:44 +08:00
minggo 81a26d44f6 Merge pull request #3596 from dumganhar/new-event-dispatcher-rename 
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
 2013-09-15 20:13:51 -07:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 2013-09-13 19:06:09 +08:00
samuele3hu d8bd65b2e8 issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
samuele3hu 5ddd9ae23c issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
samuele3hu 7c62509b02 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-11 09:50:31 +08:00
samuele3hu 29f0909714 issue #2768:Add LuaObjectBridge and LuaJavaBridge 2013-09-11 09:48:24 +08:00
Ricardo Quesada 028deae846 Adds const in FileUtils 
`const` was missing in some getters

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:52:55 -07:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
samuele3hu f56c6f7087 issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
minggo 61d82924be update Android.mk to remove deleted cpp files 2013-08-26 18:01:42 +08:00
minggo ec3fa59ae3 remove unneeded files 2013-08-26 17:40:25 +08:00
James Chen ca78d2d129 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
folecr 9d8e2d991b Let CCDirector set all GL state 2013-08-19 15:58:05 -07:00
Maciej Czerniak 86b2ce33af fixed stroke font color with channel color values other than 255 2013-08-11 11:38:38 +02:00
folecr 2ebd400a75 clean up coding style and remove explicit temporary variable 2013-08-09 11:39:52 -07:00
folecr 063c730726 Take orientation into account when reporting accelerometer sensor readout 2013-08-08 14:40:26 -07:00
folecr 74583d21f3 Android port needs etc headers 2013-08-05 02:05:47 -07:00
folecr 8e386cf0bc moar checking 2013-08-05 02:05:47 -07:00
folecr 952cefa036 Accelerometer 2013-08-05 02:05:47 -07:00
folecr b56df6d28c Separate log macro for logging event processing 2013-08-05 02:05:46 -07:00
folecr 5889cc2218 Shift by correct amount 2013-08-05 02:05:46 -07:00
Rohan Kuruvilla fa940ec292 Add touch input processing 2013-08-05 02:05:46 -07:00
Rohan Kuruvilla 3c20c6d9a8 Fixing bug where engine wouldn't start animating when coming into foreground 2013-08-05 02:05:46 -07:00
folecr 5737d4cd25 strip out old accelerometer implementation 2013-08-05 02:05:42 -07:00
folecr a10c9c74a1 Remove Accelerometer and TextEdit implementations. 2013-08-05 02:05:42 -07:00
folecr 4567ab96b8 Helper and LocalStorage now use NativeActivity directly 2013-08-05 02:05:42 -07:00
folecr 9cefb85bea Use getInstance() instead of various deprecated singleton access methods 2013-08-05 02:05:42 -07:00
folecr af1e450fe6 Remove spurious LOGI (use appropriate LOG_RENDER_DEBUG in its place.) 2013-08-05 02:05:42 -07:00
folecr c1e88b79ba Initialize JniHelper with the Acitivity. Load the native library that is specified in the Activity's meta-data. 2013-08-05 02:05:42 -07:00
folecr 76a684c556 Initialize Cocos2dxHelper from JNI. Call System.loadLibrary() in Java so functions implemented in native code are available from Java. 2013-08-05 02:05:42 -07:00
folecr 2951504b46 Actually obtain a reference to the Java class 2013-08-05 02:05:41 -07:00
folecr dd79d9bbc2 Use default class loader to obtain the ClassLoader for this NativeActivity 2013-08-05 02:05:41 -07:00
folecr e67698116c Cache JNIEnv 2013-08-05 02:05:41 -07:00
folecr d96f54d4e0 Separate calls to setvm reference and to set classloader 2013-08-05 02:05:41 -07:00
folecr 53b1a92773 Use an obtained class loader instead of the default 2013-08-05 02:05:41 -07:00
folecr 669427363f Clean up JNIHelper 2013-08-05 02:05:41 -07:00
folecr dc6b6ecc69 Remove unused Java files for Activity and GLSurfaceView (now in C code.) 2013-08-05 02:05:40 -07:00
folecr 921ed14a87 Use OpenGLES 2.0 2013-08-05 02:05:40 -07:00
folecr a2a999d505 JNI, Set JavaVM 2013-08-05 02:05:40 -07:00
folecr 4539600ac2 initialize cocos with asset manager interface. separate out cocos init from android view init. 2013-08-05 02:05:40 -07:00