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