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

415 Commits

Author SHA1 Message Date
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
carlo morgantini 690d5968ca New stroke and shadows for Android 2013-05-15 16:12:43 -07:00
carlo morgantini dd9b4a8932 new shadow and stroke for CCLabelTTF 2013-05-15 16:12:43 -07:00
James Chen 8fa593a8fe fixed #2151: Custom font can't be loaded correctly if using full path of filename. 2013-05-13 19:12:37 +08:00
Darragh Coy 032aed4499 Fix custom font loading on Android when using fonts that are in resource mapped directories/paths. 
1: Use the CCFileUtils::fullPathForFilename function to lookup the resolved path for the font in the Android specific function, CCImage::getBitmapFromJava.

2: Remove a warning previously added in pull request 2422 (https://github.com/cocos2d/cocos2d-x/pull/2422) in CCFileUtils::fullPathForFilename in order to support change (1) above. If we pass just a system font name to CCFileUtils::fullPathForFilename such as 'Arial' (instead of a path) then it should just return 'Arial' and not generate a warning. We can't assume that when a path (or handle) given to CCFileUtils::fullPathForFilename isn't found within Cocos2dx that it doesn't exist or isn't valid. Depending on the platform there might be files or folders or handles that could be accessible to the app which might exist outside of the knowledge of Cocos2dx. The correct place to warn about missing resource files would be at the point where the resource loading itself fails; e.g if a texture or sound fails to load for example.
 2013-05-09 14:29:42 +01:00
James Chen 93a8b60111 If file path is an empty string, return false directly in CCFileUtils::isFileExist. 2013-04-25 21:51:13 +08:00
minggo 724402750b Merge pull request #2390 from scoyo/master 
Fix for spaces at the beginning of wrapped lines
 2013-04-17 19:10:19 -07:00
Jaroslaw Lewandowski 20e102bc46 Fixed setAccelerometerInterval signature in setAccelerometerIntervalJNI function. 2013-04-18 01:27:33 +01:00
Kristiaan De Jongh 81e4178a42 fix for spaces when wrapping 2013-04-17 13:09:48 +02:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
minggo ad68b3d5ed Merge pull request #2288 from mchinen/master 
Android: fix emulator for OpenGL ES 2.0
 2013-04-07 19:08:00 -07:00
yodesoft 4d5dff6172 Reduce function call in nativeInitBitmapDC to improve performance. 2013-04-07 17:17:19 +08:00
Romain Tisserand 15d4e75cdb JNI fixes, added missing JNIEXPORT / JNICALL declarations 
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
 2013-04-02 22:15:12 +02:00
Michael Chinen 227d2cf60b Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator 2013-03-31 20:47:43 +09:00
minggo 1d51f9a3d7 issue #1529:CCUserDefault work ok on Android 2013-03-11 16:45:20 +08:00
James Chen 2c7b178d7f fixed #1812: Minor fix. 2013-03-08 16:00:14 +08:00
James Chen aa53211f86 fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang. 2013-03-08 15:56:17 +08:00
minggo dd8681b18b Merge pull request #2113 from minggo/refactor-ccuserdefault 
Refactor ccuserdefault
 2013-03-06 23:05:50 -08:00
minggo 648e9a7bf1 issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
waiter 7699c83bd8 update Cocos2dxSound.java for unload effect 
when unload effect, sounID maybe null so the app will creash because of NPE.
 2013-03-06 09:21:49 +08:00
James Chen 8921d92143 Removed some unused codes. 2013-02-22 11:58:52 +08:00
folecr f26f254daa Use CCLOG instead of CCMessageBox to report file system errors 2013-02-21 17:05:17 -08:00
folecr 8408fc6d1b Remove unused access to Android application's external asset path. 2013-02-21 17:05:17 -08:00
folecr 82ae5f62fd Remove unused access to Android application's cache directory 2013-02-21 17:05:17 -08:00
James Chen 3452d44329 issue #1712: Removed importing some unused packages in Cocos2dxActivity. 2013-02-18 14:00:57 +08:00
James Chen 6b5a5c5317 issue #1712: Moving getDPI from Cocos2dxActivity to Cocos2dxHelper. 2013-02-18 13:51:16 +08:00
James Chen 505577239c jfloat --> jint. 2013-02-17 17:21:11 +08:00
James Chen f219f480cc issue #1712: DPI return integer on android. 2013-02-17 17:18:38 +08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
Ben Ward 5f6ce9db92 Adding Portuguese and Arabic language support 2013-02-11 15:29:56 +00:00
minggo 59c1f33ad5 fixed #1702:modify writable path to the return value of Context.getFilesDirectory() 2013-02-07 14:11:23 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
dualface f8c372ca9b fix CCLuaLog() 2013-02-02 15:05:30 +08:00
James Chen e25c79f1ec issue #1687: CCFileUtils::isFileExist now support relative path. 2013-02-01 22:19:58 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
James Chen bb431c54ed Comments some logs in CCFileUtils. 2013-01-29 19:12:55 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
James Chen d5237d637d Absolute path check for blackberry. 2013-01-29 00:42:21 +08:00
minggo 3ea562b4ad fix some logical errors and compiling errors 2013-01-28 23:19:57 +08:00
James Chen e736ed487f issue #1683: Adding default search path if developer didn't pass it. 2013-01-28 17:44:53 +08:00
James Chen 78c16fdd22 issue #1683: Fixing absolute path check for Android. 2013-01-28 10:23:19 +08:00
James Chen 119115502d issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray. 2013-01-26 22:31:57 +08:00
James Chen 3328cfd6a4 Refactoring some logic of CCFileUtils. 2013-01-26 14:19:14 +08:00
James Chen 522e860205 issue #1683: Fixed a bug in file lookup for Android. 2013-01-26 12:10:55 +08:00
James Chen f71df5a873 Fixed an issue in CCFileUtils::setResourceDirectory for android. 2013-01-25 23:01:47 +08:00
James Chen 2c399de28e issue #1683: Moved CCFileUtils::setResourceDirectory. And fix a compatible issue for android. 2013-01-25 22:55:20 +08:00
James Chen fde39c6dcb Adding cache support for CCFileUtils. 2013-01-25 21:52:35 +08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
Rohan Kuruvilla 9750bbab95 removing absolute path lookup in fullPathForFilename 2013-01-24 19:04:27 -08:00
Rohan Kuruvilla f5c74d9022 Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread 2013-01-24 18:37:24 -08:00
Rohan Kuruvilla 287b5575f4 Changing architecture of CCFileUtils 2013-01-24 18:37:23 -08:00
James Chen 46f38c57fb issue #1661: CrystalCraze works ok on android. 2013-01-24 00:32:22 +08:00
James Chen 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +08:00
moadib e39829269d Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml 2013-01-21 13:03:55 +04:00
James Chen 30b2a8a882 issue #1867: Updated CCFileUtils.cpp for android. 2013-01-18 22:18:55 +08:00
James Chen bc76cf09c4 Added filename lookup support for win32. 2013-01-18 21:54:48 +08:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
folecr e3cf517f32 Assert implementation for Android 
* __android_log_assert is not stable
    * Uses __android_log_print instead
 2013-01-09 18:51:49 -08:00
folecr c0ecad31fe Consistent use of CCAssert 
* Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
 2013-01-08 14:11:34 -08:00
James Chen b662d5c569 fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
James Chen 3fa771f0c4 fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android. 2013-01-07 17:22:06 +08:00
James Chen 760a8c1d39 fix a compilation error for android. 2013-01-03 19:56:34 +08:00
minggo df73cd12a6 fixed #1623:use file descriptor instead of file path to create media player 2012-12-24 17:20:44 +08:00
Denis Mingulov ca00d50259 CocosDenshion Android - missing sound effects with some conditions 
Android SoundPool.load returns 0 if sound might not be loaded - for
example, it does not exist. Previously - 0 has been ignored and
incorrectly written to HashMap, so it was not possible to
understand on the application side that something goes wrong
(and use some additional workaround).

Use case:
1) On the game loading - preload all possible sound effects
   (to speed up their playing later, when it will be needed)
2) Game APK does not have any sound file, they are downloaded
   later in a separate thread.
3) Application tries to play sound effects as usual, when needed.

So due to this bug - as there was no any sound file exist
during the game loading - internal HashMap contains incorrect
0 as id for every effect, and there is no any sound effect during
the first application start.
 2012-12-21 23:15:29 +02:00
minggo e15c0a33ae fixed #1610:skip only white character 2012-12-10 17:18:20 +08:00
minggo 0f58987ad1 Merge pull request #1740 from rtissera/gles20 
[android] Cocos2dxHelper/CCFileUtils JNI fixes and improvements
 2012-12-10 00:33:11 -08:00
minggo 71f61596e9 fixed #1580:request focus after keyboard closed 2012-12-10 14:08:01 +08:00
Romain TISSERAND bc0309f1a3 [android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment) 2012-12-09 19:40:41 +01:00
Romain TISSERAND 4cb7506932 Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side 2012-12-09 13:44:41 +01:00
fape 320d532e15 add Hungarian language support 2012-12-05 11:31:05 +01:00
minggo a256d35a5b fix some confilcs 2012-12-05 14:01:05 +08:00
minggo 54309c56b2 change accelerometer accurate to SENSOR_DELAY_GAME 2012-11-30 14:07:01 +08:00
minggo 75fb997513 Merge pull request #1670 from rohankuruvilla/gles20 
Fixing Accelerometer crash on Android
 2012-11-29 22:01:16 -08:00
minggo 61b2e2b880 comment codes for FPS controlling 2012-11-30 13:55:25 +08:00
Rohan Kuruvilla a4b55b5217 Fixing Accelerometer crash on Android 2012-11-28 15:56:57 -08:00
Taro Kobayashi a37e034e61 added support for Japanese language 2012-11-28 17:53:10 +09:00
minggo 226b10a9e2 modify lua project setting 2012-11-23 10:41:41 +08:00
minggo a4a53df159 issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
Denis Mingulov 83cf8aaf29 Android: Access to files from APK is boosted - 1st review update 2012-11-09 09:53:40 +02:00
Denis Mingulov 071d264cc5 Android: Access to files from APK is boosted 
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.

Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
  full archive (unzLocateFile).
  So if file does not exist - still an archive has to be handled
  fully, even slower than a file exists.
- Read file.
- Close zip archive

After this commit:
- Once - open zip/apk file and collect file list information
  (average consumed time - the same like a search for 2 different
  files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
  setting it up to the zip reader and reading file

ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
 2012-11-08 13:46:53 +02:00
Rohan Kuruvilla d6753f8a2f Adding accelerometer setInterval support to Android 2012-10-29 15:08:16 +08:00
wenbin1989 62351462a8 Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage() 2012-10-18 17:17:11 +08:00
wenbin1989 29a63a3b0f Fix stack overflow in CCLog 2012-10-18 14:39:56 +08:00
minggo 0a39fa8bef fixed #1507: use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded 2012-10-12 17:43:43 +08:00
Ed Bartley 04527f7378 Added some flexibility to the Cocos2dxActivity. View creation can be overridden by developers that use a custom Layout and custom views. 2012-10-06 23:39:47 -04:00
Ed Bartley a9177fed6f Fix Typo. 
Make mGLSurfaceView public so that subclasses can may initialize mGLSurfaceView from a custom xml layout.
 2012-10-05 10:24:17 -04:00
James Chen 4a3127f41f Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse. 2012-09-25 21:52:30 +08:00
minggo 364d7a487a Update cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java 
Comment some debug codes, because it will cause auto-building fail.
 2012-09-25 14:42:45 +08:00
minggo 74b9e2539b fix auto building error 2012-09-25 12:13:06 +08:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
Nicolas Gramlich cd4b22a503 Merge branch 'gles20-official' into patch-5 2012-09-18 10:50:15 -07:00
Donald Alan Morrison 216ebab0e1 Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
Nicolas Gramlich f03c0caaf9 Added proper JNIEXPORT/JNICALL markers to android platform jni bindings. 2012-09-13 09:34:30 -07:00
Nicolas Gramlich 4c7705171a Android JAVA refactoring. Android JNI Cleanup. 2012-09-07 17:23:04 -07:00
James Chen 06f240fa5e Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h. 2012-08-29 14:49:02 -07:00
James Chen 3d0b5bf455 fixed some warnings in java codes for android port. 2012-08-27 10:21:43 +08:00
James Chen ee3e68014b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox 2012-08-24 00:16:11 +08:00
James Chen 1685e5c497 issue #1429: Used java code to implement keyboard layout. 2012-08-24 00:15:15 +08:00
James Chen 7f2c9f6fb4 issue #1429: Removed some used codes. 2012-08-23 23:09:12 +08:00
minggo 37cb691600 fix some bugs while testing 2012-08-23 18:01:28 +08:00
James Chen 06038163ca iss1429: Finished using Dialog to implement CCEditBox for android port. 
Next step:
	Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
 2012-08-23 15:34:57 +08:00
James Chen a437099779 issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox. 2012-08-23 09:42:28 +08:00
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
minggo cfdc50fb60 issue #1437:make CCEGLView::sharedOpenGLView() return pointer 2012-08-21 14:58:31 +08:00
minggo 316c484936 Merge pull request #1173 from mustime/bug1284 
issue #1284: add detection for I9100 model
 2012-08-16 18:39:28 -07:00
minggo bcf61cdf26 issue #1405:use enum to distinguish target 2012-08-16 10:21:15 +08:00
mustime 0933a032e9 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284 2012-08-14 09:41:18 +08:00
mustime 89f0508043 issue #1284: add detection for I9100 model 2012-08-13 17:14:33 +08:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00