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
e2a1a246a0
Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files.
2012-06-13 14:26:28 -07: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
12a9d13443
issue #1310 : Synchronize to RC2, HelloWorld works ok on win32.
2012-06-08 16:54:38 +08:00
James Chen
76a560a474
issue #1310 : Made CCFileUtils as a singleton.
2012-06-08 16:22:57 +08:00
James Chen
c8dfe7f92b
issue #1310 : Finished CCRenderTexture.h(.cpp).
2012-06-08 14:30:55 +08:00
James Chen
26cf81e42e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/CCScheduler.h
cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen
c5cf23c859
issue #1310 : First commit since sync to rc2.
2012-06-08 14:11:48 +08:00
minggo
cc16320445
issue #1310 : syncronize actions
2012-06-08 13:55:28 +08:00
James Chen
4b7f9f582f
fixed #1297 : fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().
2012-06-06 15:56:55 +08:00
James Chen
6bb2941ec9
fixed #1300 : Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
2012-06-06 10:06:51 +08:00
Walzer
1e732930b7
fixed #1258 , testjs and spidermonkey-ios is merged. But only test_actions.js works.
2012-05-24 17:48:05 +08:00
James Chen
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08: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
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
James Chen
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
James Chen
f619c3e006
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor
...
Conflicts:
cocos2dx/misc_nodes/CCRenderTexture.cpp
2012-04-19 17:51:58 +08:00
minggo
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +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
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
minggo
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +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
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
James Chen
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +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
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
Leon
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
minggo
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
RongHong
53227073a7
fixed #696 to modify some end() usilization
2011-09-06 11:43:09 +08:00
RongHong
fea3da3156
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
2011-09-06 11:33:48 +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
871abb4a32
Merge branch 'master' into LinuxPort
2011-08-19 13:20:23 +08:00
laschweinski
ad305648c0
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
...
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
CocosDenshion/Linux/
CocosDenshion/third_party/
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-19 13:07:50 +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
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
minggo
2b5635898a
fixed #665 : add test of RenderTextureSave
2011-08-08 14:06:03 +08:00
RongHong
5f08bb24fe
Merge branch 'master' into 608
2011-08-05 10:59:40 +08:00
natural-law
3a80e51d25
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-03 11:39:03 +08:00
natural-law
94f2d8a5e2
fixed #513 , CCProgressTimer support sprite generated from CCSpriteFrame.
2011-08-03 11:38:38 +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
RongHong
4a8e3f468e
fixed #649 the user could save any domain of the render texture
2011-08-02 17:22:57 +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
9fe868b881
Merge pull request #438 from natural-law/master
...
Use the setter to set the value of m_tAnchorPoint.
2011-08-01 21:39:43 -07:00
natural-law
d6221cfa36
Use the setter to set the value of m_tAnchorPoint.
2011-08-02 11:02:02 +08:00
RongHong
d575d40ab3
fixed #648 savebuffer may crash on some machines like Motorola Defy
2011-08-02 10:27:52 +08:00
RongHong
335d2d30b4
fixed #648 savebuffer may crash on some machines like Motorola Defy
2011-08-02 10:05:15 +08:00
RongHong
a54fda812b
fixed #641 the user could save buffer to any path
2011-07-29 11:36:04 +08:00
RongHong
c7aa948817
fixed #640 the image read from render texture is upseted
2011-07-28 18:02:25 +08:00
RongHong
c1fdf9afb5
issue #608 rendertexture disappears after going to background
2011-07-28 17:32:09 +08:00
RongHong
0f94423b9b
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:52:09 +08:00
RongHong
eda6228374
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:09:56 +08:00
RongHong
a253909030
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-27 16:55:04 +08:00
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
minggo
f894e00f27
fix a bug of CCProgressTimer when upgrade to rc3
2011-07-06 16:29:56 +08:00
minggo
7adb140439
fixed #568
2011-07-05 14:51:17 +08:00
minggo
6b97a381e9
fixed #560 : upgrade misc_nodes to 1.0.0-rc3
2011-07-04 16:01:57 +08:00
liswei
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +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
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
yangws
be966dbddb
fixed #430 Solved bug by replacing glColor4ub with glColor4f.
2011-03-25 13:50:57 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +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
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +08:00
natural-law
e0570d43ad
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
2011-01-06 14:04:03 +08:00
minggo
d0a16a246e
fixed comipling error and link error of upto-0.99.5
2010-12-31 14:56:24 +08:00
yangws
c142070c2c
misc_node upto-0.99.5.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-25 15:09:42 +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
Ming
416a319344
fixed #203
2010-11-13 03:34:49 +00:00
Ming
64ac386384
issue #202
2010-11-12 09:29:14 +00:00
Walzer
94806c9194
merge with tag/0.99.4-uphone-0.9.0
2010-11-11 03:18:58 +00:00
Ming
6853385c8d
resolve compile error for android
2010-11-03 02:59:07 +00:00
yangws
8900e0644c
helloworld-win32 vertical screen ok.
2010-10-09 09:41:42 +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
12d6df9717
issue #154
2010-09-24 10:10:32 +00:00
Ming
9cab8be0ff
issue #138
2010-09-09 09:24:55 +00:00
Walzer
907fb3f692
issue #126 , add retain when member variable is changed
2010-09-06 02:27:38 +00:00
Walzer
4226dcede9
issue #61 , add retain for member variable
2010-09-04 10:06:26 +00:00
Ming
ae3f178c7b
issue #61 :
2010-09-04 07:10:41 +00:00
Ming
0ee9e5fd0b
issue #61 :
2010-09-04 06:13:48 +00:00
Walzer
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
Ming
ed3909c9e4
issue #116 : remove the using of sprintf_s, because it is VC specific
2010-09-03 03:15:46 +00:00
Ming
ed023fc129
fixed #112
2010-09-01 07:36:25 +00:00
Walzer
3d91d1e58d
update to uphone-sdk-2010.08.26, which adds opengl headers
2010-08-31 08:53:25 +00:00
Ming
7291056154
fixed #86
2010-08-25 09:21:38 +00:00
Ming
82a39c917f
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:40:02 +00:00
Ming
710e29b086
issue #80
2010-08-25 02:19:20 +00:00
Ming
ceba1ff961
issue #65 : add some missed codes
2010-08-21 05:53:24 +00:00
natural-law
6193087b0c
issue #65
...
add ProgressActions Test
2010-08-21 02:26:26 +00:00
Walzer
9703e75e57
issue #18 , debug
2010-08-19 06:09:40 +00:00
Walzer
a08b17b4aa
fixed #59 , complete CCMotionStreak
2010-08-19 05:37:39 +00:00
Walzer
584f558075
fixed #59 , complete CCMotionStreak
2010-08-19 02:14:54 +00:00
Walzer
59324a4a65
fixed #58 , complete CCRibbon, CCRibbonSegment
2010-08-18 09:56:59 +00:00
Walzer
1fd2128806
fixed #56 , CCRenderTexture
2010-08-18 07:15:02 +00:00
Ming
fa71e45ac0
issue #42 : implement CCProgressTimer
2010-08-11 10:15:52 +00:00