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

426 Commits

Author SHA1 Message Date
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
folecr 1fb4387d0a AssetManager is a private member of FileUtilsAndroid. setter method. Remove old Java/JNI setter. 2013-08-05 02:05:40 -07:00
folecr 68b9e5d608 Move nativeactivity.cpp 2013-08-05 02:05:40 -07:00
folecr 0a9e9571cc Remove unused declaration 2013-08-05 02:05:40 -07:00
folecr e1bcbc7859 Remove references to the Java renderer 2013-08-05 02:05:39 -07:00
folecr f7d5eb198e ccx : setAnimationInterval() not implemented. 2013-08-05 02:05:39 -07:00
folecr 05daebf65e ccx : Initialize cocos. Calls cocos_android_app_init() to initialize the Cocos app. 2013-08-05 02:05:39 -07:00
folecr 7add86c751 ccx : Trace accelerometer only when tracing rendering 2013-08-05 02:05:38 -07:00
folecr 58c4037de8 ccx : Trace rendering 2013-08-05 02:05:38 -07:00
folecr 3cc62f9fa8 ccx : remove/comment filesystem access methods from Java 2013-08-05 02:05:38 -07:00
folecr d9c3089f35 ccx : Cocos2dxActivity extends NativeActivity 2013-08-05 02:05:38 -07:00
folecr 3af519a61a ccx : Remove Cocos2dxRenderer 2013-08-05 02:05:37 -07:00
folecr 6d990d0570 ccx : Call cocos rendering methods. 
* switch to .cpp for nativeactivity.
 * ccx : update log tags to say .ccp instead of .c
 2013-08-05 02:05:37 -07:00
folecr 57cd5eedef ccx : Change minimum config to RGB565. Add depth buffer and stencil buffer requirements to EGL config. 2013-08-05 02:05:37 -07:00
folecr f4d21528d5 ccx : Link libraries used by nativeactivity.c 2013-08-05 02:05:36 -07:00
folecr 6ac71f16c1 ccx : add nativeactivity 2013-08-05 02:05:36 -07:00
folecr 588ca7e57b Android port is a static library 2013-08-05 02:04:25 -07:00
Timothy Qiu 5ed8deb9a6 Fixed more documentation errors. 
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
 2013-08-01 20:55:43 +08:00
boyu0 afde1e57b2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
boyu0 304d636deb Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +08:00
boyu0 cecfc13bc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
minggo 295a23e535 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 07:57:28 +08:00
Sergii Rudchenko 3ea77ec933 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 01:17:13 +03:00
James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 
Conflicts:
	scripting/javascript/bindings/generated
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 21:22:16 +08:00
James Chen a73a4b9837 Merge pull request #3276 from dumganhar/constants-refactor 
Enumeration refactoring
 2013-07-26 05:36:16 -07:00
Éloi Rivard 3ffc026c6c Added some guards in file utils. 2013-07-26 14:19:20 +02:00
James Chen 2f8d3587bd Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk. 2013-07-26 18:17:30 +08:00
boyu0 02bdfbf169 Combine CCTextureETC to CCImage and CCTexture2D. 2013-07-26 17:34:44 +08:00
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
minggo 0870581623 fix warnings 2013-07-26 15:22:45 +08:00
Ricardo Quesada 058935aa8d Removes Hungarian notation 
Removes Hungarian notation from the code.
 2013-07-25 15:53:24 -07:00
minggo b36a4f1df0 issue #2430:use upper letters for enum item in Image 2013-07-25 23:09:18 +08:00
James Chen 7bc6abfac7 Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it. 2013-07-24 10:14:42 +08:00
boyu0 948acd6e29 Refactor CCTexture2D and CCImage 2013-07-19 15:37:54 +08:00
boyu0 70140bb4cb refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
minggo 52a27c5fc9 Merge pull request #3118 from jotel/text-shadow-opacity-fix 
Now opacity option for shadow in CCLabelTTF works.
 2013-07-16 02:39:36 -07:00
James Chen 3bdf6b9c69 issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
minggo 2c499a6a9a Merge pull request #2658 from michaelcontento/use-onWindowFocusChanged-instead-of-onPause 
[Android] use onWindowFocusChanged(bool) instead of onResume()/onPause()
 2013-07-14 20:37:23 -07:00
James Chen 1939534a2e [ci skip] Reverting cocos2dx/platform/android/java/project.properties. 2013-07-12 16:26:42 +08:00
James Chen d1527f39f5 issue #2397: FileUtils::sharedFileUtils() is not needed to be defined in CCFileUtilsXXX.cpp 2013-07-12 15:00:10 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
Jaroslaw Lewandowski f1023232db Now opacity option for shadow in CCLabelTTF works. 2013-07-09 23:23:41 +01:00
minggo e5a80eed91 fixed conflict 2013-07-09 10:39:16 +08:00
Jaroslaw Lewandowski d26fa847d8 - Fixing shadows for text with stroke in iOS 
- Improved text shadows in Android (they look the same as in iOS)
 2013-07-02 22:45:07 +01:00
Sergey Shambir 1c52517770 CocosDenshion: added effects customization for 7 platforms. 
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.

Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
 2013-06-29 13:44:16 +04:00
minggo 8938268183 issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
folecr 295f9e0fec Do nothing in the case of forAsync 2013-06-24 16:42:56 -07:00
folecr 2e0804ae29 Remove references to zip file 2013-06-24 15:15:25 -07:00
folecr 21405531aa getFileData() 
* The async case is NYI
 * include stdlib for abort() when forAsync is true
 2013-06-24 15:14:15 -07:00
folecr 7090d8daad isFileExist() 2013-06-24 15:14:15 -07:00
folecr 0422953bbe Native Asset Manager 2013-06-24 15:14:14 -07:00
folecr e916cef32b #define LOGD 2013-06-24 15:14:14 -07:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
minggo 8d4f715008 Merge pull request #2929 from minggo/iss2304-refator-cclayer 
issue #2304:use function to simplify acceremeter call back
 2013-06-19 01:43:18 -07:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen e6c14edf18 Merge pull request #2907 from waiter/master 
fixed #2306: update “solve android crash with CCLabelTTF setString function”
 2013-06-18 23:22:54 -07:00
minggo e9d8595617 fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe 2013-06-18 17:10:54 +08:00
waiter ecebf31287 solve android crash with CCLabelTTF setString function 
solve android crash with CCLabelTTF setString function
 2013-06-18 10:08:34 +08:00
James Chen 8fb40eaee2 android target 17 --> 8. 2013-06-17 15:55:09 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
minggo 6eaa1f97ec Merge pull request #2828 from minggo/develop 
fixed #2161: fixed crash of loading ETC file
 2013-06-08 02:02:52 -07:00
minggo d5bfe10379 fixed #2161: fixed crash of loading ETC file 2013-06-08 17:01:45 +08:00
minggo 2b3f3b6744 fixed #2161: fixed crash of loading ETC file 2013-06-08 16:58:18 +08:00
minggo 52f55802b7 Merge pull request #2826 from minggo/develop 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:44:01 -07:00
minggo f56c20657b fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:42:52 +08:00
minggo 6d3615157a fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:40:03 +08:00
minggo f2be4c62ee Merge pull request #2820 from minggo/develop 
fixed #2161: don't close AssetManager
 2013-06-07 20:24:27 -07:00
minggo b023158c85 fixed #2161: don't close AssetManager 2013-06-08 11:23:13 +08:00
minggo 206502dccb fixed #2161: don't close AssetManager 2013-06-08 10:57:19 +08:00
James Chen 5832934e41 Reverting target to android-8. 2013-06-06 16:20:22 +08:00
minggo 53365b9e46 Merge pull request #2669 from frranck/master 
adding norwegian language
 2013-05-29 02:10:37 -07:00
franck 3fab093f5b adding Norwegian language support 2013-05-29 10:16:22 +02:00
Michael Contento 026026e3af use onWindowFocusChanged(bool) instead of onResume()/onPause() 
we should use onWindowFocusChanged(bool) to detect if the app is currently
visitible to the user or not. because onPause()/onResume() leads to false
positives on some android versions (e.g. Kindle Fire). if you lock those
devices, while the app running, everything is fine (onPause() is handled
properly). but as soon as you wake up the device, and the lock screen gets
visible, the app is resumed and the music is played (onResume() is
called to early).

this is a) not the best behaviour and b) such games will be rejected on the
samsung app store. onWindowFocusChanged(bool) is, like onPause()/onResume(),
available since API level 1 and it should be safe to simply switch.
 2013-05-28 12:05:46 +02:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
Nicolas Gramlich cef2575180 Updated .classpath of Android project to latest ADT 22 build tool compatibility. 
Changes correspond to: https://groups.google.com/forum/?fromgroups#!msg/adt-dev/epOfZbKPFdk/RbR2VYNQ5_8J
 2013-05-20 14:39:25 -06:00
carlo morgantini fb2a73048d it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication) 2013-05-15 16:37:08 -07:00
carlo morgantini 3c28048c14 fix alignent problem when rendering text with shadow 2013-05-15 16:37:08 -07:00
carlo morgantini c727fa33c0 CCLabelTTF have now a tint, plus bug fixing and code clean up 2013-05-15 16:29:33 -07:00
carlo morgantini 221884f6d4 better CCTexture2D API for init texture with shadow and stroke 2013-05-15 16:29:32 -07:00
carlo morgantini fc846bb9ac label TTF stroke and shadow for Android 2013-05-15 16:29:32 -07:00