dumganhar
|
ea0fb47f98
|
Merge branch 'master' into moveSel2CCObject
|
2012-01-17 09:37:31 +08:00 |
gzito
|
c87881ff94
|
Added Marmalade support to TextInputTest and HelloLua samples
|
2012-01-15 15:57:10 +01:00 |
minggo
|
cfe02e39ef
|
Broken include guard in CCActionEase.h
|
2012-01-12 17:06:46 +08:00 |
minggo
|
75216ac9ca
|
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
|
2012-01-11 16:54:14 +08:00 |
dumganhar
|
d61f87ba92
|
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
|
2012-01-09 23:21:31 +08:00 |
dumganhar
|
a773e4fb96
|
move SelectorProtocol to CCObject
|
2012-01-08 21:03:16 +08:00 |
minggo
|
f776ecc7e0
|
Merge pull request #650 from dumganhar/issue#934_add_isEqual
Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
|
2011-12-30 18:18:39 -08:00 |
dumganhar
|
8c65786dce
|
fixed #934: Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
|
2011-12-31 10:10:41 +08:00 |
minggo
|
53fae04ba8
|
fixed #752: make add/remove touch delegate in menu callback function correctly
|
2011-12-30 15:43:36 +08:00 |
minggo
|
fcb2294e20
|
fixed #926: subclass should retain/release when dynamic_cast fail.
|
2011-12-28 14:47:54 +08:00 |
minggo
|
37915cfed6
|
remove unneeded function, and make protocol an abstract class
|
2011-12-28 14:46:49 +08:00 |
YuLei Liao
|
bbad5a4392
|
* merge upstream/master to master
|
2011-12-25 11:48:03 +08:00 |
minggo
|
bb4b1d02bb
|
Merge pull request #608 from GMTDev/patch-2
issue #903: Update CCTouch to include the ID/PID of the touch
|
2011-12-20 21:48:30 -08:00 |
GavT
|
36f8e43dd8
|
Update cocos2dx/include/CCTouch.h
|
2011-12-20 20:40:48 -08:00 |
minggo
|
01cf5793ad
|
fixed #922: rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
|
2011-12-20 14:59:15 +08:00 |
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 |