James Chen
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
James Chen
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
James Chen
2885664c85
fixed #1136 : Fixed some bugs as follows:
...
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
2012-04-10 17:17:24 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
James Chen
c5d0b1ca6f
issue #1056 : Updated ParticleTest.
2012-03-22 18:29:07 +08:00
minggo
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
minggo
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
James Chen
ae2b3307fa
Merge pull request #779 from dumganhar/iss1056_CCDict
...
issue #1056 : Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 00:07:58 -07: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
minggo
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +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
James Chen
f8ff388e8d
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
...
test ok on win32 and android
2012-02-14 18:04:56 +08:00
James Chen
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
James Chen
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
dumganhar
57eee38f4e
Merge branch 'master' into moveSel2CCObject
2012-01-19 15:46:31 +08:00
gzito
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
dumganhar
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +08:00
styck
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -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
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
reflog
ae945f4880
changes to support CCScrollLayer
2011-07-28 17:09:06 +03: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
7adb140439
fixed #568
2011-07-05 14:51:17 +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
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
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
yangws
323c065934
make test can compile on wophone and airplay.
2011-04-28 10:31:51 +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
minggo
22b55eaf78
issue #418 : add copyright of original author to each file
2011-03-19 10:59:01 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +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
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +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
46e78ab7a1
update layers_scenes_transition_nodes to 0.99.5.
2010-12-25 18:07:34 +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
Leon
96f4f5c9fd
fix some compiling warning for iOS
2010-12-17 23:44:19 +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
000bdeeb42
issue #189
...
add support of Accelerometer sensor
2010-11-10 08:29:52 +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
natural-law
4b529493fc
fixed #110
...
add ParallaxTest code
2010-09-01 06:57:55 +00:00
natural-law
6e7fede2bb
fixed #103
...
add ActionManager Test code
2010-08-30 07:04:46 +00:00
natural-law
82f316a247
issue #78
...
modify Particle Test code
2010-08-26 03:39:26 +00:00
natural-law
b47d47b3b5
fixed #93
...
add DrawPrimitives Test code
2010-08-26 02:53:49 +00:00
Ming
7291056154
fixed #86
2010-08-25 09:21:38 +00:00
Walzer
96a1e4f5ec
2010-08-25 03:18:59 +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
yangws
d6597735fc
write "helloworld" code in one file
2010-08-05 10:58:38 +00:00
Walzer
14427a24d7
2010-08-04 07:46:12 +00:00
Ming
a324e38cb2
issue #21 : change INT32 to int, change UINT to unsigned int
2010-08-02 02:58:00 +00:00
Ming
b6dd87fb64
issue #6 : fix some compile error
2010-07-27 07:49:39 +00:00
Ming
4160abc669
issue #6 : fixed compile error because some file is deleted
2010-07-26 02:35:45 +00:00
Ming
dffa1cd731
issue #2 : change including header file because we change the path of CocosTypes.h
2010-07-08 04:02:18 +00:00
Walzer
97d6aaf296
issue #2 , add link to website at each file header
2010-07-06 12:55:05 +00:00
Ming
dafe99ca70
issue #2 : move to folder cocos2dx
2010-07-06 08:28:41 +00:00