James Chen
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
Walzer
9eab0c19f8
add groups to all classes for doxygen
2012-06-20 18:09:11 +08:00
James Chen
24e3ec7499
fixed #1336 : Updated comment information for deprecated apis.
2012-06-20 14:31:36 +08:00
James Chen
b818c0afa6
fixed #1336 : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
2012-06-20 11:48:31 +08:00
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
minggo
9ec29d715a
issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx
2012-06-19 13:50:11 +08:00
James Chen
595a402c83
fixed #1292:make some function names more readable.
2012-06-15 16:47:30 +08:00
minggo
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00
James Chen
052d8ea931
fixed #1324 : Added some create methods. Compiling successfully on win32 by vs2008.
2012-06-14 18:32:44 +08:00
James Chen
3a410c14a1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create
...
Conflicts:
cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
cocos2dx/label_nodes/CCLabelBMFont.cpp
cocos2dx/menu_nodes/CCMenuItem.cpp
cocos2dx/menu_nodes/CCMenuItem.h
cocos2dx/misc_nodes/CCRenderTexture.h
cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
tests/tests/LabelTest/LabelTest.cpp
2012-06-14 17:36:31 +08:00
James Chen
7fe3f7357e
issue #1324 : Reverted old interfaces.
2012-06-14 17:18:05 +08:00
James Chen
23574172ff
issue #1324 : Added create() for static member functions that new an autorelease object, updated cocoa folder.
2012-06-14 16:05:58 +08:00
James Chen
3f7b44fc23
issue #1324 : Added create() for static member functions that new an autorelease object
2012-06-14 15:13:16 +08:00
Nicolas Gramlich
58b53be708
Merge with gles20.
2012-06-11 11:50:32 -07:00
Nicolas Gramlich
4378731418
Merge with gles20.
2012-06-11 10:43:07 -07:00
James Chen
76a560a474
issue #1310 : Made CCFileUtils as a singleton.
2012-06-08 16:22:57 +08:00
James Chen
fd2d9a8aa6
issue #1310 : Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'.
2012-06-08 14:50:41 +08:00
James Chen
734ea54aba
fixed #1302 : The parameter of CCMenu::setHandlerPriority should be signed int.
2012-06-06 15:16:02 +08:00
Nicolas Gramlich
40f1ffe5fb
CCMenuItem(Image): Added possibility to init without any image. (Changes according to: 5e8518eaed78a6c589bf73dadf85e2056f834f36, 013b4cec0a9250268b131105795e87d37cba4d52)
2012-05-31 17:04:53 -07:00
James Chen
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
James Chen
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
minggo
b43d5aa654
fixed #1156 syn CCDirector
2012-04-13 14:11:35 +08:00
James Chen
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
James Chen
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
James Chen
6c01009a18
fixed #986 : Add init() member funciton of CCMenu class.
2012-02-29 10:07:18 +08:00
YuLei Liao
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
YuLei Liao
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
YuLei Liao
9164e90515
* fix some issues
2012-02-02 15:58:10 +08:00
YuLei Liao
1dd0330351
* add CCMenuItem script support
2012-02-02 10:39:36 +08:00
YuLei Liao
9bdde0cb82
* remove script support
2012-02-01 16:45:23 +08:00
minggo
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00
dumganhar
f44b38eaf8
fixed #958 : move the implement of SelectorProtocol to CCObject
2012-01-30 15:31:59 +08:00
dumganhar
49b57569c9
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-28 14:38:44 +08:00
dumganhar
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +08:00
minggo
4bffaaf9cb
fixed #936 : check whether selector is valid
2012-01-04 10:58:20 +08:00
minggo
cdc842051f
issue #892 : use RTTI to simplify codes, work ok on win32
2011-12-07 14:28:22 +08:00
dumganhar
d108f4f456
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-28 23:13:02 +08:00
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
dumganhar
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
minggo
efa9275d7f
save the codes for testing
2011-11-21 12:04:21 +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
minggo
61f2ab3cf2
fixed #718 : fixed a typo error
2011-09-15 13:49:04 +08:00
minggo
bdb7cfdd71
fixed #715 : make sure selected image is valid
2011-09-13 14:29:15 +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
78642a39ac
[android] fixed #652 : refactor JniHelper::jstringtochar()
2011-08-03 10:44:39 +08:00
minggo
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
natural-law
d6221cfa36
Use the setter to set the value of m_tAnchorPoint.
2011-08-02 11:02:02 +08:00
Leon
a8e4d5ea89
rename CCMenu::menu() -> CCMenu::node()
2011-07-28 14:24:24 +08:00
Leon
4510101e96
add CCMenu::init() and CCMenu::menu() to create empty menus
2011-07-28 10:45:32 +08:00
Leon
c5f7036f7b
add CCMenuItem::setTarget
2011-07-26 18:41:58 +08:00
minggo
7a12bb9cdc
fixed #613 : Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate()
2011-07-18 10:31:41 +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
natural-law
810cf3f8c3
fixed #591
2011-07-08 15:02:46 +08:00
natural-law
134a3a0fcf
fixed #590
2011-07-08 14:32:09 +08:00
minggo
8478288e88
fixed #iss559
2011-07-04 14:47:32 +08:00
minggo
00cc1d277d
fixed #528 : safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx()
2011-06-21 16:59:17 +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
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
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
02774dd963
fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite.
2011-05-19 17:00:13 +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
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
minggo
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
natural-law
0d2d746aec
Fix bugs.Run tests in cocos2d-uphone successful.
2011-01-05 17:01:08 +08:00
natural-law
1b37dd27ad
Fix bugs.Run HelloWorld successful.
2011-01-05 11:24:52 +08:00
natural-law
711f3a2906
modify YES to true,and No to false.
2010-12-31 17:56:46 +08:00
natural-law
6ee16ce878
update menu_nodes to 0.99.5
2010-12-25 11:15:19 +08:00
natural-law
4a64f899fe
update label_nodes to 0.99.5.
2010-12-24 17:07:31 +08:00
natural-law
0f0a8ed956
rename the files related to label_nodes.
2010-12-24 14:00:49 +08:00
natural-law
4a765d33a3
rename the CCXXXAction files to CCActionXXX.
2010-12-22 15:15:04 +08:00
natural-law
ff4a9e42fd
fixed #217
2010-11-23 13:41:10 +08: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
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
Walzer
94806c9194
merge with tag/0.99.4-uphone-0.9.0
2010-11-11 03:18:58 +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
Ming
105c1d4ab6
issue #61 :
2010-09-06 10:01:50 +00:00
Ming
7131389535
issue #61 :
2010-09-06 05:52:57 +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
d9e1134840
issue #61 : should retain in void to memory leak
2010-09-03 10:00:09 +00:00
Ming
857595d644
issue #116
2010-09-02 08:46:25 +00:00
Ming
59afd38192
issue #116 : remove __super
2010-09-02 06:54:42 +00:00
Walzer
8cb49d0a8f
issue #114 , CCTMXTiledMap debug
2010-09-01 08:23:30 +00:00
Ming
c293bd456f
issue #85 : remove the use of static_cast()
2010-08-31 03:23:54 +00:00
Ming
39c6ebf503
issue #85:remove the using of dynamic_cast()
2010-08-31 03:20:37 +00:00