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

1428 Commits

Author SHA1 Message Date
Walzer 3cba64679c add std::string CCString::toStdString() method 2011-06-02 22:26:38 +08:00
minggo 4f20deff30 fixed #518: fix a bug that use tHashSelectorEntry in wrong way 2011-06-02 10:07:17 +08:00
minggo 83e1e0ebd1 tests run ok when it don't enable lua 2011-06-01 20:29:05 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo dedbd638d3 lua runs ok on Android 2011-06-01 14:35:28 +08:00
minggo fe8fcb0b00 invode lua registerred tick 2011-05-31 14:49:47 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws de977bc6c2 use 0 replace NULL 2011-05-30 16:49:08 +08:00
yangws 7e2d1d5c48 fixed #490 Text input on android use a different way, TextInputTest OK now. 2011-05-30 16:36:12 +08:00
Walzer c790fba340 avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution! 2011-05-27 16:26:59 +08:00
Walzer 03b1bb6c52 fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp 2011-05-26 10:08:05 +08:00
yangws ec23d7ed55 fixed #508 Dynamic switch retina display support. 2011-05-23 16:21:31 +08:00
yangws 4c0008cd73 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-20 10:02:16 +08:00
unknown 97142d4a59 Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010 2011-05-19 21:11:29 +08:00
unknown b940676cab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-19 20:55:39 +08:00
yangws 02774dd963 fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite. 2011-05-19 17:00:13 +08:00
minggo ff1017d86f Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:18:37 -07:00
minggo 073260e0a9 [android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0 2011-05-19 11:26:57 +08:00
Walzer 2dd11490ad Merge pull request #274 from yangws/master 
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
 2011-05-18 18:51:38 -07:00
minggo 822016e375 [android] fixed #495: fix a memory leak 2011-05-18 13:56:35 +08:00
yangws 8e07ab7dc9 Modify CCLog out utf-8 string on win32 and wophone emulator. 2011-05-18 11:25:54 +08:00
yangws 5173738f37 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-18 11:08:44 +08:00
yangws 7a6a891242 fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time. 2011-05-18 11:08:18 +08:00
natural-law 95a46bd5f8 [ios] fixed #493, The return value of CCFileUtils::getWriteablePath() should be end with '/'. 2011-05-17 10:44:56 +08:00
natural-law 0466166935 [win32] fixed #492, Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile(). 2011-05-16 17:13:15 +08:00
yangws aba77f4cae issue #489 modified for vs2008. 2011-05-13 14:13:30 +08:00
Walzer c7fb183dcb [airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now. 2011-05-12 21:58:11 +08:00
Walzer 1340bbf842 [android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method 2011-05-12 21:12:15 +08:00
Walzer f17a8f6226 Merge pull request #271 from minggo/iss488 
[Android] CCUserDefault works ok on android2.2
 2011-05-12 05:40:15 -07:00
minggo 91bc9a3f7a [android] fixed #488: fix memory leak 2011-05-12 18:55:32 +08:00
minggo d8f3b0c25b [android] CCUserDefault works ok on android2.2 2011-05-12 18:32:13 +08:00
yangws c73c1a9ab6 compile ok in vs2010 2011-05-12 16:15:10 +08:00
Walzer 78d49e9806 [win32] dllexport 2 pure C functions from CCLabelBMFont.h 2011-05-12 08:40:19 +08:00
Walzer 249724f8d8 [ios] issue #371, fix the error when invoke CCImage::initWithString with null string "" 2011-05-12 08:24:29 +08:00
Walzer d0ff1f274e Merge pull request #264 from yangws/master 
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
 2011-05-11 03:28:16 -07:00
yangws b8a9db98dc fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button. 2011-05-11 18:22:55 +08:00
yangws 8fa1b97149 fixed a bug by bin: when reopen the keyboard can't delete the text which inputed before. 2011-05-10 18:08:07 +08:00
yangws 21c8628e68 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 
Conflicts:
	cocos2dx/platform/wophone/CCApplication_wophone.h
	tests/tests/tests.h
 2011-05-10 16:09:26 +08:00
yangws 167f4c206b issue #478 KeyBoard can run on wophone. but too slow. 2011-05-10 15:48:26 +08:00
yangws fc01bada97 input from sencond twindow named input view. 
ps: TWindow doesn't support switch.
ps2: TWindow as memory window doesn't support rotate.
 2011-05-09 16:59:26 +08:00
natural-law 02f30a86b3 [wophone] Modify the wophone Makefile.ARM for the CCUserDefault. 2011-05-09 11:09:54 +08:00
natural-law dd309fe862 [wophone] fixed #487, Implement the function CCFiltUtils::getWriteablePath() on wophone. 2011-05-09 10:03:43 +08:00
minggo e27452dd8a Merge pull request #253 from minggo/iss455 
Implement CCUserDefault
 2011-05-08 18:37:33 -07:00
Walzer 7fa669bad1 Merge pull request #255 from minggo/iss484 
fixed #484: solve a potential memory leak
 2011-05-08 02:21:31 -07:00
minggo 113f1ab2ef fixed #484: solve a potential issue 2011-05-06 18:09:31 +08:00
Walzer 3d17a650bf Merge pull request #254 from natural-law/master 
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
 2011-05-06 03:04:45 -07:00
natural-law 42b3ad676e [wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep. 2011-05-06 18:00:43 +08:00
minggo e14040730b fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly 2011-05-06 17:46:19 +08:00
yangws 3f8293dffb Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input 
Conflicts:
	HelloWorld/wophone/HelloWorld.wophone.vcproj
	tests/test.wophone/copy_res.bat
 2011-05-06 17:45:39 +08:00
minggo 6c69107f33 fixed #455: CCUserDefault works ok on iOS 2011-05-06 17:01:41 +08:00
yangws ced029257f temp commit 2011-05-06 16:38:09 +08:00
minggo 7e40957e04 Merge https://github.com/cocos2d/cocos2d-x into iss455 2011-05-06 16:29:44 +08:00
minggo 80f739942d issue #455 : compile CCUserDefault on iOS 2011-05-06 16:29:35 +08:00
minggo 33648a9e9b issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later 2011-05-06 16:14:07 +08:00
Walzer 857141eef3 [ios] issue #371, compatible with ios 4.1 4.2 4.3. switching different input methods will not cause crash 2011-05-06 15:43:36 +08:00
minggo 2c0bd49513 issue #455: CCUserDefault ok on win32 & Android 2011-05-06 15:31:51 +08:00
natural-law 846b529e49 [wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK. 2011-05-06 10:13:12 +08:00
yangws 0fe61642f6 issue #478 text input ok. 2011-05-05 18:17:50 +08:00
Walzer dcdad9a81a Merge pull request #250 from yangws/481 
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
 2011-05-05 00:53:10 -07:00
Walzer c7e25d305a Merge pull request #248 from yangws/input 
Split TextInputTest to Default test and Action test. Compile ok on vs2010
 2011-05-05 00:50:48 -07:00
yangws 6eb24cafee fixed #481 remove KeyLock control code. 2011-05-05 14:00:36 +08:00
yangws 7c5a6d779c fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn. 2011-05-05 11:51:13 +08:00
yangws a5da2bd226 Split TextInputTest to Default test and Action test. Compile ok on vs2010. 2011-05-04 14:13:15 +08:00
minggo 0db248e1f1 Merge pull request #245 from yangws/input. 
TextInputTest on on ios.
 2011-05-02 18:48:48 -07:00
yangws 2b94d7d9ce TextInputTest on on ios. 2011-04-29 18:09:54 +08:00
yangws 170933b4c5 CCTextFieldTTF test code ok on win32. 2011-04-29 16:46:29 +08:00
minggo b00c54dc64 Merged pull request #243 from minggo/iss477. 
[android] fixed #477: set default ndk version to ndk-r5
 2011-04-28 19:29:15 -07:00
Walzer bdd0b44b99 fixed a warning in CCProfiling.cpp 2011-04-29 10:08:35 +08:00
minggo bb4fc1c446 [android] fixed #477: set default ndk version to ndk-r5 2011-04-29 09:59:05 +08:00
yangws 2bb4775051 add CCTextFieldDelegate. 2011-04-28 18:01:29 +08:00
Walzer b61c019b2c [android] fixed #475, CCImage::initWithString return true even if the bitmap hasn't been initialized. Thanks to Isaac Ashdown's fix on the forum. 2011-04-28 15:14:59 +08:00
minggo 8b14b1bab8 Merged pull request #242 from yangws/input. 
[ios] tests add RootViewController for rotate with ui object.
 2011-04-27 23:46:47 -07:00
yangws d73699aabb [ios] tests add RootViewController for rotate with ui object. 2011-04-28 14:19:12 +08:00
minggo 86b856c7f1 Merged pull request #241 from yangws/input. 
make tests can compile on wophone and airplay.
 2011-04-27 20:50:08 -07:00
minggo 963c271120 Merged pull request #240 from natural-law/master. 
issue #428
 2011-04-27 19:38:09 -07:00
yangws 323c065934 make test can compile on wophone and airplay. 2011-04-28 10:31:51 +08:00
natural-law 15ef0b9105 issue #428, fix the bug created by issue 428. Have some loop in wrong arrays. 2011-04-28 10:16:58 +08:00
Walzer 2cceeb5c39 Merge remote branch 'origin/master' 2011-04-27 22:46:38 +08:00
Walzer fa43292250 ccTouchDeletateAllBit -> ccTouchDelegateAllBit. I met this typo 3 days ago, then miss it. Thanks to Isaac Ashdown. 2011-04-27 22:45:54 +08:00
yangws f8dc140840 change CCLabelTTF accept string from gb2312 to utf8. 2011-04-27 18:19:47 +08:00
yangws e895d9d073 TextInputTest compile ok on android and merge last master code. 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input

Conflicts:
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/platform/android/Cocos2dJni.cpp
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	tests/test.ios/test.xcodeproj/project.pbxproj
	tests/test.win32/test.win32.vcproj
 2011-04-26 18:04:07 +08:00
yangws 9b08f4add6 keyboard notification message on ios and TextFieldTTF test code OK. 2011-04-26 16:33:20 +08:00
Walzer b3f76a81a4 [win32] issue #471, CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice 2011-04-26 14:53:57 +08:00
minggo ef94d19030 Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x 2011-04-25 16:08:27 +08:00
minggo 1c248b9955 Merge branch 'iss462' of https://github.com/minggo/cocos2d-x 2011-04-25 16:07:16 +08:00
minggo 99733c602d [android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android 2011-04-25 15:13:24 +08:00
natural-law 71e4ec6aca issue #468, Fix the compile error when the target platform is not win32. 2011-04-25 15:05:16 +08:00
Walzer 6a11f73999 Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x 2011-04-25 14:44:21 +08:00
natural-law 7231120b16 fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest. 2011-04-25 14:30:30 +08:00
Walzer 38ee881876 Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2011-04-25 09:52:13 +08:00
natural-law 7337119501 issue #466, Modify the interface to fit the refactor of CCFileUtils. 2011-04-25 09:40:10 +08:00
moadib 85afa22195 [android] fixed typo in CCEGLView method name 2011-04-24 18:52:21 +04:00
Walzer 386005ef79 issue #466, Bin forget to modify CCFileUtils_ios.mm to fit the refactor, which cause compilation error. 2011-04-24 15:44:00 +08:00
Walzer f7b294fe24 fixed #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture 2011-04-24 15:38:03 +08:00
yangws 252f3efe1a CCIMEDispatcher works on android. 2011-04-22 16:33:41 +08:00
natural-law e2ce006db2 fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach. 2011-04-22 10:57:46 +08:00
natural-law acb4bb5a16 Merge branch 'master' into iss428 
Conflicts:
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-04-21 14:58:58 +08:00
natural-law 5d2ac1fc0c fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
minggo 8458058f26 Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393 2011-04-20 17:19:03 +08:00
minggo fd45cbea77 [android] fixed #393: use new version of libxml2, it supports xpath and xslt 2011-04-20 17:08:50 +08:00
minggo 7b51fa8e9b [android] fixed #393: use new version of libxml2, it supports xpath and xslt 2011-04-20 16:11:18 +08:00
minggo e5441a4fc2 fixed #450: can set default pixel format other than RGBA8888 2011-04-20 15:34:33 +08:00
yangws 85027c40ca CCIMEDispatcher works on ios. 2011-04-19 18:11:57 +08:00
minggo 4ffe24fc8e Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374 2011-04-19 13:45:56 +08:00
minggo f1363af496 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-04-19 11:49:50 +08:00
minggo 26da27aaca Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-04-19 11:48:33 +08:00
minggo 0db048de73 Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456 2011-04-19 11:36:00 +08:00
Walzer 735b6ce97b CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration 2011-04-19 11:23:02 +08:00
minggo c38af3c28d fixed #456: integrate libcurl into cocos2dx 2011-04-19 10:57:44 +08:00
yangws d11bd85d00 CCTextFieldTTF works on win32. 2011-04-19 09:32:33 +08:00
minggo a4e9f1c18d libcurl works ok on ios 2011-04-18 14:12:41 +08:00
natural-law adbf349116 fixed #449. Modify the wophone Makefile.ARM for remove mac support. 2011-04-18 11:35:57 +08:00
walzer 0738f751d1 Merge branch 'point_math' of https://github.com/moadib/cocos2d-x 2011-04-16 15:22:44 +08:00
walzer eb4b31e4da update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox 2011-04-16 15:21:50 +08:00
moadib 03093a98b5 In pointmath-related functions parameters should be passed by reference 2011-04-16 10:55:02 +04:00
minggo 37e7fad0d3 issue #456: add curl test & libcurl.so works ok on android 2011-04-15 17:15:05 +08:00
walzer 73f2c5297c #define ccp CCPointMake(...) to cocos2d::CCPointMake(...). Thanks Marat Yakupov's fix. http://www.cocos2d-x.org/boards/6/topics/1200 2011-04-14 16:15:12 +08:00
minggo 932b475170 fixed #448: make CCCallFuncO invoke correct parameter 2011-04-13 11:53:25 +08:00
minggo 7f6e0052a1 Merge branch 'iss341' of https://github.com/natural-law/cocos2d-x into natural-law-iss341 2011-04-12 15:43:48 +08:00
natural-law da7c608ab8 fixed #341. Modify the location of allocate memory for m_pTMXLayers. 2011-04-12 15:31:54 +08:00
minggo 3d6fd051ab issue #449: refactor CCTransition 2011-04-11 16:09:14 +08:00
natural-law ba933f9456 fixed #341, modify the implementation of function CCTMXTiledMap::layerNamed(). 2011-04-11 15:59:59 +08:00
minggo 37bb33d9e5 fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
natural-law d4dbedca4d fixed #451,remove the code of support mac platform. 
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
 2011-04-11 11:24:10 +08:00
yangws d3ef9e7da7 Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x into master.cocos2d 2011-04-07 14:30:28 +08:00
yangws 455ec071b3 VC2010 compile ok. 2011-04-07 14:20:04 +08:00
yangws b1ab937ec3 fix MouseEvent bug 2011-04-07 11:05:44 +08:00
natural-law 1af4aa1138 [android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost. 2011-04-06 16:29:58 +08:00
natural-law f3b1385279 fixed #446,read the .fnt file by it's full path. 2011-04-06 10:20:01 +08:00
Max Aksenov b33aeac164 [airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight". 
reformatted CCEGLView::setMotionTouch for unification with other functions of  "setTouche".
 2011-04-04 01:58:07 -07:00
Max Aksenov 6927dae38f [airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight". 
reformatted CCEGLView::setMotionTouch for unification with other functions of  "setTouche".
 2011-04-04 01:56:15 -07:00
walzer cb65469103 [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
walzer de81120b6a Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-04-03 09:51:01 +08:00
walzer 28fbfb04dc Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349 2011-04-03 09:30:26 +08:00
minggo 0aa8eb2892 fixed #350: transitionfade flickers on both android and iphone 2011-04-02 16:16:19 +08:00
natural-law 72f11cb421 [ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format. 2011-04-02 11:32:15 +08:00
minggo 39b60291ed Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441 2011-04-01 17:34:17 +08:00
minggo 8fbfc2773a Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440 2011-04-01 17:19:30 +08:00
minggo 7d52161804 fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
Marat Yakupov ac84278dae [android] #443 implemented CCKeypadDelegate on android 2011-04-01 11:27:06 +04:00
minggo 2c539a1df5 [android] fixed #440: CCMessage works ok on android 2011-04-01 11:35:26 +08:00
yangws 0efeaa6696 fixed #420 deal with ccsprite init failed case in CCSprite.cpp. 2011-03-31 14:56:49 +08:00
yangws 63801db3f6 fixed #440 Commit missing file last commit. 2011-03-31 11:23:58 +08:00
yangws 20539d4b89 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 2011-03-31 10:51:00 +08:00
yangws f8a5a4ecf3 CCMessageBox works on ios. 2011-03-31 10:36:53 +08:00
walzer 87bd4a2938 fixed #438, rename CCMotionStreak::update to CCMotionStreak::updateMotion to avoid this crash 2011-03-30 15:00:13 +08:00
walzer 70eb85e6df Merge branch 'yangws-439' 2011-03-30 11:47:10 +08:00
yangws 7e81c56231 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils_ios.mm
 2011-03-30 11:05:23 +08:00
walzer 35d94eb3a5 Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411 2011-03-30 10:44:34 +08:00
yangws ba68a5b966 fixed #439 test OK. 2011-03-29 17:32:52 +08:00
natural-law 87ea85a986 fixed #411,support .plist format generated by zwoptex in the last version. 2011-03-29 16:59:50 +08:00
yangws 48d57b88e2 issue #439 ios and airplay midified. 2011-03-29 15:59:37 +08:00
yangws 1887417472 issue #439 ios and airplay midified. 2011-03-29 15:56:55 +08:00
walzer 5811fb7c76 Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422 2011-03-29 15:50:28 +08:00
yangws 6c5cf577b7 issue #439 wophone and android modified. 2011-03-29 15:05:53 +08:00
minggo c686047f83 [android] fixed #422: multitouch for android 2011-03-29 14:20:05 +08:00
natural-law 334786c633 fixed #391,Add implement of CCNS on airplay. 2011-03-29 13:59:10 +08:00
natural-law edc33952be fixed #391,Add support on ios and airplay. 2011-03-29 12:50:25 +08:00
natural-law 5f7357bf09 fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0. 2011-03-29 11:56:14 +08:00
yangws 041953151a issue #439 CCFileData and imageWithImageFile modified on win32. 2011-03-29 11:41:44 +08:00
natural-law 1991a65b0b Merge branch 'master' into iss391 
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
 2011-03-29 10:20:57 +08:00
walzer 6cc09aa4dc Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396 2011-03-28 21:08:56 +08:00
yangws 6b66affbab fixed #396 wophone modified. 2011-03-28 17:20:39 +08:00
yangws a9f85a2daa issue #396 airplay modified. 2011-03-28 17:10:05 +08:00
natural-law e38d3a2277 Merge branch 'master' into iss434 
Conflicts:
	cocos2dx/platform/airplay/CCFileUtils_airplay.h
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-03-28 17:06:32 +08:00
natural-law ed2566e201 issue #434,Refactor class CCFileUtils on platform airplay. 2011-03-28 16:27:26 +08:00
yangws a5040e0ccb issue 396 ios modified. 2011-03-28 13:41:14 +08:00
yangws 814b66b089 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396 2011-03-28 11:11:50 +08:00
yangws dceff2d179 issue #396 android modified. 2011-03-28 11:09:49 +08:00
yangws 4b86cec4be issue #396 win32 modifyed. 2011-03-28 10:44:14 +08:00
walzer 2f573a784e fixed #435, CocosDenshion crashes at foreground/background switching 2011-03-27 22:17:18 +08:00
natural-law cee82fe9fa issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
walzer f568ad8487 issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib. 2011-03-26 14:09:42 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer 3029b66fbc Merge branch '417' of https://github.com/yangws/cocos2d-x into yangws-417 2011-03-26 13:35:53 +08:00
yangws 2015e468ca fixed #417 When mouse pressed， capture it in EGLView. 2011-03-26 11:34:18 +08:00
yangws cd6352adec add new files to vc2010 project. 2011-03-25 17:41:54 +08:00
walzer 326bc998da typo fixed, sorry :( 2011-03-25 16:13:18 +08:00
walzer 95d672a858 add copyright & author name for airplay port 2011-03-25 15:30:10 +08:00
walzer e4ae24a20c Merge branch 'yangws-430' 2011-03-25 14:25:52 +08:00
walzer 9c1d462275 Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430 2011-03-25 14:23:05 +08:00
walzer 9b8bc8373b fixed #431, manually merge the WenSheng's work 2011-03-25 14:20:53 +08:00
walzer fa5e71916b issue #431, manually merge WenSheng's work 2011-03-25 14:16:58 +08:00
yangws be966dbddb fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
walzer 7e7e8e2b4c Merge branch 'issue427' 2011-03-25 13:45:49 +08:00
walzer ff91c91ea9 issue #427 android HelloWorld ok 2011-03-25 12:01:56 +08:00
walzer d58a1ac9bc issue #427 projct configs for win32-vs2008, wophone emu & device are ok 2011-03-25 11:23:21 +08:00
walzer 0450048a41 [all] typo fixed, CCSprite::isTextureRectTotated -> CCSprite::isTextureRectRotated 2011-03-25 09:48:43 +08:00
walzer 799fb0994f issue #427, airplay port ok 2011-03-24 18:17:35 +08:00
walzer db4fb7cc9c issue #427, refactor ios port ok. 2011-03-24 17:51:29 +08:00
walzer b9c56f1728 issue #427, try to add CCSAXParser.h 2011-03-24 16:16:49 +08:00
natural-law 55143e3b9e issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString. 2011-03-24 10:38:08 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
unknown 7fa4e43ee5 fixed #424 CCamera.cpp rename to CCCamera.cpp, re-add the file to vc2010 project. 2011-03-23 10:01:37 +08:00
walzer 2b7a324c47 fix compilation error when COCOS2D_DEBUG = 2 2011-03-21 10:50:24 +08:00
walzer 81fa070125 fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
walzer adfad22b2e Merge branch 'issue_418' of https://github.com/minggo/cocos2d-x into minggo-issue_418 2011-03-19 14:20:30 +08:00
minggo 22b55eaf78 issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
walzer abd2725ed4 issue #148, add copyright 2011-03-19 10:34:26 +08:00
walzer 08a5f8029e issue #418 add copyright of original authors to particle module 2011-03-19 10:07:16 +08:00
walzer ffeb116542 Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400 2011-03-18 16:32:20 +08:00
walzer d8c28d3754 Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409 2011-03-18 15:59:01 +08:00
walzer b56014c70f issue #376, ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("") 2011-03-18 15:17:15 +08:00
minggo 6524d037db issue #400: change vs2010 vcproj to include CCCamera.cpp 2011-03-18 15:06:26 +08:00
minggo 1ce64f1ecf issue #400: rename CCamera.cpp to CCCamera.cpp 2011-03-18 14:54:24 +08:00
minggo 7d39629c8c issue #400: rename CCamera.cpp to CCCamera.cpp 2011-03-18 14:54:03 +08:00
minggo 47173778cc fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
walzer 724ac1d0a9 Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403 2011-03-18 10:08:43 +08:00
minggo 7c52a521fa fixed #403: change UIEvent to CCEvent 2011-03-18 09:39:34 +08:00
walzer b4d757ce9e fixed #408 @5m , fix memory leak in CCImage::_initWithPngData 2011-03-17 14:26:36 +08:00
walzer fe6487b33a Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2011-03-17 11:58:38 +08:00
yangws dd7934a19e Merge branch 'master' of https://github.com/yangws/cocos2d-x 2011-03-17 11:11:56 +08:00
yangws fc2818cf21 fixed #404 enableRitinaDisplay return false on iphone3 2011-03-17 11:10:50 +08:00
walzer 0f760e89fa #include "ccGL.h" -> #include "CCGL.h" in CCamera.cpp, for case-sensitive systems 2011-03-17 09:48:28 +08:00
walzer 59b65373e7 [bug fix] CCConfiguration::checkForGLExtension(const string&) sometimes crashes. Define it! 2011-03-16 20:53:08 +08:00
walzer 19d8dc6978 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-15 15:44:53 +08:00
yangws 61e2f56439 Add Retina display resource for tests. 
Modify CCDrawingPrimitives.cpp for retina display support.
 2011-03-15 15:12:50 +08:00
natural-law 06ad40f101 [android]fixed #356,modify the parameter type form ccxScopedPtr<std::string> to std::string *. 2011-03-15 11:59:45 +08:00
minggo 89db0334a3 revert the modification of CCNode_mobile.cpp and CCSprite.cpp 2011-03-15 10:27:16 +08:00
minggo 4b61e713e5 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-15 10:20:56 +08:00
natural-law 0c75af0f97 [android]fixed #356,CCLabelTTF::initWithString not crashed anymore. 2011-03-14 18:29:15 +08:00
yangws 1e67709e34 fixed #392 CC_SPRITE_DEBUG_DRAW OK. 2011-03-12 15:20:26 +08:00
natural-law dd675f8cf1 [wophone]Resolve the memory leak of CCAccelerometer. 2011-03-11 17:41:19 +08:00
natural-law 6d028007c2 Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful. 2011-03-11 17:00:10 +08:00
minggo 69dcaddb51 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-11 12:01:58 +08:00
yangws f0661a2679 fix 4 bugs: 
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
 2011-03-11 11:04:22 +08:00
unknown 0d51d129b5 fixed #253 TileMapTest crash in windows7. 2011-03-10 23:16:38 +08:00
unknown 8e429c422d Build-win32.bat OK on win7 2011-03-10 21:11:14 +08:00
unknown 795f1b985f Add VC2010 project files on win32 2011-03-10 19:50:17 +08:00
minggo a45125dafe Merge branch 'issue385' of https://github.com/yangws/cocos2d-x into yangws-issue385 2011-03-10 17:20:32 +08:00
minggo 9a67fa6df1 Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev 2011-03-10 17:16:15 +08:00
yangws 8335e30aef fixed #385 Impliment CCLog on ios. 2011-03-10 17:08:38 +08:00
natural-law 93aebbc469 [wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone. 2011-03-10 14:24:13 +08:00
yangws 3fc701f1d2 fixed #300 Cocos2d-win32 application wizard for vs ok. 2011-03-10 12:00:29 +08:00
minggo cb24e03466 Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377 2011-03-10 09:37:26 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
minggo 12981fac89 fixed #375 2011-03-09 16:19:20 +08:00
minggo 19470fda34 Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383 2011-03-09 14:55:45 +08:00
minggo 15368e6169 Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373 2011-03-09 14:53:51 +08:00
minggo 75e2ecc16d issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo 63d283d3e8 delete ccxString.h 2011-03-09 12:00:04 +08:00
minggo 7aaf4be85f move platform_support into cocos2dx/platform 2011-03-09 11:38:36 +08:00
natural-law 4c0ace849a [wophone]fixed #383 
1. Modify the approach of handle left soft-key clicked.
2. Fix some compile error.
 2011-03-09 11:26:13 +08:00
yangws 151a0096fa fixed #373 Hide PVRFrame window on win32. 
Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.
 2011-03-09 10:39:08 +08:00
minggo 1aafd4fc56 issue #375: fix some compile error 2011-03-09 10:21:29 +08:00
minggo f1d13ca2e1 issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
minggo 837b8c04bf issue #375: rename some macros 2011-03-08 09:29:41 +08:00
minggo 7a331e1e14 issue #375: wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
minggo 632cf39a8a fix a bug when merging master into dev 2011-03-07 10:34:42 +08:00
minggo d3f93b658d rename libs to libraries and modify cocos2dx/Android.mk 2011-03-07 10:00:33 +08:00
minggo aaf898cb72 merge master into dev 2011-03-07 09:52:45 +08:00
minggo 661bae2797 merge natural-law-iss370 2011-03-04 16:32:54 +08:00
natural-law aef83b2660 [uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication. 2011-03-02 17:45:04 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
minggo f7b401163b Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController 2011-03-02 09:38:23 +08:00
minggo 89b4d07ed8 [android] fixed #368: move Application code to cocos2dx/platform/ccxApplication 2011-03-01 19:53:39 +08:00
minggo fc75306402 [android] fix a bug when run in HVGA 2011-03-01 18:34:06 +08:00
minggo b65d84551b resolve confict when merging branch yangws-issue366 2011-03-01 14:08:18 +08:00
yangws 7bc7d32001 fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication 2011-03-01 12:41:57 +08:00
minggo 1b6602f582 Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android 2011-02-28 10:00:55 +08:00
minggo f504211e56 merge natural-law-iss332 to dev 2011-02-28 09:48:14 +08:00
minggo 498e0072e1 [android] fixed #358: autoscale HVGA resource to WVGA 2011-02-26 15:52:57 +08:00
minggo 0453eb0266 [android] issue #338:refactor platform_support 2011-02-24 19:42:45 +08:00
yangws 03e946a34f Delete unused files. 2011-02-23 18:24:29 +08:00
yangws 63cedd1317 Merge code of Platform_support for IOS. 2011-02-23 18:22:05 +08:00
natural-law 949c1000a8 update tests to 0.99.5. 2011-02-23 16:47:25 +08:00
minggo 36cb90aaa0 Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport 2011-02-23 14:13:48 +08:00
minggo 3dde0ebcf5 [android] fixed #353: support jpg on android 2011-02-23 13:43:45 +08:00
natural-law 4362a5f381 [uphone]issue #316,Resolution auto adjustment. 2011-02-19 17:44:43 +08:00
natural-law 60e9ae873c Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 
Conflicts:
	HelloWorld/AppDelegate.cpp
	tests/AppDelegate.cpp
 2011-02-19 10:19:14 +08:00
yangws 85b9c9ae21 Retina display support and scale with keep w/h rate ok on win32. 2011-02-18 18:30:22 +08:00
Macarse 4267593bf9 Used an array approach 2011-02-17 23:23:36 -03:00
natural-law 8035fc366c [uphone]Support read image file from zip file. 2011-02-17 16:16:50 +08:00
natural-law e4063fd190 [uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device. 2011-02-17 14:31:52 +08:00
natural-law 0f52839efb [uphone]support wrap when the dimensions is specified in CCLabelTTF. 2011-02-16 11:03:32 +08:00
walzer 693a8f049b [iphone] test alignment in labels, ref to the post http://www.cocos2d-x.org/boards/6/topics/588?r=589#message-589 Thanks to Slaz 2011-02-14 11:51:56 +08:00
walzer 626a3f8b74 [uphone] fixed #348, text drawing blur if color=white and fontSize<24 2011-02-12 22:42:42 +08:00
yangws 8458476597 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	.gitignore
 2011-02-12 16:42:47 +08:00
minggo 81848f19e6 Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345 2011-02-12 11:29:27 +08:00
walzer 7e039fbaa1 [win32] add CCX_DLL to CCLayerGradient & CCTimer 2011-02-11 17:30:11 +08:00
minggo eef0bd4578 [iphone] fixed bug #345: remove init invoking 2011-02-11 16:06:09 +08:00
yangws 36d68eeb41 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-02-11 09:34:12 +08:00
Macarse 8d5995d5a6 First approach 2011-02-06 17:05:56 -03:00
Macarse 66038230eb Added logic to disable sensors from the c++ code 2011-02-05 20:17:24 -03:00
Macarse 284c330569 Added code from walzer's comment 2011-02-01 00:11:42 -03:00
Macarse fce540989d First approach 2011-01-30 20:05:30 -03:00
natural-law d0b27c4222 fix bug,MenuTest crash. 2011-01-28 16:05:21 +08:00
yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXUIImage_win32.cpp
	cocos2dx/platform/win32/CCXUIImage_win32.h
	tests/test.win32/test.win32.vcproj
 2011-01-28 14:33:47 +08:00
yangws 76ea63da7f Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
walzer 3260eddd75 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-26 17:11:39 +08:00
walzer ead71525e2 [uphone] don't block when zip resources loading failed 2011-01-26 17:08:19 +08:00
minggo a0ecaed1ef [android] define s_bPopupNotify 2011-01-26 16:45:27 +08:00
minggo 54dc660f6b [android] change the declaration of s_bPopupNotify from public to private 2011-01-26 16:44:58 +08:00
minggo 39165142b8 [iphone] change the declaration of s_bPopupNotify from public to private and define it 2011-01-26 16:44:12 +08:00
minggo 31d287a77d [uphone]change the declaration of s_bPopupNotify from public to private 2011-01-26 16:42:48 +08:00
minggo 072ed1651e [win32] change the declaration of s_bPopupNotify from public to private 2011-01-26 16:41:59 +08:00
walzer a732665b85 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-01-26 15:48:02 +08:00
natural-law 3746af1d63 fixed #328.Modify the function and parameter name. 2011-01-26 15:43:12 +08:00
natural-law 7015e85918 fixed #328.By default,pop up a err dialog when loading textures failed. 2011-01-26 11:50:13 +08:00