Rolando Abarca
4e640ecb35
uses new ADD_OBJECT_TYPE macro
2012-08-27 08:43:37 -07:00
mustime
1a55b7c5ba
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381
2012-07-27 18:29:57 +08:00
mustime
9949a34669
issue 1381: change setContentSize(CCSize size) to setContentSize(const
...
CCsize & size) in CCNode
2012-07-27 16:57:56 +08:00
minggo
16c469fa4e
Merge pull request #1127 from mustime/bug1381
...
issue #1381 : change the setContentSize interface in the subclasses of CCNode
2012-07-25 21:39:44 -07:00
mustime
9ad241c8f8
issue #1381 : change the setContentSize interface in the subclasses of
...
CCNode
2012-07-26 12:03:37 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
mustime
50289655a5
fixed #1381 : fixed different declaration on CCLayerColor::setContentSize
2012-07-10 09:13:49 +08:00
James Chen
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +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
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
James Chen
fd2d9a8aa6
issue #1310 : Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'.
2012-06-08 14:50:41 +08:00
James Chen
ad50d6ee57
fixed #1270 : Fixed some warning on win32.
2012-05-29 17:11:33 +08:00
minggo
5388e9c863
fixed #1232 : don't do type cast
2012-05-07 17:15:32 +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
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
minggo
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +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
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +08:00
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
minggo
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +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
32ec256ffb
* add Touch event script support
2012-02-02 10:38:26 +08:00
YuLei Liao
9bdde0cb82
* remove script support
2012-02-01 16:45:23 +08:00
minggo
75216ac9ca
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 16:54:14 +08:00
minggo
cdc842051f
issue #892 : use RTTI to simplify codes, work ok on win32
2011-12-07 14:28:22 +08:00
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
minggo
f61fde764b
fixed #703 : refactor Accelerometer
2011-08-31 17:14:29 +08:00
minggo
b38105a70b
issue 675: dispatch accelerometer data to one delegate
2011-08-29 18:18:39 +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
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
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
minggo
59ed71df03
Merge pull request #353 from minggo/master
...
upgrade to 1.0.0-rc3
2011-07-06 00:02:45 -07:00
minggo
ff50997eb0
issue #574
2011-07-06 14:56:05 +08:00
Walzer
ac700583cc
fixed #573 , init m_tColor & m_tBlendFunc in CCLayerColor constructor
2011-07-05 15:39:50 +08:00
natural-law
4d5dab4a40
fixed #558 , Upgrade folder layers_scenes_transitions_nodes to rc3.
2011-07-01 11:26:26 +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
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
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
01cd90f2cc
update layers_scenes_transition_nodes to 0.99.5.
2010-12-27 09:40:45 +08:00
natural-law
2706e3a003
fixed #251 CCKeypadDelegate implement
2010-12-13 14:10:39 +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
natural-law
2b23e0f6d5
debug
2010-11-18 10:27:05 +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
natural-law
000bdeeb42
issue #189
...
add support of Accelerometer sensor
2010-11-10 08:29:52 +00:00
Walzer
ed4e288f27
modify the logic of "node" method
2010-10-01 15:04:12 +00:00
natural-law
6bd7d28e06
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-16 09:19:18 +00:00
Walzer
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
Ming
9a12e848f5
fixed #118
2010-09-03 01:32:13 +00:00
Ming
59afd38192
issue #116 : remove __super
2010-09-02 06:54:42 +00:00
Ming
39c6ebf503
issue #85:remove the using of dynamic_cast()
2010-08-31 03:20:37 +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
Ming
710e29b086
issue #80
2010-08-25 02:19:20 +00:00
Walzer
9703e75e57
issue #18 , debug
2010-08-19 06:09:40 +00:00
Walzer
b4543ef6f1
issue #5 , implement CCLayer::onEnter, CCLayer::onExit
2010-08-05 10:07:14 +00:00
Walzer
14427a24d7
2010-08-04 07:46:12 +00:00
Walzer
03df28e28a
issue #18 , debug
2010-08-03 06:50:41 +00:00
Walzer
db49ed49b9
issue #18 , debug
2010-08-03 03:28:34 +00:00
Ming
a324e38cb2
issue #21 : change INT32 to int, change UINT to unsigned int
2010-08-02 02:58:00 +00:00
Walzer
458ca18148
issue #5 , implement
2010-07-30 09:18:20 +00:00
Walzer
88ce1c8f83
issue #7 , implement
2010-07-30 08:35:07 +00:00
yangws
f12d51f7ae
fixed #14 impliment CCTouch and treate touch msg in CCXEGLView EventHandler.
2010-07-29 04:12:11 +00:00
Walzer
59c7a734ba
issue #7 , implement .cpp
2010-07-21 09:40:10 +00:00
Walzer
adbf70a033
issue #7 , implement .cpp
2010-07-21 03:13:32 +00:00
Walzer
63b87af767
issue #7 : add CCTexture2D.h and implement CCTexture2D.cpp partly
2010-07-15 10:15:00 +00:00
Walzer
df8150582c
issue #5 : implement a part of the methods in .cpp
2010-07-14 08:30:25 +00:00
Walzer
1c2b95973d
issue #5 , add declares in .cpp files, but still no implementation. change some methods to virtual.
2010-07-12 09:56:06 +00:00
Walzer
fdcbafda0f
issue #5 , add CCLayer.h, add @todo
2010-07-09 03:26:56 +00:00