minggo
6277e59b21
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1179_CCAssert
2012-04-20 15:12:46 +08:00
minggo
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
minggo
0589faee17
Merge pull request #857 from minggo/iss1180_CCConfiguration
...
synchronize CCConfiguration
2012-04-19 21:43:36 -07:00
minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
minggo
cbfca9d763
add execution permission
2012-04-20 10:54:58 +08:00
minggo
de0ad0dca3
Merge pull request #856 from dumganhar/iss1176_refactor
...
fixed #1176 : Change linebreak symbol to UNIX format ('\n'),replace 'tab' with four spaces. Other changes as follows:
2012-04-19 19:31:25 -07:00
James Chen
dbeb7423ad
Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor
2012-04-19 17:53:15 +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
4e4a26a2db
Merge pull request #855 from minggo/iss1150_rendertexture_crash
...
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 02:05:04 -07:00
minggo
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +08:00
James Chen
e28c77b574
issue #1176 : Updated ios project configuration.
2012-04-19 15:26:24 +08:00
James Chen
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +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
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
James Chen
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
James Chen
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
James Chen
a950238d1e
updated some files.
2012-04-18 18:45:21 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
5af2dded9c
Merge pull request #851 from dumganhar/iss1114_CCControlExt
...
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Some other changes as follows:
1. Exported some global variables of ccShader, e.g. ccPosition_uColor_frag
2. Added ShaderBlur test.
3. Added some resource files.
2012-04-17 23:20:41 -07:00
James Chen
42007ea71c
deleted some unused codes.
2012-04-18 14:15:11 +08:00
James Chen
e673bfae90
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.
2012-04-18 13:58:24 +08:00
James Chen
c501255a7a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt
2012-04-18 09:40:08 +08:00
James Chen
f8dfe1fca0
issue #1114 : Updated ShaderTest.Added ShaderBlur.
2012-04-17 18:31:31 +08:00
minggo
3f9e5822fd
Merge pull request #850 from minggo/iss1139_screen_black
...
fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 03:07:05 -07:00
minggo
4d2e2d7183
fixed #1139 : remove unneeded codes
2012-04-17 18:03:48 +08:00
minggo
7750664f8b
fixed #1139 : re add preprocess macro
2012-04-17 18:01:15 +08:00
minggo
cfdc5edf87
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black
2012-04-17 17:55:59 +08:00
minggo
04c0d794af
fixed #1139 : fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 17:55:26 +08:00
James Chen
613ec741b8
Merge pull request #849 from dumganhar/iss1114_CCControlExt
...
issue #1114 : Integrate CCControlExtension and implement corresponding tests.
2012-04-17 02:30:36 -07:00
James Chen
74690603cf
issue #1114 : Updated AUTHORS file.
2012-04-17 17:27:49 +08:00
James Chen
75da752aa9
issue #1114 : fixed some memory leaks in CCControlExtension.
2012-04-17 17:14:59 +08:00
James Chen
14c10a470a
Updated project configuration for android platform.
2012-04-17 16:41:07 +08:00
James Chen
a215b037b2
fixed a bug in CCControlSwitch.cpp
2012-04-17 16:39:00 +08:00
James Chen
5ce950b961
fixed a memory leak in CCControl.
2012-04-17 16:37:04 +08:00
James Chen
0848e94efb
Updated HelloWorld project configuration for ios platform.
2012-04-17 16:20:35 +08:00
James Chen
92e44f1c78
Updated ios project configuration.
2012-04-17 16:14:32 +08:00
James Chen
413bc3c343
Finished CCControlSwitch.Added CCActionTween.
2012-04-17 16:00:18 +08:00
James Chen
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
James Chen
f5d640e3a7
Merge branch 'gles20_tmp' of https://github.com/dumganhar/cocos2d-x into gles20_tmp
...
Conflicts:
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlScene.h
tests/tests/ExtensionsTest/ExtensionsTest.cpp
2012-04-16 23:21:14 +08:00
James Chen
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
James Chen
ac6e263621
Updated CCControlExtension
2012-04-16 21:51:06 +08:00
James Chen
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
James Chen
1fe71210ed
Merge pull request #845 from dumganhar/gles20_optimize_data
...
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 00:59:56 -07:00
James Chen
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
James Chen
381b764da5
Merge pull request #844 from dumganhar/gles20_optimize_data
...
issue #1166 : Improve CCString and CCArray, optimize CCDictionary.
2012-04-16 00:01:18 -07:00
James Chen
0af443a56f
issue #1166 : Checked whether memory is allocated successfully in CCString::initWithFormatAndValist function.
2012-04-16 14:27:49 +08:00
James Chen
be129913a8
issue #1166 : Updated the project configuration for VS2010, android, ios port.
2012-04-16 13:02:44 +08:00
James Chen
a71e5be0d8
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
...
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
2012-04-16 12:45:47 +08:00
James Chen
3a7fed9089
Merge pull request #843 from dumganhar/iss1165_gles20_jbyu
...
fixed #1165 : merged pull request 842
add project for ios
fixed memory leak in CCGLProgram
add pixel format I8 in CCTexture2D
update Director.pkg for LuaCocos2d
2012-04-15 21:04:19 -07:00