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

800 Commits

Author SHA1 Message Date
minggo c4d1dedba8 Merge https://github.com/reflog/cocos2d-x into reflog 2011-08-02 14:03:34 +08:00
Guillaume Maury f86da27a38 Merge branch '0.9.0' 2011-08-02 03:49:36 +08:00
Guillaume Maury b789927ca3 added possibility to add a path to the lua search path (package.path/LUA_PATH) 2011-08-02 03:47:39 +08:00
Eli Yukelzon af61a7c650 added support for optional default values in CCUserDefault getters 2011-07-31 15:08:25 +03:00
Eli Yukelzon 9c5fa51e6b usuful macros for defining scene() and node() methods with params 2011-07-30 11:55:38 +03:00
RongHong a54fda812b fixed #641 the user could save buffer to any path 2011-07-29 11:36:04 +08:00
Eli Yukelzon 41ec0ba945 modification to support radio menu 2011-07-28 22:18:45 +03:00
reflog ae945f4880 changes to support CCScrollLayer 2011-07-28 17:09:06 +03:00
RongHong c1fdf9afb5 issue #608 rendertexture disappears after going to background 2011-07-28 17:32:09 +08:00
Leon a8e4d5ea89 rename CCMenu::menu() -> CCMenu::node() 2011-07-28 14:24:24 +08:00
Leon 4c06cb853b Merge remote branch 'upstream/master' 2011-07-28 12:27:07 +08:00
Leon 4510101e96 add CCMenu::init() and CCMenu::menu() to create empty menus 2011-07-28 10:45:32 +08:00
RongHong a253909030 fixed #630 To realize the buffer-saving function in CCRenderTexture 2011-07-27 16:55:04 +08:00
minggo 33e85bdc53 Merge pull request #421 from leon-li/master 
add CCMenuItem::setTarget
 2011-07-26 18:48:24 -07:00
Leon c5f7036f7b add CCMenuItem::setTarget 2011-07-26 18:41:58 +08:00
Walzer 059e5ebc0b add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak 2011-07-25 15:00:00 +08:00
Walzer 45e8915963 fixed #628, CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain) 2011-07-24 08:30:49 +08:00
minggo 3e080476f3 [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
Walzer d2b44a203f issue #536, build success on win32 2011-07-19 16:03:42 +08:00
Walzer 768bfa9a9b issue #536, add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet. 2011-07-19 15:22:13 +08:00
Walzer bc44855091 issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet. 2011-07-19 15:14:59 +08:00
minggo a3e9679578 fixed #611: add some functions for lua 2011-07-18 10:18:36 +08:00
minggo fe3aadf800 update to 1.0.0 07-12 2011-07-13 10:20:24 +08:00
minggo d48c3fdfb1 upgrade to 1.0.0-final 07-11 2011-07-12 11:20:41 +08:00
minggo eb675073ee remove inline to comiple ok on android 2011-07-11 16:36:19 +08:00
RongHong c8f5f703a5 to commit LuaCocos2d.cpp 2011-07-11 15:33:27 +08:00
natural-law 1bdce00740 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/include/ccConfig.h
 2011-07-08 17:08:57 +08:00
minggo 6c37f42414 Merge pull request #368 from minggo/master 
fixed #586
 2011-07-08 01:46:54 -07:00
natural-law cba538d5d0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-08 15:58:14 +08:00
minggo 39a3b715cd fixed #589 2011-07-08 15:28:13 +08:00
natural-law 810cf3f8c3 fixed #591 2011-07-08 15:02:46 +08:00
minggo f0ea58651b fixed #586 2011-07-08 15:01:51 +08:00
Walzer 5c8b04bc25 fixed #585 2011-07-08 14:48:25 +08:00
natural-law 134a3a0fcf fixed #590 2011-07-08 14:32:09 +08:00
natural-law db6a5fce23 fixed #588. 2011-07-08 14:16:10 +08:00
natural-law 5db1719302 fixed #587 2011-07-08 14:15:51 +08:00
minggo 96289b20c4 upgrade to rc3 2011-07-07 16:03:03 +08:00
minggo b08788d810 change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval* 2011-07-07 15:41:42 +08:00
minggo 8e370eeb10 fix some compiling warnings 2011-07-07 11:27:45 +08:00
Walzer 348a05a329 fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
Walzer 72dfb3f919 fixed #576, replace std::string to _KeyT in CCMutableDictionary class template 2011-07-07 08:19:29 +08:00
minggo 3dc1967f6c fixed #579: change zorder to int 2011-07-06 20:48:56 +08:00
minggo 6cb945a8ca fix bug of particle_node when upgrade to rc3 2011-07-06 18:16:19 +08:00
minggo 980ce79ead [android] fixed #577: init member variable to default value 2011-07-06 15:22:25 +08:00
minggo ff50997eb0 issue #574 2011-07-06 14:56:05 +08:00
minggo 7603665165 fix merging confict of CCDirector.cpp 2011-07-05 14:54:41 +08:00
minggo 7adb140439 fixed #568 2011-07-05 14:51:17 +08:00
natural-law 6c95a3190f Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-05 12:05:43 +08:00
natural-law 7107c6612b fixed #563, Upgrade folder support to rc3. 2011-07-05 12:05:19 +08:00
minggo 0d80326392 fixed #564: upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
minggo 0e6bf40e7c fixed #561: upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
minggo 6b97a381e9 fixed #560: upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
minggo 8478288e88 fixed #iss559 2011-07-04 14:47:32 +08:00
minggo 70ce4f877f fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
minggo 6482f5662b fixed #557: upgrade label_nodes to 1.0.1-rc3 2011-07-04 10:59:35 +08:00
natural-law 0378a6a36d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/include/CCNode.h
 2011-07-01 16:24:23 +08:00
natural-law 7d7f3a9241 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
minggo 16f79cb0be fixed #554: upgrade base_nodes to 1.0.0-rc3 2011-07-01 15:48:05 +08:00
minggo de705986f8 Merge pull request #341 from minggo/iss553 
fixed #533: upgrade actions to 1.0.0-r3
 2011-07-01 00:18:32 -07:00
minggo 7bdf2cb84e fixed #533: upgrade actions to 1.0.0-r3 2011-07-01 15:08:23 +08:00
natural-law 4d5dab4a40 fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3. 2011-07-01 11:26:26 +08:00
minggo 6cb6359168 Merge pull request #308 from minggo/master 
fixed #528
 2011-06-21 02:06:11 -07:00
Walzer f3375f0dbb issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
minggo 00cc1d277d fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx() 2011-06-21 16:59:17 +08:00
Walzer ddbdf67f97 Merge http://github.com/minggo/cocos2d-x into lua 2011-06-21 16:03:34 +08:00
minggo 968779912a fixed #528: add copyright & modify pop menu position 2011-06-21 15:50:47 +08:00
Walzer 175e9394bc Merge https://github.com/minggo/cocos2d-x into lua 2011-06-21 15:22:00 +08:00
minggo d72d8a52f4 Merge https://github.com/cocos2d/cocos2d-x 2011-06-21 13:53:04 +08:00
Marat Yakupov 14c43f4246 changed postfix increment of iterators to prefix increment 2011-06-21 09:30:03 +04:00
minggo 80e618f6ed issue #528: fix some bug & complete hello.lua 2011-06-21 11:47:57 +08:00
Walzer 4d161e7948 fix #529, add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer 2011-06-21 10:53:20 +08:00
minggo 2f97a43439 issue #528: refactor lua ok on Android 2011-06-21 10:18:43 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
Marat Yakupov 7be492d1b5 Parameters should be passed by const reference instead copy 2011-06-16 09:27:51 +04:00
minggo 33008fc8de Merge pull request #300 from minggo/lua 
Lua support
 2011-06-15 02:24:17 -07:00
liswei 7c669cfcb4 fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly 2011-06-14 16:27:47 +08:00
minggo 0f19c30921 remove redifine functions 2011-06-14 11:32:01 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
Walzer f600846d4b Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp 2011-06-08 11:08:29 +08:00
RongHong 67eb87abfe To fix the crash when the gles version is too low 2011-06-08 10:02:07 +08:00
RongHong a13e8ae859 1.修正gles版本过低时会崩溃的问题 
2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题
 2011-06-03 15:22:50 +08:00
Walzer 97afafd856 Merge remote branch 'origin/master' 2011-06-02 22:26:53 +08:00
Walzer 3cba64679c add std::string CCString::toStdString() method 2011-06-02 22:26:38 +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 697368cf20 support lua 2011-05-31 14:04:14 +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
yangws 02774dd963 fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite. 2011-05-19 17:00:13 +08:00
Walzer 78d49e9806 [win32] dllexport 2 pure C functions from CCLabelBMFont.h 2011-05-12 08:40:19 +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
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 2c0bd49513 issue #455: CCUserDefault ok on win32 & Android 2011-05-06 15:31:51 +08:00
yangws 0fe61642f6 issue #478 text input ok. 2011-05-05 18:17:50 +08:00
minggo 0db248e1f1 Merge pull request #245 from yangws/input. 
TextInputTest on on ios.
 2011-05-02 18:48:48 -07:00
yangws 170933b4c5 CCTextFieldTTF test code ok on win32. 2011-04-29 16:46:29 +08:00
yangws 2bb4775051 add CCTextFieldDelegate. 2011-04-28 18:01:29 +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
yangws 323c065934 make test can compile on wophone and airplay. 2011-04-28 10:31:51 +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 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 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
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
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
Walzer 735b6ce97b CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration 2011-04-19 11:23:02 +08:00
yangws d11bd85d00 CCTextFieldTTF works on win32. 2011-04-19 09:32:33 +08:00
moadib 03093a98b5 In pointmath-related functions parameters should be passed by reference 2011-04-16 10:55:02 +04: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 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 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
natural-law b72b5306d2 Fix problems discovered when test: 
1. Add include file in ccConfig.h
2. Resolve the memory leak in PerformanceSpriteTest.
3. Delete the 2048 * 2048 texture test case in PerformanceTextureTest.
 2011-04-07 14:30:35 +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
minggo 7d52161804 fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06: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
natural-law 5f7357bf09 fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0. 2011-03-29 11:56:14 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer 7e7e8e2b4c Merge branch 'issue427' 2011-03-25 13:45:49 +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
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
minggo 22b55eaf78 issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
walzer 08a5f8029e issue #418 add copyright of original authors to particle module 2011-03-19 10:07:16 +08:00
minggo 47173778cc fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
minggo 7c52a521fa fixed #403: change UIEvent to CCEvent 2011-03-18 09:39:34 +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
natural-law 0c75af0f97 [android]fixed #356,CCLabelTTF::initWithString not crashed anymore. 2011-03-14 18:29:15 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +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 f1d13ca2e1 issue #375: android compiled ok 2011-03-08 13:49:58 +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 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 f504211e56 merge natural-law-iss332 to dev 2011-02-28 09:48:14 +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
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
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
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
walzer 7e039fbaa1 [win32] add CCX_DLL to CCLayerGradient & CCTimer 2011-02-11 17:30:11 +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
minggo 9eff0da20a fix warning when building on android 2011-01-24 10:51:30 +08:00
yangws bc9bfdc30c Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 2011-01-20 11:18:35 +08:00
yangws 804dc4ef7c Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/win32/CCXBitmapDC.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
 2011-01-19 15:29:08 +08:00
yangws 79b711a758 move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00
walzer e399a77369 fixed #306, invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval. 2011-01-17 22:01:15 +08:00
walzer 04c685b95a issue #289, fix some warnings 2011-01-17 21:16:25 +08:00
walzer ad5ee3c9f6 Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +08:00
yangws 67c0ad6332 add platform support project on win32. 
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
 2011-01-15 18:05:35 +08:00
minggo 6043008a11 Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track 2011-01-13 13:52:20 +08:00
natural-law 00a9615e0f Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-10 18:08:57 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo 7e30615d02 issue #304 Remove codes for controlling frame rate. 2011-01-10 15:13:30 +08:00
minggo 9a959c299f fixed some errors of iphone platform 2011-01-07 09:35:27 +08:00
natural-law 25e9721678 fix bugs. 2011-01-04 17:46:23 +08:00
Walzer 4a6989b6ff [uphone] add keyMenuBack to CCKeypadDelegate 2010-12-31 18:15:30 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
natural-law 3dfd530b38 Merge branch 'iss295' into upto-0.99.5 2010-12-31 09:48:48 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
minggo 942d0233cf fixed #290 2010-12-30 17:30:11 +08:00
minggo b0e5c06d37 Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5 2010-12-30 10:36:17 +08:00
minggo da00d82117 fix some error in CCGrid and CCDirector.h 2010-12-30 10:28:13 +08:00
minggo 7b804d985b merge yangws-upto-0.99.5 into upto-0.99.5 2010-12-30 10:25:35 +08:00
minggo 94c7f968e1 Merge branch 'minggo-upto-0.99.5' into upto-0.99.5 2010-12-29 18:18:14 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
Li Lirong e58ba468ee fix some warnings under android 2010-12-29 10:30:42 +08:00
natural-law 35d611155b add functions: 
void CCSpriteBatchNode::addQuadFromSprite(CCSprite *sprite, unsigned int index);
CCSpriteBatchNode * CCSpriteBatchNode::addSpriteWithoutQuad(CCSprite*child, unsigned int z, int aTag);
 2010-12-28 17:42:23 +08:00
natural-law 05bf58b488 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-28 17:24:56 +08:00
natural-law a48b4b762b update tileMap_parallax_nodes to 0.99.5. 2010-12-28 15:17:59 +08:00
minggo 355570ea8f issue #292 2010-12-28 15:05:55 +08:00
yangws 0edf124e4f issue #281 CCParticleExamples upto-0.99.5 2010-12-28 14:04:28 +08:00
yangws 706f97114b issue #281 CCParticleSystemQuad upto-0.99.5 2010-12-28 11:55:34 +08:00
yangws 5e377f9368 issue #281 CCParticleSystemPoint.h upto-0.99.5 2010-12-28 11:09:40 +08:00
yangws afd9675854 CCParticleSystem upto-0.99.5 2010-12-27 17:39:15 +08:00
minggo 33ad2881b7 merge mingo-upto-0.99.5 to upto-0.99.5 2010-12-27 11:06:44 +08:00
minggo 28a3857f95 Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-27 10:59:03 +08:00
minggo 4e35a660dc Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5 2010-12-27 10:55:59 +08:00
minggo 4cd3e59e2b fixed #278 2010-12-27 10:26:56 +08:00
natural-law 46e78ab7a1 update layers_scenes_transition_nodes to 0.99.5. 2010-12-25 18:07:34 +08:00
yangws c142070c2c misc_node upto-0.99.5. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-25 15:09:42 +08:00
natural-law 6ee16ce878 update menu_nodes to 0.99.5 2010-12-25 11:15:19 +08:00
minggo 07b774bc6f Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-25 09:24:15 +08:00
natural-law 969e65b959 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-24 17:33:18 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
minggo d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +08:00
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
natural-law e11ccb50fe fixed #283 Add member data m_positionInPixels for some classes. 2010-12-24 11:40:44 +08:00
minggo e3b49d7504 merge from minggo and natual-raw 2010-12-23 17:40:23 +08:00
natural-law 3c6d1d8317 update actions to 0.99.5 2010-12-23 16:47:29 +08:00
minggo 3692d01c5a fixed #288 2010-12-23 14:18:08 +08:00
minggo 994a3b05ea fixed #273 2010-12-23 11:19:56 +08:00
natural-law eeb4e99804 rename the action classes. 2010-12-22 15:43:54 +08:00
natural-law 4a765d33a3 rename the CCXXXAction files to CCActionXXX. 2010-12-22 15:15:04 +08:00
Walzer 5c858b182c issue #243, fix warnings 2010-12-18 12:02:57 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
yangws de97900b6c CCLOG support for cocos2d-win32 2010-11-23 11:23:29 +08:00
Walzer 0ad77b779a issue #211 don't checkout 2010-11-18 15:55:00 +00:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
natural-law 2b23e0f6d5 debug 2010-11-18 10:27:05 +00:00
Walzer 0a2567c646 SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine 2010-11-17 08:31:48 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 0aab635d85 fixed #206 2010-11-16 04:02:45 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Ming 6062cf1558 issue #202 2010-11-12 09:26:01 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
natural-law 000bdeeb42 issue #189 
add support of Accelerometer sensor
 2010-11-10 08:29:52 +00:00
Ming 6853385c8d resolve compile error for android 2010-11-03 02:59:07 +00:00
Ming 992ad7e75d fix the method of computing frame rate 2010-10-16 07:29:53 +00:00
Ming 0298500abe add setContentScaleFactor() 2010-10-15 07:47:48 +00:00
Ming 7a9b417248 2010-10-11 10:05:34 +00:00
Ming 9febafadec 2010-10-09 08:23:58 +00:00
Walzer 77564d0017 add LAYER_NODE_FUNC & SCENE_NODE_FUNC 2010-10-09 06:23:47 +00:00
Walzer 371baf3efc add NSSet::anyObject method 2010-10-01 15:05:05 +00:00
Walzer 1b385bfe20 fix warnings in NSSet & CCXUIImage_uphone. NSSet will alloc std::set in heap, instead of in stack, to avoid compile warning 2010-10-01 06:34:47 +00:00
Walzer a6b03ce9ea add type cast in "ccp" marco, to avoid warnings 2010-10-01 06:21:37 +00:00
Ming 0247182dc3 fixed #173 2010-09-30 07:54:15 +00:00
Walzer 72aee0eace issue #175, add retain for CCCallFunc::m_pSelectorTarget 2010-09-30 03:57:31 +00:00
Ming 683596a023 issue #170 2010-09-29 09:39:45 +00:00
Walzer 8633fa5d9e issue #171 2010-09-29 08:33:52 +00:00
Walzer f1c48be489 issue #171, implement CGRectIntersectsRect 2010-09-29 08:06:03 +00:00
Walzer b8f59f623d issue #171, implement CGRectIntersectsRect 2010-09-29 07:24:51 +00:00
Walzer d93aae9133 issue #171, add annotate for protected member variable 2010-09-29 04:03:21 +00:00
yangws c8439ca79e change CGPoint CGSize CGRect function's parameter pass by value to pass by reference, 
impliment CGRectIntersectsRect function
 2010-09-29 03:49:38 +00:00
Walzer dad659641b issue #171, add @brief in class annotate 2010-09-29 01:44:57 +00:00
Ming 742baf4fdb issue #170 2010-09-28 10:27:33 +00:00
Ming 68d3edc0d3 issue #170 2010-09-28 08:18:05 +00:00
Walzer 01eb8da314 issue #171, modify object-c code in annotate. 2010-09-28 04:14:12 +00:00
Walzer a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Walzer 5b82f4d468 issue #161，support *.jpg 2010-09-26 02:09:05 +00:00
Walzer 8de5442c0e issue #161，update CCTMXLayer, CCTMXTiledMap, CCTextureCache 2010-09-25 02:28:27 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
Walzer 156d1ff69b issue #161，add CCSpriteBatchNode 2010-09-24 04:04:13 +00:00
Ming a50b1b97bb issue #151: because now the r, g, b is correct, so we should not 
change it
 2010-09-21 08:15:23 +00:00
Ming 556b8ed455 issue #151: change the function name 2010-09-18 07:44:56 +00:00
Ming 93135d1366 issue #151 2010-09-18 07:22:07 +00:00
Ming 622170528c issue #141 2010-09-14 07:23:38 +00:00
natural-law 40b6d8500a issue #139 
Debug
 2010-09-13 03:09:15 +00:00
natural-law 44ce8d9c5a issue #143 
Clear memory leaks
 2010-09-11 08:18:18 +00:00
natural-law 143d8a3271 debug 2010-09-11 06:51:13 +00:00
Walzer b2d950743b issue 136, use NSDictionary in CCSpriteFrameCache 2010-09-10 06:08:25 +00:00
natural-law 2f438483e5 fixed #137 
add SchedulerTest code
 2010-09-09 08:15:21 +00:00
natural-law 2997a74699 issue #135 
Add SpriteTest code
 2010-09-09 02:17:38 +00:00
Ming 2abd0cbff7 issue #131 2010-09-08 02:04:06 +00:00
Walzer 64d0d7a7e1 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-08 01:28:28 +00:00
Walzer 4b86b49b08 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
natural-law 8eb885382e issue #130 
Add function to set the resource path
 2010-09-07 08:05:18 +00:00
Walzer 641adefe1c fixed #133, override copyWithZone in class CCCallFuncN 2010-09-07 07:13:25 +00:00
natural-law f94441141f fixed #132 
add AtlasTest code
 2010-09-07 03:47:54 +00:00
Walzer 43672e1770 issue #114, CCTMXTiledMap debug 2010-09-07 03:26:28 +00:00
Ming 4023e2830b issue #131 2010-09-07 02:22:07 +00:00
Walzer 1c1971255e fixed #129, use NSString to make dictionary 2010-09-06 12:26:19 +00:00
yangws 4a52e5aaf9 impliment CCXEGLView for uPhone device. 2010-09-06 10:35:24 +00:00
Walzer 37458680a7 fixed #127, add NSString 2010-09-06 06:54:14 +00:00
Ming 7131389535 issue #61: 2010-09-06 05:52:57 +00:00
Walzer 4de7ff7a98 issue #114, CCTMXTiledMap debug 2010-09-06 03:59:28 +00:00
Ming 031054abc6 issue #61: 2010-09-06 03:58:14 +00:00
Ming b842c135c3 issue #61: 2010-09-06 03:55:56 +00:00
Ming e975c403ba issue #61: 2010-09-06 02:57:21 +00:00
Walzer 907fb3f692 issue #126, add retain when member variable is changed 2010-09-06 02:27:38 +00:00
Walzer fee1ce8f09 fixed #124, chipmunk done! 2010-09-04 10:18:14 +00:00
Walzer 4226dcede9 issue #61, add retain for member variable 2010-09-04 10:06:26 +00:00
Walzer 5fd1bf85b6 issue #121, return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming f4681c4b53 issue #122 2010-09-04 03:55:42 +00:00
Ming 0dda718b87 issue #122 2010-09-04 03:48:11 +00:00
Ming 0468bbf3f3 issue #122 2010-09-04 03:30:39 +00:00
Ming 8b1e5f71c0 issue #122 2010-09-04 03:20:10 +00:00
Ming 9258d171aa issue #119 2010-09-03 03:09:47 +00:00
Ming 9a12e848f5 fixed #118 2010-09-03 01:32:13 +00:00
Walzer fea395cc79 issue #116, remove include "support/data_support/CCArray.h" in CCTMXLayer.h 2010-09-02 07:48:47 +00:00
Ming 73d6ecb232 issue #116 2010-09-02 02:44:40 +00:00
Ming 6a4af3bcfd issue #116 2010-09-02 02:33:39 +00:00
natural-law b18e246eb9 fixed #115 
add TileMapTest code
 2010-09-01 09:30:51 +00:00
Walzer ca8672ff62 fixed #113 2010-09-01 07:26:47 +00:00
natural-law 4b529493fc fixed #110 
add ParallaxTest code
 2010-09-01 06:57:55 +00:00
Ming c6789ef16d fixed issue#111 2010-09-01 06:57:12 +00:00
Walzer 7bcb58ef78 2010-09-01 05:56:36 +00:00
Walzer 820676ea28 issue #18, complete the implementation left. 2010-09-01 04:02:36 +00:00
Ming 05259df015 issue #61: the destruction of NSObject should be virtual 2010-09-01 04:01:48 +00:00
Walzer ff3d907846 issue 67, modify constructor 2010-08-31 10:11:31 +00:00
Walzer 3d91d1e58d update to uphone-sdk-2010.08.26, which adds opengl headers 2010-08-31 08:53:25 +00:00
Walzer a0ec92f6c4 fixed #71, complete CCTMXTiledMap 2010-08-31 08:48:42 +00:00
Walzer 92f2528ede fixed #69, complete CCTMXLayer 2010-08-31 07:11:13 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Ming b9587a7062 2010-08-30 07:45:39 +00:00
Walzer 4ac8acdf44 fixed #68, complete CCTileMapAtlas 2010-08-30 07:23:07 +00:00
Ming 40158638ff issue #85:remove the using of dynamic_cast() 2010-08-30 07:06:08 +00:00
natural-law 6e7fede2bb fixed #103 
add ActionManager Test code
 2010-08-30 07:04:46 +00:00
Ming 821602a853 fixed #105 2010-08-30 05:42:17 +00:00
Walzer 1eeebfb6fb fixed #70, CCTMXObjectGroup 2010-08-30 03:45:46 +00:00
Ming 0cdfba141a issue #85: make CCRepeatForever to inherit from CCIntervalAction 2010-08-28 10:00:38 +00:00
Ming 1e7e3f6854 fixed #102: CCRANDOM_0_1() has an error, it always return 0 2010-08-28 09:42:12 +00:00
natural-law b1c7636632 fixed #100 
Modify the variable type of CCAction::m_pTarget form NSObject to CCNode
 2010-08-28 04:02:10 +00:00
Ming 32c2e83b3f issue #98 2010-08-28 02:56:18 +00:00
Walzer 408a34603b fixed #72, complete CCTMXLayerInfo 2010-08-27 10:07:37 +00:00
Walzer 2367ceed67 issue #82: debug CCParticleSystem::initWithDictionary ,break and return false if there is something wrong 2010-08-27 07:17:15 +00:00
Ming 60adec78e8 issue #85: avoid virtual inheriting from NSObject, and remove the using of dynamic_cast() 2010-08-27 06:13:32 +00:00
natural-law 738ed042fa fixed #97 
add Touches Test code
 2010-08-27 03:53:35 +00:00
Walzer 2aca691689 issue #96, add CCTMXXMLParser files 2010-08-26 09:53:35 +00:00
natural-law 7fd86b7734 fixed #95 
add CocosNode Test code
 2010-08-26 07:09:02 +00:00
Walzer 2658199ead issue #82: debug 2010-08-26 06:06:41 +00:00
natural-law 82f316a247 issue #78 
modify Particle Test code
 2010-08-26 03:39:26 +00:00
Walzer 0e053e2703 issue #91, debug CCParallaxNode 2010-08-26 03:34:22 +00:00
Walzer 2ad752d206 fixed #91, implement CCParallaxNode 2010-08-26 03:30:52 +00:00
natural-law b47d47b3b5 fixed #93 
add DrawPrimitives Test code
 2010-08-26 02:53:49 +00:00
Walzer 4f1e1996be issue #91, add CCParallaxNode files 2010-08-26 02:44:00 +00:00
Walzer e7fc567b94 issue #82: debug , 2010-08-26 01:42:20 +00:00
Ming fab3c76c10 fixed #89 2010-08-25 10:31:55 +00:00
Ming b8416fdfec fixed #86 2010-08-25 09:25:01 +00:00
Ming 7291056154 fixed #86 2010-08-25 09:21:38 +00:00
Ming 1cfee20d06 fixed #84: 2010-08-25 08:08:10 +00:00
Ming 32fbef7d34 issue 82: remove the including of "platform/platform.h" 2010-08-25 06:37:40 +00:00
Ming 8c818ac0ff issue #81: remove including header of "platform/platform.h" 2010-08-25 03:46:57 +00:00
Ming c36b833784 issue #81: remove including header of "platform/platform.h" 2010-08-25 03:44:26 +00:00
Ming 82a39c917f issue #81: remove including header of "platform/platform.h" 2010-08-25 03:40:02 +00:00
Ming ebab68a580 issue #81: remove including header of "platform/platform.h" 2010-08-25 03:38:08 +00:00
Walzer b34b5b379e issue #82: debug , undefine CCDictionary 2010-08-25 03:36:57 +00:00
Walzer 96a1e4f5ec 2010-08-25 03:18:59 +00:00
Ming 1cec3f5b60 issue #81: remove including header of "platform/platform.h" 2010-08-25 03:17:03 +00:00
Ming 25f49cac40 issue #81: remove including header of "platform/platform.h" 2010-08-25 03:14:34 +00:00
Ming ecd8b2e9e4 fixed #80 2010-08-25 02:35:19 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Ming bd6c97dd2a issue #80: remove CCDirector.h to direction of include 2010-08-25 01:40:31 +00:00
Walzer 8da4457904 issue #62, debug 2010-08-24 06:32:01 +00:00
Walzer 2051869da5 issue #62, debug 2010-08-24 06:30:03 +00:00
Walzer df7092b83b issue #62, debug 2010-08-23 09:53:43 +00:00
Ming 4b34b3a015 fixed #79 2010-08-23 09:29:52 +00:00
Walzer 8f24fa052b issue #62, debug 2010-08-23 07:56:14 +00:00
Walzer b43a3a2aac issue #62, debug 2010-08-23 07:53:10 +00:00
Walzer de81590145 issue #62, debug 2010-08-23 07:15:05 +00:00
Walzer 0fd94875fb fixed #62, complete particle system 2010-08-23 06:57:37 +00:00