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

779 Commits

Author SHA1 Message Date
minggo faa8b59b6d fixed #920: export functions in CCAffineTransform 2011-12-20 10:39:10 +08:00
YuLei Liao 318a4c5ba8 merge upstream/master to master 2011-12-17 12:02:24 +08:00
minggo 15fca8b4b4 issue #892: use RTTI instead of selectorRetain() and selectorRelease() 2011-12-15 10:26:31 +08:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
dumganhar baf3755142 remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
styck bcf63d0e96 Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
YuLei Liao 7e170c7517 * add LUA_ENGINE_DEBUG & LUALOG macro 2011-12-08 15:44:13 +08:00
minggo 3bf11dba7e issue #892: modify pkg for lua 2011-12-07 15:24:03 +08:00
minggo cdc842051f issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
GavT 6ab60118af Update cocos2dx/include/CCTouch.h 2011-12-06 20:31:40 -08:00
YuLei Liao 442e06e62e * add CCNode:getPositionLua(), return CCPoint 2011-12-04 11:35:55 +08:00
YuLei Liao cf12806558 merge luafix-0.9.2 2011-12-01 22:02:16 +08:00
YuLei Liao 2d9e8f065b * add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY() 2011-12-01 14:58:39 +08:00
YuLei Liao 45fe3b3090 * merge luafix-0.9.2 2011-11-30 21:42:18 +08:00
YuLei Liao a680ba4a8a * CCTouch:locationInView() & CCTouch:previousLocationInView() return const reference 2011-11-30 21:29:57 +08:00
YuLei Liao 31285fea17 * add Touch & MultiTouches lua support 2011-11-30 21:27:50 +08:00
YuLei Liao 4bf68e79fd * merge upstream/master to master 2011-11-29 19:56:20 +08:00
YuLei Liao ebd381af26 * merge luafix-0.9.2 to master 2011-11-29 19:20:49 +08:00
YuLei Liao 90ae1aabc7 * add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler() 2011-11-29 17:10:58 +08:00
YuLei Liao 0739c1f262 * rename LuaEngine to CCLuaEngine 
* add #if LUA_ENGINE
* format source files
 2011-11-29 15:42:12 +08:00
YuLei Liao f1351610d8 * merge CCLuaSupport to CCLuaEngine 2011-11-29 12:35:48 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
Walzer ab7db20809 Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform 2011-11-26 17:20:12 +08:00
minggo 101f076a44 fixed #760: implement functions in .cpp 2011-11-25 10:13:59 +08:00
minggo c3a034a19b fixed #760: add functions to get/add m_pNotificationNode 2011-11-23 17:18:53 +08:00
YuLei Liao 4ff2bf96d1 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 13:41:48 +08:00
YuLei Liao 151b373239 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 00:58:31 +08:00
YuLei Liao a1f8433a47 * fix merge error 4 2011-11-21 18:50:19 +08:00
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao b34859108e * remove needless files 2011-11-21 11:58:55 +08:00
YuLei Liao 57bf9453b7 * add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class 
* move CCTimer from CCScheduler.cpp/.h to CCTimer.cpp/.h
 2011-11-20 16:38:27 +08:00
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +08:00
minggo a7d6c90adb Merge pull request #571 from jbyu/master 
fix memory-leak for lua engine
 2011-11-17 18:53:14 -08:00
minggo cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
Leon 785b79d263 fix compile errors under ubuntu 11.10 2011-10-31 23:50:08 -07:00
minggo 2c14402107 fixed #776: merge pull request and remove unneeded codes 2011-10-28 09:46:19 +08:00
laschweinski e53649ccaa add a member function to get key string of a texture. 2011-10-22 19:39:31 +08:00
laschweinski 5589335d3a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1 2011-10-22 19:27:35 +08:00
laschweinski 04633242ba fix a bug in audio player 2011-10-22 19:10:50 +08:00
minggo ba2f2fbc8b Merge https://github.com/reflog/cocos2d-x into reflog 2011-10-08 11:28:16 +08:00
Eli Yukelzon d23b044782 fill for polygon drawing 2011-10-05 10:50:00 +02:00
minggo c24d1d3fd6 Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port 2011-09-16 13:53:18 +08:00
minggo d763cc3884 Merge pull request #503 from minggo/master 
fixed #709: write doxygen comment in CCSet.h
 2011-09-12 23:23:21 -07:00
minggo e2315d92b5 fixed #709: write doxygen comment in CCSet.h 2011-09-13 09:31:54 +08:00
Walzer 8082b91c0e fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730 2011-09-10 08:48:15 +08:00
minggo 8ccc3321a3 Merge pull request #500 from flyingpacer/renderendcrash 
Renderendcrash
 2011-09-05 20:52:50 -07:00
RongHong fea3da3156 fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 11:33:48 +08:00
minggo e69d16e7d6 change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable 2011-09-06 10:52:37 +08:00
RongHong 624e27497a fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 09:51:35 +08:00
laschweinski 91f8ed7eb4 CCParticleSystemPoint now derive from CCParticleSystemQuade in linux 2011-09-05 11:57:10 +08:00
laschweinski 1fc09448a4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort 
Conflicts:
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/include/CCActionInstant.h
 2011-09-04 14:38:53 +08:00
Walzer 9f1e26f8a0 fixed #700, a stupid typo in CC_SWAP32 marco 2011-08-30 15:20:41 +08:00
minggo b38105a70b issue 675: dispatch accelerometer data to one delegate 2011-08-29 18:18:39 +08:00
minggo a411f4877c fixed #698:Not invoke init() in the construction of CCSprite 2011-08-29 11:00:31 +08:00
laschweinski 606c8803bc modified: CocosDenshion/Linux/FmodAudioPlayer.cpp 
modified:   CocosDenshion/Linux/FmodAudioPlayer.h
	deleted:    HelloWorld/AppDelegate.cpp
	deleted:    HelloWorld/AppDelegate.h
	deleted:    HelloWorld/HelloWorldScene.cpp
	deleted:    HelloWorld/HelloWorldScene.h
	modified:   cocos2dx/.cproject
	modified:   cocos2dx/actions/CCActionInstant.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   lib/android/Debug/libcocos2d.so
	modified:   lib/android/Release/libcocos2d.so
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Debug/libcocosdenshion.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   lib/linux/Release/libcocosdenshion.so
	HelloWorld/AndroidDebug/
	HelloWorld/AndroidRelease/
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
	tests/Res/gui_close.WAV
 2011-08-25 19:04:29 +08:00
minggo 952a01f43e fixed #672: implement copywithzone for CCShow & CCHide 2011-08-24 14:21:23 +08:00
root 11679d9723 Merge branch 'master' into LinuxPort 2011-08-23 11:49:46 +08:00
minggo cd4a08aa6a Merge pull request #479 from minggo/iss678 
fixed #679: add constructor for CCArray
 2011-08-21 20:14:06 -07:00
moadib 807ae36d6a CCMutableArray optimization 2011-08-20 01:30:33 +04:00
minggo 1f9f1f59d4 fixed #679: add constructor for CCArray 2011-08-19 16:15:06 +08:00
laschweinski 871abb4a32 Merge branch 'master' into LinuxPort 2011-08-19 13:20:23 +08:00
Phenix Yu ed42bc388c fixed lua memory leak 2011-08-18 12:26:33 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
minggo e39d551294 fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed 2011-08-17 15:00:32 +08:00
laschweinski 5d20ebe24b modified: HelloWorld/AppDelegate.cpp 
modified:   HelloWorld/HelloWorldScene.cpp
	modified:   cocos2dx/cocoa/CCNS.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   cocos2dx/misc_nodes/CCRenderTexture.cpp
	modified:   cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	modified:   cocos2dx/platform/CCAccelerometer_platform.h
	modified:   cocos2dx/platform/CCApplication_platform.h
	modified:   cocos2dx/platform/CCArchOptimalParticleSystem.h
	modified:   cocos2dx/platform/CCCommon.cpp
	modified:   cocos2dx/platform/CCEGLView_platform.h
	modified:   cocos2dx/platform/CCGL.cpp
	modified:   cocos2dx/platform/CCGL.h
	modified:   cocos2dx/platform/CCImage.cpp
	modified:   cocos2dx/platform/CCPlatformConfig.h
	modified:   cocos2dx/platform/CCPlatformMacros.h
	modified:   cocos2dx/platform/CCSAXParser.h
	modified:   cocos2dx/platform/CCStdC.h
	modified:   cocos2dx/support/CCUserDefault.cpp
	modified:   cocos2dx/support/data_support/ccCArray.h
	modified:   tests/AppDelegate.cpp
	deleted:    tests/Res/music.mid
	modified:   tests/tests/controller.cpp
	modified:   tests/tests/tests.h
	HelloWorld/Linux/
	cocos2dx/.settings/
	cocos2dx/platform/Linux/
	tests/test.linux/
 2011-08-17 11:36:54 +08:00
Walzer 3afe6ebfb2 fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work. 2011-08-16 11:56:17 +08:00
Walzer 0881668cc2 fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well 2011-08-15 12:10:11 +08:00
minggo 2b5635898a fixed #665: add test of RenderTextureSave 2011-08-08 14:06:03 +08:00
Walzer 976d886263 Merge pull request #455 from giom/master 
Lua AddSearchPath issue #647
 2011-08-05 18:43:44 -07:00
minggo 2d5a04b9ca Merge pull request #454 from flyingpacer/608 
fixed #608 rendertexture disappears after going to background
 2011-08-04 23:55:26 -07:00
minggo dd43f16c8e fixed #622: add comment of CCUserDefault 2011-08-05 11:02:42 +08:00
RongHong 5f08bb24fe Merge branch 'master' into 608 2011-08-05 10:59:40 +08:00
minggo 6892787afa fixed #653: add CCScheduler::unscheduleScriptFunc() 2011-08-03 14:15:35 +08:00
minggo b9374663cd Merge pull request #440 from flyingpacer/savecrash 
fixed #649 the user could save any domain of the render texture
 2011-08-02 03:16:20 -07:00
minggo 09dc164fff issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00
RongHong 3a3a52c59a fixed #649 the user could save any domain of the render texture 2011-08-02 14:25:58 +08:00
minggo 730ff63c9f rename scene to node 2011-08-02 14:09:23 +08:00
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