14a218c8cc
Merge pull request #922 from dumganhar/gles20
...
fixed #1240 : Added static libraries of tiff for android.
2012-05-28 01:07:08 -07:00
785c3c5d60
fixed 1240# : Added static libraries of tiff for android.
2012-05-28 16:05:52 +08:00
6e59d5eab4
fixed #1264 : CCLabelTTF: wrong string alignment when using utf-8 encoded text.
2012-05-28 14:27:32 +08:00
99dcb4de86
issue #1263 : Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments.
2012-05-28 14:14:19 +08:00
1b7cc47a34
issue #1263 : Removed unused files. Fixed an issue in uthash.h.
2012-05-28 13:59:18 +08:00
6c6fbeef8d
* fix async texture cache not working on IOS due to sem_open requirement
...
* allow semaphore to be unlinked and close no thread exit
* removed firstTry as it can now use s_pSem which is only set when the semaphore is successfully created. Had to move target->retain() under thread creation so we don't leak memory if semaphore fails.
2012-05-27 11:41:12 -07:00
b7746882f7
* add ability to disable denshion in lua mode
2012-05-27 11:03:45 -07:00
330b019361
Added jstest project for vs2008.
2012-05-27 22:53:48 +08:00
c902e884f4
fixed #1240 : Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.
2012-05-25 16:52:47 +08:00
6477a02022
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff
2012-05-25 11:00:20 +08:00
0b8a75e982
fixed #1240 : Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.
2012-05-25 10:58:28 +08:00
df98ed4792
Merge pull request #914 from walzer/gles20
...
javascript binding!
2012-05-24 03:48:14 -07:00
1e732930b7
fixed #1258 , testjs and spidermonkey-ios is merged. But only test_actions.js works.
2012-05-24 17:48:05 +08:00
c258e1e43a
fixed #1247 : add profile lib
2012-05-24 17:47:46 +08:00
e5443d22c1
issue #1240 : Added libtiff for android.
2012-05-24 12:00:06 +08:00
138de3171f
Merge pull request #912 from minggo/merge_nicolasgramlich
...
Merge pull request by nicolasgramlich
2012-05-23 19:56:05 -07:00
0ba62c3854
issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp
2012-05-24 10:48:39 +08:00
6a37158100
issue #1240 : Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format.
2012-05-23 18:20:51 +08:00
c2591f1e9e
issue #1240 : Added tiff support, run ok on win32. There is a 'FIXME' needed to be fixed.
2012-05-23 17:26:06 +08:00
ea48413d2d
fixed #1253 : Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak.
2012-05-23 12:11:53 +08:00
c7359ba1a0
fixed #1252 : Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.
2012-05-23 11:57:43 +08:00
d5f52335d5
fixed #1224 : Wrote some comments in CCParticleSystem.
2012-05-23 11:26:21 +08:00
f7ffdd757c
fixed #1244 : deleted unused method "release" of CCImage class.
2012-05-23 11:22:17 +08:00
d998b54269
fixed #1224 : Memory leak in CCParticleSystem::initWithDictionary()
2012-05-23 11:18:04 +08:00
d69bc23894
Initial version of CCBReader reading ccbi format. (Only reads and checks the header so far).
2012-05-22 17:38:33 -07:00
15ef23bac8
Removed assert which prevented CCSpriteBatchNode from being used as a root node. (Discussed this with Ricardo Quesada)
2012-05-21 17:38:24 -07:00
320b181dbf
CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF.
2012-05-21 17:20:47 -07:00
9ee1b32c26
Merge pull request #903 from walzer/gles20
...
add CCBReader_v2.cpp in vcproj & vcxproj
2012-05-21 02:58:59 -07:00
9ac0b68981
modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj.
2012-05-21 17:56:09 +08:00
683c91bbfa
fixed #1236 : return empty string when parameter is null
2012-05-16 14:17:37 +08:00
1d18c6607a
fixed #1237 : correct line number output by CCAssert
2012-05-16 14:10:27 +08:00
a3bd26a52b
modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk
2012-05-11 22:40:31 +08:00
d6dde5a5ee
move kBottomLeft series enum from CCNode.h to CCBReader.h
2012-05-11 21:10:02 +08:00
dc18dc0942
test ccb v2 format, add relative-position support
2012-05-11 20:53:30 +08:00
ae12434128
fixed #1205 , rename CCCustomClass to CCCustomClassProtocol, add windows support.
2012-05-08 11:30:08 +08:00
f10b94fd15
issue #1205 , CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported.
2012-05-07 22:52:58 +08:00
a91032ccb5
Merge commit 'e895a2a1e8109381329d7cd8e29c780b73643351' into gles20
2012-05-07 18:15:16 +08:00
1a73064055
issue #1205 , refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android
2012-05-07 18:14:15 +08:00
5388e9c863
fixed #1232 : don't do type cast
2012-05-07 17:15:32 +08:00
c76e3c0936
remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.
2012-05-07 17:05:17 +08:00
ff6abd1d8c
fixed #1230 : fix a bug in calculating string width
2012-05-07 10:15:57 +08:00
07276c3bba
Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20
2012-05-05 15:49:11 +08:00
184b31efa3
fix compilation warnings on android & ios
2012-05-05 10:44:42 +08:00
6b374881f0
Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20
2012-05-05 10:07:21 +08:00
f70855e959
fixed #1229 , reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.
2012-05-05 10:06:41 +08:00
be2fa353a7
Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20
2012-05-05 09:55:06 +08:00
1afd7f2701
Merge pull request #893 from minggo/iss1217_EaseAction_reverse
...
Iss1217 ease action reverse
2012-05-04 01:26:56 -07:00
14b923409a
fixed #1217 : implement reverse() for all subclass of CCEaseAction that missing it
2012-05-04 16:22:50 +08:00
bf0da624b4
issue #1191 : Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.
2012-05-04 11:16:57 +08:00
47b8148064
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template
2012-05-04 02:08:31 +08:00
27b5fb8074
merge commit of issue 1216
2012-05-03 16:30:13 +08:00
a584aee897
issue #1205 update license declaration
2012-05-03 15:33:22 +08:00
ebaf1da460
issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent.
2012-05-03 15:29:27 +08:00
7cdb11b668
fixed #1215 : fixed a bug in retina support for win32.
2012-05-03 15:05:19 +08:00
2fc1322cc8
update copyright and license declaration of CCCBReader relative files
2012-05-03 14:43:27 +08:00
5faaab0d16
add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor
2012-05-03 12:17:28 +08:00
160b0aba88
Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20
2012-05-03 12:02:13 +08:00
9e62412ce9
issue #1205 , add CCBReader, CppReflection, CocosBuilderTestCase
2012-05-03 11:58:53 +08:00
b6a1e89aa5
fixed #1211 : Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file.
2012-05-03 11:09:27 +08:00
82439733c5
fixed #1204 : Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest.
...
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
2012-05-03 10:12:00 +08:00
ca5ef69d50
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
2012-05-02 18:44:30 +08:00
4bcf67078d
fixed #1201 : add prebuilt libs
2012-05-02 18:37:37 +08:00
395dbc90aa
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
...
Conflicts:
lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
db92c9c1dc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 14:32:27 +08:00
a998062c57
issue #1194 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.
2012-05-02 12:04:27 +08:00
741f219f16
issue 1201: remove module to prebuilt
2012-05-02 10:45:21 +08:00
57d6884757
rename modules to prebuilt
2012-05-02 10:44:40 +08:00
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
de35aaa101
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 09:49:12 +08:00
cbfe1e0d0c
optimize CCTextureCache::removeUnusedCache()
2012-04-28 11:34:13 +08:00
9886f281ee
issue #1191 : Updated win32 project files.
2012-04-27 18:50:55 +08:00
c5f7f15090
issue #1194 : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.
2012-04-27 18:47:49 +08:00
a4e8c9ad17
fixed #931 : refactor CCImage and CCTexture2D
2012-04-27 18:37:11 +08:00
a1570e931f
issue #931:make convert to rgb565 and A8 correct
2012-04-27 15:53:29 +08:00
fd08f9852b
issue #1194 : Added some files refer to TextureWatcher.
2012-04-27 12:00:54 +08:00
2bffd3a565
issue #931 : dynamically allocate array(row_pointers) in CCImage::_initWithPngData.
2012-04-26 18:17:57 +08:00
602d34ec78
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-04-26 17:36:59 +08:00
7ecbd8ea6c
issue #931 : refactor CCImage and CCTexture2D
2012-04-26 17:36:32 +08:00
ceb5b122b0
fixed #1190 : closed CC_LUA_ENGINE_DEBUG by default.
2012-04-26 14:37:28 +08:00
f5ffe8249e
issue #1190 : Updated ios lua project.
2012-04-26 13:05:05 +08:00
8d63e9f1bd
issue #1190 : Updated some files for android port.
2012-04-26 11:52:21 +08:00
edfb8c1f9c
issue #1190 : used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.
2012-04-26 11:39:49 +08:00
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
a5f0bc3cbc
fixed #1189 : syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes
2012-04-25 18:08:23 +08:00
568bdce6c1
fixed #1188 : Removed some unused files.
2012-04-25 17:46:29 +08:00
8e5668472f
issue #1188 : Updated project configuration for ios platform.
2012-04-25 17:33:28 +08:00
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
e8b826b7a6
fixed #1187 : spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test.
2012-04-25 10:55:59 +08:00
062ae1756d
fixed #1177 : updated project configuration for android and ios platforms.
2012-04-24 17:35:36 +08:00
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
26763c200b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
...
Conflicts:
tests/proj.ios/test.xcodeproj/project.pbxproj
2012-04-24 15:44:53 +08:00
1e20f2b6db
fixed #1185 : reload image data and recreate buffer of object when backing to foreground
2012-04-24 15:02:18 +08:00
5e0682ed77
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
2012-04-23 15:41:01 +08:00
af86a52f27
issue #1177:Updated some files for ios port.
2012-04-23 15:40:46 +08:00
8fd3518160
issue #1177 : fixed a bug about retina in CCDirector.
2012-04-23 15:38:02 +08:00
5b77e6e80e
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
cocos2dx/platform/CCEGLViewProtocol.h
2012-04-23 14:39:27 +08:00
24515f009e
issue #1177 : Updated ios project configuration.
2012-04-23 14:35:41 +08:00
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
d1d0fd619a
issue #1177 : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.
2012-04-20 15:23:00 +08:00
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
dbeb7423ad
Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor
2012-04-19 17:53:15 +08:00
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
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
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +08:00
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +08:00
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
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
a950238d1e
updated some files.
2012-04-18 18:45:21 +08:00
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
e673bfae90
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.
2012-04-18 13:58:24 +08:00
c501255a7a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt
2012-04-18 09:40:08 +08:00
f8dfe1fca0
issue #1114 : Updated ShaderTest.Added ShaderBlur.
2012-04-17 18:31:31 +08:00
4d2e2d7183
fixed #1139 : remove unneeded codes
2012-04-17 18:03:48 +08:00
7750664f8b
fixed #1139 : re add preprocess macro
2012-04-17 18:01:15 +08:00
cfdc5edf87
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black
2012-04-17 17:55:59 +08:00
04c0d794af
fixed #1139 : fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 17:55:26 +08:00
75da752aa9
issue #1114 : fixed some memory leaks in CCControlExtension.
2012-04-17 17:14:59 +08:00
14c10a470a
Updated project configuration for android platform.
2012-04-17 16:41:07 +08:00
a215b037b2
fixed a bug in CCControlSwitch.cpp
2012-04-17 16:39:00 +08:00
5ce950b961
fixed a memory leak in CCControl.
2012-04-17 16:37:04 +08:00
92e44f1c78
Updated ios project configuration.
2012-04-17 16:14:32 +08:00
413bc3c343
Finished CCControlSwitch.Added CCActionTween.
2012-04-17 16:00:18 +08:00
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
0af443a56f
issue #1166 : Checked whether memory is allocated successfully in CCString::initWithFormatAndValist function.
2012-04-16 14:27:49 +08:00
be129913a8
issue #1166 : Updated the project configuration for VS2010, android, ios port.
2012-04-16 13:02:44 +08:00
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
88951bfeec
fixed #1165 : Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.
2012-04-16 12:00:35 +08:00
9ace0d2fdc
Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.
2012-04-16 10:57:37 +08:00
ebc7106164
Merge branch 'gles20' of https://github.com/jbyu/cocos2d-x into gles20
2012-04-15 15:46:16 +08:00
e623cd6357
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
5d9c44f897
add project for iOS
2012-04-14 18:19:30 +08:00
61a7ca71c5
fixed getContentSize pass by reference issue
...
update project setting for release mode
2012-04-14 17:13:38 +08:00
b780edde7a
By Default, we enable VAO support for ios and win32 and disable it for other platforms.
2012-04-13 18:18:47 +08:00
3c0653ffa7
fixed #1164 : 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad.
...
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
2012-04-13 17:24:50 +08:00
34c805590f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director
2012-04-13 14:11:58 +08:00
b43d5aa654
fixed #1156 syn CCDirector
2012-04-13 14:11:35 +08:00
94e056d964
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-13 14:09:02 +08:00
a20f3fe638
remove unneeded codes
2012-04-13 11:57:25 +08:00
9bbac0d33d
issue #1156 : remove unneeded macros and functions
2012-04-13 11:45:41 +08:00
f7a1807865
fixed #1158 : Fixed a bug in CCParticleSystemQuad.
...
We need to check whether need to free quads and delete vbo/vao in the destructor.
CCParticleSystemQuad::~CCParticleSystemQuad()
{
if (NULL == m_pBatchNode) // important
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
}
}
2012-04-13 11:40:56 +08:00
028cf7874e
issue #1156 : remove unneeded macros and functions
2012-04-13 11:22:17 +08:00
1ed6df9de8
add pixel format I8
2012-04-12 20:44:50 +08:00
247bf08d98
fixed content size issue for retina
2012-04-11 19:27:34 +08:00
ab8af9e04c
retina for win32
2012-04-11 16:41:12 +08:00
da76def60a
Fixed a heap crash in CCDirector, and reverted CCDirector singleton to global variable rather than a pointer.
2012-04-11 12:03:37 +08:00
b8e6d9c589
fixed memory leak from CCGLProgram.cpp
...
enable retina for win32
2012-04-11 11:15:53 +08:00
2b5af66974
updated win32 projects configuration release version.
2012-04-10 23:09:58 +08:00
6823704a46
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 18:17:08 +08:00
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
137679d369
Fixed a bug in CCFileUtils::dictionaryWithContentOfFile.
2012-04-10 16:32:53 +08:00
8271fdd95b
Initialize m_sString pointer.
2012-04-10 15:24:06 +08:00
22052db4bd
Fixed a memory leak in CCLabelBMFont.cpp.
2012-04-10 15:14:55 +08:00
5ad6c38500
Fixed two memory leaks in CCArray::copyWithZone and CCDictionary::copyWithZone.
2012-04-10 15:01:29 +08:00
6cd69523c8
Merge pull request #829 from dumganhar/iss1094_gles20_particlebat
...
issue #1094 : Make ParticleBatchNode works on win32 and fixed some issues as follows:
1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
2.fixed a memory leak in CCParticleSystem.
3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
4.Add CCAssert in ccArrayRemoveObjectAtIndex.
5.Use new method to allocate CCDirector.
2012-04-08 19:45:38 -07:00
b4d74700e4
Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
...
Conflicts:
tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
3d601048c6
Merge pull request #831 from dumganhar/new_ipad
...
fixed #1095 : IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.
2012-04-08 19:02:16 -07:00
baa27540a0
Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage.
2012-04-09 09:55:06 +08:00
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
4c61035231
return correct content size
2012-04-08 22:37:58 +08:00
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
75d6972da8
remove unneeded macros
2012-04-08 14:26:50 +08:00
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
4baebb8cab
issue #1094 : renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
...
fixed a memory leak in CCParticleSystem.
2012-04-08 12:50:15 +08:00
64665fe7c8
issue #1094 : Make ParticleBatchNode works on win32.
2012-04-07 12:02:40 +08:00
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
df58a09255
Update:
...
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
2012-04-05 18:53:53 +08:00
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
2b17a7276c
issue #1056 : Updated CCTextureAtlas.cpp
2012-03-29 14:33:50 +08:00
d7aed75942
issue #1056 : Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.
2012-03-29 14:30:13 +08:00
a0520d8f27
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 11:25:57 +08:00
56d5c496e9
issue #1056 : Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.
2012-03-29 11:25:08 +08:00
c759f29d76
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 10:11:42 +08:00
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
a626271b06
issue #1056 : Made setupVBO as CCTextureAtlas's member function.
2012-03-28 22:01:12 +08:00
bb7485621e
issue #1056 : Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
2012-03-28 21:44:28 +08:00
3d63f9c58e
issue #1056 : Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.
2012-03-28 17:51:26 +08:00
c73c84f79b
issue #1056 : Fixed a bug in CCDirector::setProjection.
...
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
2012-03-28 17:02:07 +08:00
394bb24cf5
issue #1056 : Reverted opengles emulator version to 2.09, because there are some issues in v2.10.
2012-03-27 14:11:28 +08:00
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
cef41dfbc5
issue #1056 : Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1.
2012-03-27 13:42:35 +08:00
0f1ab7ab37
issue #1056 : Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.
2012-03-27 10:55:13 +08:00
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
900de7328a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 18:29:26 +08:00
c5d0b1ca6f
issue #1056 : Updated ParticleTest.
2012-03-22 18:29:07 +08:00
a8eaf85cfb
Merge pull request #804 from minggo/RenderTextureTest
...
Rendertexturetest
2012-03-22 01:37:58 -07:00
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
fc2fd4d353
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 09:46:23 +08:00
59393c2fef
issue #1056 : Update CCLabelBMFont.
2012-03-22 09:46:07 +08:00
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
35d93328b9
issue #1056 : 1.Fixed a bug of double delete TouchDispatcher.
...
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
2012-03-21 21:53:03 +08:00
6f4a01f454
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 17:35:39 +08:00
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
6242656049
issue #1506 : fix a confict
2012-03-21 17:23:33 +08:00
92c30a328e
issue #1506 : implement ShaderTest
2012-03-21 17:02:52 +08:00
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
8ef5e4ae3b
issue #1056 : Update the configuration of ios project.Sort the the project folder.
2012-03-21 11:07:31 +08:00
00a81f5bd0
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-21 10:43:54 +08:00
02ae04c1d6
issue #1056 : Modified the configuration of ios project.
2012-03-21 10:41:21 +08:00
bb4d7c2f88
issue #1056 : Updated some files for ios platform. Added some 'TODO'.
2012-03-21 10:36:20 +08:00
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
7c0af610ff
issue #1056 : Added CCArray::copyWithZone implementation. CCDictElement bound check.
2012-03-20 23:30:18 +08:00
15e03f8b14
issue #1056 : Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
...
Update CCDICT_FOREACH implementation.
2012-03-20 21:08:52 +08:00
b5fca2f5f3
issue #1056 : Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks.
2012-03-20 21:04:29 +08:00
382e4e7eb8
issue #1056 : modify code according new code after pull
2012-03-20 17:27:06 +08:00
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
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
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
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +08:00
9203b60fb0
add CCDictionary based on UTHASH, improve the performance.
2012-03-19 14:53:44 +08:00
f67ac20639
Merge pull request #775 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 02:59:21 -07:00
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
86a1acc0d8
Merge pull request #774 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-15 22:45:20 -07:00
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
303818ef6d
issue #1056 : Update CCGLProgram.
2012-03-15 10:54:07 +08:00
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +08:00
673a1ca238
Merge pull request #771 from dumganhar/gles20-dev
...
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 03:15:38 -07:00
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +08:00
d0f93d38f4
Merge pull request #769 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 00:00:57 -07:00
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
4f2f403827
Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp
2012-03-12 14:22:48 +01:00
7820be7841
Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}
2012-03-12 14:22:39 +01:00
bd59979495
add gles2.0 libraries for win32.
...
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
2012-03-12 15:22:03 +08:00
cc7542a86b
Merge pull request #766 from assoulter/master
...
Fix m_nEntryID typo
2012-03-11 20:06:24 -07:00
7fc0ffbf26
fixed #737 : remove view id
2012-03-12 11:00:12 +08:00
8e53d9db9f
fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG
2012-03-12 00:59:03 +04:00
7321d33aaf
Added support files for Accelerometer Simulation for iPhone Simulator and
...
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
2012-03-08 11:23:47 +00:00
7dfe4224e1
Merge pull request #756 from dualface/fix-lua-engine-bugs
...
fixed #1030 : Improve Lua engine
2012-03-07 21:42:35 -08:00
e9c1e43e27
Merge pull request #755 from dumganhar/iss1022_string_with_file
...
fixed #1022 : Added a static method named CCString::stringWithContentsOfFile.
2012-03-07 21:39:59 -08:00
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
c6c7fb1be6
Improve Lua engine
...
rename executeFunctionByRefId() to executeFunctionByHandler()
add executeFunctionWithCCObject()
add pushIntegerToLuaStack()
add pushFloatToLuaStack()
add pushBooleanToLuaStack()
add pushCCObjectToLuaStack()
2012-03-07 20:27:26 +08:00
c91fd243dc
Update cocos2dx/include/CCString.h
2012-03-07 16:15:26 +08:00
2564f39eb8
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file
2012-03-07 16:13:16 +08:00
00745ae172
fixed #1022 : add the comment for CCString::stringWithContentsOfFile.
2012-03-07 16:12:46 +08:00
a0f0971782
fixed #1017 : improve win32 timing accuracy
2012-03-06 14:12:57 +08:00
74b4b14ee3
Merge pull request #730 from moadib/qnx_eventhandler
...
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
2012-03-05 18:07:20 -08:00
ed68855e19
fixed #1009 : fix a typo error
2012-03-06 09:35:36 +08:00
fd9dd6c7fe
add stringWithContentsOfFile static method in CCString class.
2012-03-05 11:13:45 +08:00
cb1f94df47
revert CCFileUtils::getFileData method.
2012-03-05 09:55:50 +08:00
347a8294ac
fixed #1007 : Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
2012-03-03 12:24:02 +08:00
796ba89e9d
Merge pull request #742 from minggo/iss762_label_position
...
compute correct text rect and display it on center
2012-03-01 22:24:04 -08:00
2360a9a04e
fixed #762 : let zfont display on center
2012-03-02 14:22:01 +08:00
5485eb19d9
fixed #762 : compute correct text rect and display it on center
2012-03-02 14:17:22 +08:00
79495fd743
Merge pull request #741 from minggo/master
...
remove libiconv.a
2012-03-01 19:28:35 -08:00
c196f2dff2
issue #983 : remove libiconv.a
2012-03-02 11:25:35 +08:00
528a769cf6
fixed #762 : make label display on center on iOS
2012-03-02 11:15:44 +08:00
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
6c01009a18
fixed #986 : Add init() member funciton of CCMenu class.
2012-02-29 10:07:18 +08:00
05bf647ec3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib
2012-02-28 15:00:18 +08:00
7daeb5cd86
fixed #984 : Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.
2012-02-28 14:59:46 +08:00
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +08:00
2bc48219f8
remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.
2012-02-27 18:18:40 +08:00
be66bec269
Merge pull request #727 from minggo/iss946_retina
...
fixed #946 : HD image for both retina and normal
2012-02-27 00:10:17 -08:00
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
fd9445f6df
add commet for CCArray
2012-02-23 10:06:36 +08:00
7fcdb3b114
Added CCEGLView::EventHandler class for qnx-platform
2012-02-22 12:27:13 +04:00
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +08:00
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
abbda72b2f
modify bada 2.0 project setting
2012-02-14 23:31:37 +08:00
dac63dd2c2
rename include file name from uppercase to lowercase for linux platform
2012-02-14 22:41:33 +08:00
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
4f523bf986
remove .settings folder
2012-02-14 18:06:29 +08:00
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
e3e016331c
issue #972 : move extensions folder to cocos2dx
2012-02-14 16:08:12 +08:00
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
0adca5774c
move CCNotificationCenter to extensions folder
2012-02-14 11:45:59 +08:00
65b1b20c8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
...
Conflicts:
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
tests/test.win32/test.win32.vcxproj.filters
2012-02-14 11:43:04 +08:00
c98dd0cf2d
fixed #948 : remove getIndexOfObject()
2012-02-14 10:49:53 +08:00
538adcec3e
merge code from duleface
2012-02-10 13:56:20 +08:00
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
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
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
1d6d966717
fix CCScriptEngineManager::purgeSharedManager()
2012-02-09 20:07:55 +08:00
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
e74b842a58
update HelloLua
2012-02-09 17:48:15 +08:00
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
ca94a11190
fixed #951 : removed definition of NSMutableSet.
2012-02-07 15:35:10 +08:00
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
1e807d00c3
fixed #967 : fixed PVR Textures can not be reloaded after GL context lost on android.
2012-02-07 11:18:39 +08:00
8770976884
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
2012-02-07 10:48:07 +08:00
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
ffc4457991
On Win32 platform, there's now support for simulating the Accelerometer
...
using the up/down/left/right/comma/period keys.
2012-02-06 11:29:28 +00:00
babbd64f0d
Merge pull request #691 from winbinar/master
...
fixed #626 : Fix bug #626
2012-02-05 23:00:31 -08:00
4fe0c10e10
merge upstream/master
2012-02-06 10:54:51 +08:00
f5b8aa79c5
Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 16:49:47 +04:00
69a7e2a2e3
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
2012-02-04 11:34:17 +08:00
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
3eeb0c8687
fix library name - the makefiles expect the full name of the library including the lib prefix
2012-02-02 23:01:50 -08:00
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
516c56a793
Add EXPORT_C_INCLUDES and correct the paths to third party modules
2012-02-02 20:04:29 -08:00
f6d6d0dd49
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 17:46:45 +08:00
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
c78bf39601
Member variable added to keep the current window active status
2012-01-31 22:55:44 -08:00
acdd00f03b
Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application
2012-01-31 21:38:44 -08:00
e8f9c5f675
merging the original update
2012-01-31 20:06:39 -08:00
64c892de79
Merge pull request #697 from dducharme/dalebranch
...
fixed #962 : Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-31 18:44:09 -08:00
edaf2cf269
fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon
2012-01-31 09:57:58 +00:00
38cd599bdc
Functionality to detect when the application goes to the background and return from it
2012-01-31 00:25:09 -08:00
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00
32e4cc1af2
Updating the following:
...
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
a909be3264
remove selector_protocol.h for vs2010 project
2012-01-30 18:27:03 +08:00
c6ec949950
remove some functions in CCObject
2012-01-30 16:07:01 +08:00
6eb65442d4
remove some logs
2012-01-30 15:46:56 +08:00
f44b38eaf8
fixed #958 : move the implement of SelectorProtocol to CCObject
2012-01-30 15:31:59 +08:00
231446a8a5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:49 +02:00
910ded54c5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:19 +02:00
b0b5790e06
Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7.
...
* Uses NDK modules as the basis of the build system for Android NDK
* Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
* The dependencies of this module are also Android NDK modules
* ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
* Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
2012-01-29 09:52:38 -08:00
e6fddbc047
Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs.
2012-01-29 09:33:17 -08:00
fe79a2c5d2
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-28 10:54:31 +01:00
49b57569c9
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-28 14:38:44 +08:00
a9d7500ae7
Fix whitespace line ending in one single line.
2012-01-25 18:14:29 -08:00
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
f8dafe6712
* add CCNode::getChildrenCount()
2012-01-21 01:29:41 +08:00
b79828a697
* merge lua fix
2012-01-21 00:47:51 +08:00
9660bcd165
* merge upstream/master to master
2012-01-20 19:08:21 +08:00
57eee38f4e
Merge branch 'master' into moveSel2CCObject
2012-01-19 15:46:31 +08:00
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
543d96a73f
issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:02:39 +08:00
b400570265
Workaround for issue #635 . Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator
2012-01-17 10:57:31 +01:00
cea250a962
restore original CCCopying as the parent class of CCObject
2012-01-17 10:54:21 +08:00
aa4fae3980
restore original CCCopying as the parent class of CCObject
2012-01-17 10:00:22 +08:00
ea0fb47f98
Merge branch 'master' into moveSel2CCObject
2012-01-17 09:37:31 +08:00
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
d3642be42d
Merge pull request #677 from dumganhar/modify_linux_port
...
modify eclipse project setting for linux port
2012-01-12 04:00:02 -08:00
bd5ff14e45
Merge branch 'test' of https://github.com/minggo/cocos2d-x into test
2012-01-12 19:30:46 +08:00
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
cfe02e39ef
Broken include guard in CCActionEase.h
2012-01-12 17:06:46 +08:00
75216ac9ca
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 16:54:14 +08:00
57801eb0a0
modify version
2012-01-11 15:17:16 +08:00
ffeed3827a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into moveSel2CCObject
...
Conflicts:
cocos2dx/platform/CCPlatformMacros.h
2012-01-09 23:23:45 +08:00
d61f87ba92
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
2012-01-09 23:21:31 +08:00
0ee582e887
fixed #917 : add header files to resolve compiling errors
2012-01-09 17:36:57 +08:00
b1aee8f9eb
Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils
2012-01-09 17:12:46 +08:00
4cc1658d45
fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash.
2012-01-09 14:15:49 +08:00
259aaf42a6
Fixed: get extension function from eglGetProcAddress on bada platform
2012-01-09 14:15:18 +08:00
30a02030b0
make the property function to virtual
2012-01-09 11:07:45 +08:00
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +08:00
2f1c313d12
Merge pull request #658 from gzito/master
...
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
2012-01-04 22:09:22 -08:00
65ddb88000
Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version)
2012-01-04 23:34:48 +01:00
4bffaaf9cb
fixed #936 : check whether selector is valid
2012-01-04 10:58:20 +08:00
c6da8d2fbd
call correct java method
2012-01-04 10:14:46 +08:00
2acea5f7af
libxml2.mkf for both Windows and Mac Marmalade versions
2012-01-03 00:39:31 +01:00
083d0015a3
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-02 22:32:29 +01:00
4010733c20
fixed #927 : To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value.
2011-12-31 17:44:45 +08:00
f776ecc7e0
Merge pull request #650 from dumganhar/issue#934_add_isEqual
...
Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-30 18:18:39 -08:00
8c65786dce
fixed #934 : Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-31 10:10:41 +08:00
53fae04ba8
fixed #752 : make add/remove touch delegate in menu callback function correctly
2011-12-30 15:43:36 +08:00
20b6257198
fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();'
2011-12-29 16:00:36 +08:00
025258d21d
fixed #928 : save pixelformat for each texture, restore the pixelformat after entering foreground
2011-12-29 15:05:38 +08:00
fcb2294e20
fixed #926 : subclass should retain/release when dynamic_cast fail.
2011-12-28 14:47:54 +08:00
37915cfed6
remove unneeded function, and make protocol an abstract class
2011-12-28 14:46:49 +08:00
28562c3fb9
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2011-12-27 16:14:19 +01:00
bbad5a4392
* merge upstream/master to master
2011-12-25 11:48:03 +08:00
a09bebb32b
fixed #903 : 1.pass 'id' parameter to setTouchInfo function;
...
2.when double press happens, deal with it as single press.
2011-12-23 20:33:42 +08:00
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
12237cf288
fixed #911 : add some comment
2011-12-22 16:29:25 +08:00
7422a424da
fixed #911 : make CCTextureCache::addUIImage() work ok when key is null
2011-12-22 16:26:56 +08:00
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
a0fe048f11
fixed #923 : cache texture with correct image type
2011-12-22 10:48:54 +08:00
21f05c2d6f
issue #903 : fix a compiling error
2011-12-22 09:56:09 +08:00
bb4b1d02bb
Merge pull request #608 from GMTDev/patch-2
...
issue #903 : Update CCTouch to include the ID/PID of the touch
2011-12-20 21:48:30 -08:00
36f8e43dd8
Update cocos2dx/include/CCTouch.h
2011-12-20 20:40:48 -08:00
a39be9506f
Defines documentation to avoid warning in Marmalade
2011-12-20 22:34:23 +01:00
d37417f7da
Re-added libXml2
2011-12-20 22:10:01 +01:00
298f12e7a3
Removed libxml2 (precompiled version)
2011-12-20 22:05:01 +01:00
01cf5793ad
fixed #922 : rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
2011-12-20 14:59:15 +08:00
28d0737bf3
fixed #917 : implement CCFileUtils::getFileDataFromZip() on iOS
2011-12-20 14:18:53 +08:00
a8d5b6544a
Merge pull request #629 from gzito/master
...
Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.
2011-12-19 18:46:07 -08:00
faa8b59b6d
fixed #920 : export functions in CCAffineTransform
2011-12-20 10:39:10 +08:00
59bccb6bf8
Added last loaded font caching & minor fixes
2011-12-19 23:08:35 +01:00
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
e389ae5469
Optimized CCImage and fixed alpha value
2011-12-19 22:56:44 +01:00
318a4c5ba8
merge upstream/master to master
2011-12-17 12:02:24 +08:00
2f63d6a158
Merge pull request #624 from dumganhar/issue#918
...
fixed #918 : modify filter of airplay to marmalade.
2011-12-15 19:11:49 -08:00
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
ffe8890498
Merge pull request #621 from minggo/iss892_RTTI
...
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 18:52:46 -08:00
8298e0b6ff
Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611
...
Conflicts:
tests/test.marmalade/test.mkb
2011-12-15 13:03:07 +08:00
f3b7b519fc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619
2011-12-15 11:38:15 +08:00
265558d9c7
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
2011-12-15 11:36:42 +08:00
15fca8b4b4
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 10:26:31 +08:00
8813d94257
Merge pull request #617 from minggo/issue906
...
remove unneeded code in CCImage_android.cpp
2011-12-14 18:08:24 -08:00
00e504356a
Fixing Warning on CLang 3.0 on XCode 4.2
2011-12-15 01:46:55 +08:00
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
7f7ef29b21
Fixes on QNX project accidentally including marmalade
2011-12-14 16:50:26 +08:00
625d299717
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
2011-12-13 10:01:29 +08:00
d4ea6d4ef5
Rollback changes about CCDirector::sharedInstance as pointer
...
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
2011-12-12 14:50:35 +01:00
4b9cbb85ff
#issue 908: Merge marmalade to latest cocos2d-x source
...
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
ba462e99a6
fixed #906 : remove unneeded code in CCImage_android.cpp
2011-12-12 17:02:21 +08:00
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dea2713f51
fixed #907 : add blackberry port
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-12 11:49:49 +08:00
95b43ac563
Merge pull request #614 from minggo/issue892_RTTI
...
Use RTTI to simplify codes
2011-12-11 19:40:34 -08:00
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
b1cdb6543d
Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language
...
Added tests for Marmalade and enabled language and font testing
2011-12-11 17:18:01 -08:00
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
f3b662a5a8
marmalade updates
2011-12-10 22:29:39 -08:00
dc6476ebe0
marmalade updates
2011-12-10 21:54:07 -08:00
9fc2061c6b
mamarlade updates
2011-12-10 21:20:15 -08:00
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
2be5240a5d
Fixed CCFileUtils::getWriteblePath on Marmalade
2011-12-10 16:34:54 +01:00
f27f9180ff
Merge remote-tracking branch 'remotes/styck/master'
2011-12-10 11:10:59 +01:00
287f480c97
Added initWithString (TTF) and jpeg support
2011-12-09 22:05:12 +01:00
af29be2d26
Shared instance is now a pointer instead of a static instance. Also the CCEGLView::release notifies application about quit
2011-12-09 22:04:35 +01:00
362a82f41c
mainloop modified to handle correctly quit requests
2011-12-09 22:03:38 +01:00
c17d7de0a1
For CC_PLATFORM_MARMALADE used pointers instead of static instances for singletons
2011-12-09 22:02:19 +01:00
5584039f47
libFreeType and libJpeg for Marmalade
2011-12-09 21:58:32 +01:00
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
6d2a298035
Merge branch 'bbf' into blackberry
2011-12-09 15:58:16 +08:00
5dea9b8205
fix a crash bug in SimpleAudioEngine.cpp
...
update helloworld and tests main.cpp and AppDelegate.cpp files
2011-12-09 15:54:35 +08:00
34759f4411
Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.
2011-12-08 20:47:42 -08:00
7350fa9bb5
Updated based on G.Zito feedback
2011-12-08 19:51:19 -08:00
190fbb60a7
Merge branch 'Forf_2' into bbf
2011-12-09 10:39:27 +08:00
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
0a7a000c2d
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:21:48 +01:00
0c1b058629
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:16:32 +01:00
b11bcacea8
modify Device-Debug project setting, finished running on device!
2011-12-08 18:22:06 +08:00
1eb8ba656e
Added marmalade folder
2011-12-08 11:15:20 +01:00
7b0cb1bc8b
Accelerometer stuff
2011-12-08 10:48:03 +01:00
e077107575
Used CONSTANT definitions for touch
2011-12-08 09:30:18 +01:00
b3ecaedfeb
Merge branch 'refs/heads/luafix-0.10.0'
2011-12-08 15:47:28 +08:00
d49456cbd1
* merge upstream/master to master
2011-12-08 15:47:20 +08:00
7e170c7517
* add LUA_ENGINE_DEBUG & LUALOG macro
2011-12-08 15:44:13 +08:00
8b4b802839
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-08 08:41:16 +01:00
3d86583818
Update cocos2dx/platform/android/jni/TouchesJni.cpp
2011-12-07 20:25:51 -08:00
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
b60eac2505
integrating libXml2
2011-12-07 23:49:52 +01:00
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
2c94bcc075
add some files for qnx
2011-12-07 16:22:40 +08:00
3bf11dba7e
issue #892 : modify pkg for lua
2011-12-07 15:24:03 +08:00
cdc842051f
issue #892 : use RTTI to simplify codes, work ok on win32
2011-12-07 14:28:22 +08:00
6ab60118af
Update cocos2dx/include/CCTouch.h
2011-12-06 20:31:40 -08:00
190891bab7
Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751
...
Files Modified: Eagleview.mm, CCTouch.h
2011-12-06 20:06:38 -08:00
96d400d918
Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2
...
Refactored Accelerometer to match other platforms
Updated SimpleAudioEngine.cpp with new functions. (NOT tested).
Updated app.icf for latest Marmalade
Update deprecated function calls.
Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
2011-12-06 18:32:36 -08:00
97967ffcb3
Specific classes for Marmalade platform
2011-12-07 00:08:04 +01:00
6d7baa9684
add platform files for qnx
2011-12-06 17:19:36 +08:00
bfdb908d01
add Cocos2dx project
...
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +08:00
70d5a088f1
fixed #887 , define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7
2011-12-04 20:18:17 +08:00
442e06e62e
* add CCNode:getPositionLua(), return CCPoint
2011-12-04 11:35:55 +08:00
cf12806558
merge luafix-0.9.2
2011-12-01 22:02:16 +08:00
f860edc744
Merge remote-tracking branch 'refs/remotes/upstream/master'
2011-12-01 22:00:21 +08:00
f0e80b32f4
fixed #854 : cache texture on android
2011-12-01 17:04:56 +08:00
2d9e8f065b
* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()
2011-12-01 14:58:39 +08:00
f3e654056c
* fix merge error 2
2011-11-30 21:50:00 +08:00
25f1cf16fd
* fix merge error 1
2011-11-30 21:47:23 +08:00
45fe3b3090
* merge luafix-0.9.2
2011-11-30 21:42:18 +08:00
216ad9b9cb
* merge upstream/master to master
2011-11-30 21:38:20 +08:00
a680ba4a8a
* CCTouch:locationInView() & CCTouch:previousLocationInView() return const reference
2011-11-30 21:29:57 +08:00
31285fea17
* add Touch & MultiTouches lua support
2011-11-30 21:27:50 +08:00
a5f389894a
Merge pull request #593 from minggo/box2d
...
change version and support android 4.0
2011-11-29 23:34:33 -08:00
4607ba8029
support for android 4.0
2011-11-30 15:30:11 +08:00
445982a252
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-30 09:35:15 +08:00
68297f0121
fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param.
2011-11-30 09:32:07 +08:00
3f97e7db44
fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp
2011-11-30 09:26:45 +08:00
4bf68e79fd
* merge upstream/master to master
2011-11-29 19:56:20 +08:00
ebd381af26
* merge luafix-0.9.2 to master
2011-11-29 19:20:49 +08:00
9070248d17
* [fix] MenuItem::activate() not call script function with tag value
2011-11-29 17:40:18 +08:00
adfec68577
fixed #850 : update Box2d for linux
2011-11-29 17:12:21 +08:00
90ae1aabc7
* add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler()
2011-11-29 17:10:58 +08:00
6117e15354
* [fix] CCFileUtils::getDoubleResolutionImage() not display HD file path.
2011-11-29 15:52:13 +08:00
0739c1f262
* rename LuaEngine to CCLuaEngine
...
* add #if LUA_ENGINE
* format source files
2011-11-29 15:42:12 +08:00
31b47c3fc6
* remove needless code
2011-11-29 12:38:28 +08:00
0fff92236f
add f project
2011-11-29 12:38:20 +08:00
f1351610d8
* merge CCLuaSupport to CCLuaEngine
2011-11-29 12:35:48 +08:00
266f0ee7ab
Merge pull request #586 from leon-li/master
...
Fix some minor bugs.
2011-11-28 18:27:38 -08:00
f108952595
Merge remote branch 'upstream/master'
...
Conflicts:
cocos2dx/support/CCPointExtension.cpp
2011-11-29 10:15:15 +08:00
d108f4f456
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-28 23:13:02 +08:00
3442d17dbe
fixed #880 : implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
2011-11-28 18:05:38 +08:00
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
112ec42670
fixed #854 : support bada pthread and semaphore
2011-11-28 16:07:17 +08:00
cad4ff05f3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2011-11-28 15:43:13 +08:00
31ea76c16a
remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project
2011-11-28 14:33:29 +08:00
20455bf164
fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly.
2011-11-28 14:27:48 +08:00
8fd6a7298f
issue #854 : fix warning
2011-11-28 10:12:31 +08:00
6f99f7efde
1. fix multi touch index.
...
2. swap.
3. create gl view.
2011-11-26 22:37:36 +08:00
ab7db20809
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
2011-11-26 17:20:12 +08:00
8edbbd56a9
Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself.
2011-11-26 17:07:36 +08:00
842c64486e
issue #854 : remove unneeded code
2011-11-25 16:16:37 +08:00
77b830b36b
issue #854 : use semaphore instead of condition because the condition may lose message
2011-11-25 16:14:06 +08:00
331dac34de
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/include/CCDirector.h
2011-11-25 11:06:20 +08:00
d94effbcfa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-25 10:56:44 +08:00
7e61ce7d67
issue #781 : add audio functions on linux
2011-11-25 10:48:05 +08:00
837e5048d2
Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion
2011-11-25 10:19:29 +08:00
c034f84b2d
fixed #760 : implement functions in .cpp
2011-11-25 10:17:32 +08:00
101f076a44
fixed #760 : implement functions in .cpp
2011-11-25 10:13:59 +08:00
f5bbad5833
issue #854 : implement CCImage::initWithImageFileThreadSafe for iOS
2011-11-25 10:09:29 +08:00
79e204abad
add semaphore support on bada
2011-11-25 10:06:26 +08:00
c138d7e258
update CCAccelerometer on bada platform
2011-11-24 18:04:25 +08:00
e87b00db67
add pthread support for bada 1.0
2011-11-24 17:26:04 +08:00
aeb56495a6
add user truetype font support, fix a bug in CCTextureCache.cpp
2011-11-24 15:15:23 +08:00
07da67f253
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/menu_nodes/CCMenu.cpp
2011-11-24 11:52:16 +08:00
4612e6e1d6
update pthread.cpp
2011-11-24 11:37:59 +08:00
42775d4ec5
update pthread implement
2011-11-24 10:58:09 +08:00
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
cfa42fa8a1
Merge branch 'newest' into master_base
2011-11-23 21:47:21 +08:00
035d7326db
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-23 21:43:40 +08:00
15e3a6b1cf
update CCFileUtils_bada.cpp and CCImage_bada.cpp
2011-11-23 18:40:36 +08:00
c3a034a19b
fixed #760 : add functions to get/add m_pNotificationNode
2011-11-23 17:18:53 +08:00
6aedc258b4
fixed #838 : tests and HelloLua support x86
2011-11-23 15:51:30 +08:00
a8240abbe2
* revert CCFileUtils_ios.mm to 0.9.2
2011-11-23 13:48:15 +08:00
4ff2bf96d1
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
2011-11-23 13:41:48 +08:00
01c8f5f47e
* CCFileUtils_ios dump error message to console
2011-11-23 13:36:32 +08:00
8b20639d75
issue #838 : HelloWorld support x86
2011-11-23 11:02:18 +08:00
151b373239
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
2011-11-23 00:58:31 +08:00
bc60ed7856
issue #854 : optimize CCTextureCache::addImageAsync()
2011-11-22 16:47:24 +08:00
43226d190f
* CCFileUtils_ios dump error message to console
2011-11-21 18:50:45 +08:00
a1f8433a47
* fix merge error 4
2011-11-21 18:50:19 +08:00
611e09fe2f
* fix merge error 3
2011-11-21 17:09:23 +08:00
27ce997e36
* fix merge error 2
2011-11-21 17:07:16 +08:00
012ce7a04f
* fix merge error 1
2011-11-21 17:00:56 +08:00
7a6253d9aa
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
2011-11-21 16:38:00 +08:00
efa9275d7f
save the codes for testing
2011-11-21 12:04:21 +08:00
b34859108e
* remove needless files
2011-11-21 11:58:55 +08:00
51eb56075b
Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread
2011-11-21 09:36:55 +08:00
4226fcf355
issue #854 : add CCThread_ios.mm
2011-11-21 09:34:49 +08:00
4944d5ced8
* remove needless warning
2011-11-20 21:12:24 +08:00
57bf9453b7
* add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class
...
* move CCTimer from CCScheduler.cpp/.h to CCTimer.cpp/.h
2011-11-20 16:38:27 +08:00
09d12be875
* format cocos2d-x source files
2011-11-18 21:23:54 +08:00
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
50a2e2d5e9
Merge pull request #574 from minggo/iss854_pthread
...
remove unneeded files
2011-11-17 18:59:03 -08:00
5d8043ce7e
issue854: remove unneeded files
2011-11-18 10:54:36 +08:00
a7d6c90adb
Merge pull request #571 from jbyu/master
...
fix memory-leak for lua engine
2011-11-17 18:53:14 -08:00
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
81b8fc0ce8
fixed #854 : fix a bug of CCTextureCache
2011-11-17 14:34:41 +08:00
cb75465913
issue #854 : add test case for CCTextureCache
2011-11-17 10:10:13 +08:00
dccf577ad3
getLastValidIterator() may return a invalid iterator m_array.end().
...
don't know where this code came from.
2011-11-16 11:08:26 +08:00
cc79e533a3
issue #854 : add pthread for win32 and implement CCTextureCache::addImageAsync()
2011-11-16 11:04:29 +08:00
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
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
5273819e83
offer a thread safe function to read contents of xml file, and the engine use it internal
2011-11-15 10:41:18 +08:00
0fa48e2cfb
Update cocos2dx/platform/CCPlatformMacros.h
2011-11-14 11:35:04 +08:00
7cb27a76ae
modify accelerometer and Platform Functions
2011-11-13 22:45:41 +08:00
d346fa8650
close debug draw
2011-11-13 01:22:05 +08:00
d8de253542
add messagebox support
2011-11-13 01:13:25 +08:00
5704fdc146
Merge branch 'testMP_static_lib' into newest
2011-11-13 01:05:22 +08:00
25ab866557
when CCTextureAtlas::resizeCapacity, should
...
glDeleteBuffers(2, m_pBuffersVBO);
// initial binding
glGenBuffers(2, &m_pBuffersVBO[0]);
otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.
2011-11-13 00:57:05 +08:00
ea3b57ea2c
modify multi touch support
2011-11-13 00:54:44 +08:00
8fd2917888
fixed a bug that Accelerometer value error if use HVGA resource in WVGA device
2011-11-13 00:54:05 +08:00
2abe0c0d32
CCAssert will show system messagebox, this easy for debuging code.
2011-11-10 16:49:05 +08:00
4e924986a2
add static lib project
2011-11-10 16:47:17 +08:00
ca3b91855a
debug issue #852
2011-11-10 16:44:58 +08:00
dcb4f14a5b
According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177 , we must prevent yOffset to become a negative value. I use the laziest approach.
2011-11-09 22:11:36 +08:00
33db1c7951
use unix text format
2011-11-08 18:11:43 +08:00
a81b078286
fixed a bug in calloc(0) return NULL.
2011-11-08 15:59:51 +08:00
920b41271d
add TextInput support
2011-11-08 15:59:04 +08:00
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
7d2a26ec10
comment some applog
2011-11-07 00:28:09 +08:00
16fba505b6
add multitouch support
2011-11-05 11:36:27 +08:00
2998726364
revert language
2011-11-02 01:23:07 +08:00
240aa4c077
add russian language support
2011-11-01 23:32:26 +08:00
cf3cecc108
revert to normal version
2011-11-01 23:02:26 +08:00
cff6437b76
revert to normal ccLanguageType
2011-11-01 17:12:39 +08:00
785b79d263
fix compile errors under ubuntu 11.10
2011-10-31 23:50:08 -07:00
f43530c010
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
...
Conflicts:
CocosDenshion/proj.bada/sdk1.0/.cproject
CocosDenshion/proj.bada/sdk2.0/.cproject
cocos2dx/platform/bada/CCApplication_bada.cpp
2011-10-31 09:34:40 +08:00
853126036d
add ogg source for cocosDenshion project
2011-10-29 15:38:15 +08:00
fd90641c49
merge testf branch
2011-10-29 14:47:13 +08:00
b7f0385a2b
bundle 64 bit linux static libs
2011-10-28 12:19:26 +08:00
1b42b1d801
Merge remote branch 'upstream/master'
2011-10-28 11:37:02 +08:00
2c14402107
fixed #776 : merge pull request and remove unneeded codes
2011-10-28 09:46:19 +08:00
d061e8323d
modify project configure
2011-10-27 19:22:14 +08:00
5db8a24389
fixed one issue in cocosdenshion
2011-10-26 18:38:27 +08:00
dd73456576
Merge branch 'bada' into f
2011-10-25 17:40:20 +08:00
146d3e1536
modify project config
2011-10-24 14:22:09 +08:00
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
e53649ccaa
add a member function to get key string of a texture.
2011-10-22 19:39:31 +08:00
5589335d3a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
2011-10-22 19:27:35 +08:00
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
eb901be664
project config change
2011-10-21 09:49:57 +08:00
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
5c4a3c3fda
Merge remote branch 'upstream/master'
2011-10-20 18:34:10 +08:00
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
67bbbb2800
1. relative to bug #754 , FontTest should use "fonts/abc.ttf" as external ttf name
...
2. fixed a tiny bug, FontTest can show font name on the top correctly
2011-10-20 14:56:39 +08:00
6451d8b6bf
use ceil to compute viewport
2011-10-20 13:44:21 +08:00
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
77b3a32e16
fix compile error on 64 bit Linux
2011-10-19 15:12:38 +08:00
ae411f9503
fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h
2011-10-18 17:41:19 +08:00
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
6af6257fa9
Merge branch 'testf1016' of github.com:dumganhar/cocos2d-x into FishGameBada
...
Conflicts:
CocosDenshion/bada/CCAudioOut.cpp
CocosDenshion/bada/CCAudioOut.h
2011-10-17 13:45:16 +08:00
064014aeae
make some special configure
2011-10-16 22:44:29 +08:00
ee53c29e5c
switch to 2.0 WVGA
2011-10-16 13:23:48 +08:00
1ffd3a4350
add language support
2011-10-14 15:54:18 +08:00
8dfa18efb9
commit some file for private use
2011-10-14 15:38:58 +08:00
47c9020b85
fixed #738 : caculate label height if not set
2011-10-14 14:33:08 +08:00
3f89f3088b
remove mouse test log
2011-10-14 09:21:03 +08:00
fd3f496b76
use system orientation
2011-10-13 11:55:48 +08:00
2b2405e2dc
fixed #750 : add comment
2011-10-13 10:56:02 +08:00
aaa16b4a4f
fixed #750 : change the key to full path, because retrieve it use full path
2011-10-13 10:54:22 +08:00
5feee662e7
More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration .
...
Added support for detect russian language.
2011-10-12 09:32:59 +04:00
0283a4b254
Added dll-export macro to CCSaxParser declaration
2011-10-11 22:44:18 +04:00
64388023f6
Merge branch 'master' into bada
2011-10-10 13:47:16 +08:00
f162a5fcaa
add m_pAccelDelegate != NULL to avoid crash
2011-10-10 10:24:52 +08:00
eb9cb31ca4
use shared lib for cocos2dx project
2011-10-09 18:15:31 +08:00
9695b6df86
fixed #745 : export CCTime to dll
2011-10-09 10:19:12 +08:00
2f00b8ff1c
update to sdk2.0.2
2011-10-09 01:11:33 +08:00
fdea17b4f9
don't use DeviceOrientation, save orientation before running DirectorTest
2011-10-08 18:17:01 +08:00
f97de356e7
add release version
2011-10-08 11:47:32 +08:00
ba2f2fbc8b
Merge https://github.com/reflog/cocos2d-x into reflog
2011-10-08 11:28:16 +08:00
d23b044782
fill for polygon drawing
2011-10-05 10:50:00 +02:00
beaa489406
add scale support
2011-09-30 17:19:16 +08:00
1830b4e2e9
add default file path = /Res
2011-09-30 10:02:37 +08:00
1b5365282a
add accelerometer support
2011-09-29 18:12:08 +08:00
9ff00c7c83
use utf-8 for displaying chinese
...
remove Gbk_Unicode.c Gbk_Unicode.h
2011-09-29 17:29:38 +08:00
d6049846bb
Merge branch 'master' into bada
2011-09-29 16:18:47 +08:00
33c7caf555
Merge pull request #535 from minggo/master
...
fixed a assert error
2011-09-29 01:13:49 -07:00
a56034f177
fixed a assert error
2011-09-29 16:07:18 +08:00
db4d51496e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
...
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
2011-09-29 16:03:37 +08:00
bd2266fe4c
use timer as gameloop, can change FPS by using setAnimationInterval
...
modify some project setting
2011-09-29 15:52:16 +08:00
333e08330b
make create-linux-android-project.sh works ok
2011-09-29 00:49:49 -07:00
cda492593c
modify gameloop method
...
modify some project setting
2011-09-29 02:32:01 +08:00
de545096de
modify bada project setting
2011-09-28 18:21:17 +08:00
4ad422defd
make tests run ok on linux android
2011-09-27 20:36:21 -07:00
56eb3060ee
uiimage to uiImage
2011-09-28 09:49:57 +08:00
800940dd82
fixed some bug in bada port
2011-09-28 09:49:18 +08:00
1a8c6b06c7
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:15:50 +08:00
a54ab3c293
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:09:14 +08:00
cd18394b09
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:06:11 +08:00
d4283b1f11
Merge branch 'linux_port'
2011-09-27 17:01:51 +08:00
294c796e55
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:00:13 +08:00
4f7e349c0a
set HelloWorld dependence and make it run ok on android emulator
2011-09-26 22:38:59 -07:00
6cf5592499
modify Gbk_Unicode.c
2011-09-26 17:50:31 +08:00
c78a4cb485
modify cocos2dx project setting for bada
2011-09-26 17:50:05 +08:00
13b091fb15
modify CCImage, make text being showed correctly
2011-09-26 15:40:56 +08:00
0f7a15b1b3
recommit
...
modify eclipse project config
delete libs and use the folder eclipse generated instead.
2011-09-23 09:56:30 +08:00
267cce29a9
Added testing ability for case when application enters background and returns in foreground on windows platform.
...
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().
Also break; forgotten in WM_KEYDOWN.
2011-09-22 13:11:51 +04:00
0ad5ec3557
fixed typo for win32 keypad testing ability
2011-09-22 10:27:10 +04:00
5537ba7e9e
Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing
2011-09-21 16:21:11 +04:00
1cac9520cc
make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion
2011-09-21 02:27:42 -07:00
eeb0956fb8
add linux makefiles
2011-09-20 14:38:12 +08:00
762e342b4d
fixed #727 : invoke DeleteLocalRef() to resolve memory leak
2011-09-20 14:25:16 +08:00
c93be8b828
modify <cstdio> to <stdio.h>
...
delete old project files
2011-09-20 12:39:44 +08:00
eb32cf9fe2
modify some files of bada project
2011-09-20 02:19:26 +08:00
81243eecdf
modify libpng version to 1.4.5
...
modify libjpeg txt mode to windows \r\n style
2011-09-20 02:17:44 +08:00
8ad2125139
add source code of libjpeg ,libpng ,zlib for bada
2011-09-20 02:16:20 +08:00
ca2027fbad
modify bada project
2011-09-19 23:35:46 +08:00
edb2cbbad6
modify bada project files
2011-09-19 18:17:19 +08:00
0e7fc78e4e
commit some files of bada project
2011-09-19 18:05:40 +08:00
c94adc58b9
changed bada projects directory, add bada macro
2011-09-19 17:53:45 +08:00
3c795073e0
Merge branch 'master' into bada
...
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
2011-09-19 13:42:08 +08:00
eadaba8930
modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp
...
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
2011-09-19 10:51:05 +08:00
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
d016f05f92
use relative path instead of the workspace_loc
2011-09-15 18:24:41 +08:00
61f2ab3cf2
fixed #718 : fixed a typo error
2011-09-15 13:49:04 +08:00
dcc5726665
Merge pull request #504 from minggo/iss715
...
fixed #715 : make sure selected image is valid
2011-09-12 23:34:27 -07:00
bdb7cfdd71
fixed #715 : make sure selected image is valid
2011-09-13 14:29:15 +08:00
d763cc3884
Merge pull request #503 from minggo/master
...
fixed #709 : write doxygen comment in CCSet.h
2011-09-12 23:23:21 -07:00
e2315d92b5
fixed #709 : write doxygen comment in CCSet.h
2011-09-13 09:31:54 +08:00
8082b91c0e
fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730
2011-09-10 08:48:15 +08:00
8f5c327937
add all eclipse project files to the corresponding directory
2011-09-07 12:44:03 +08:00
310e79a491
delete the project configurations in base folder
2011-09-07 12:41:39 +08:00
ae056a07b1
Merge pull request #502 from minggo/iss686
...
fixed #686 : set z tag of appended tile
2011-09-05 23:52:00 -07:00
e2bb1d49e5
fixed #686 : set z tag of appended tile
2011-09-06 14:01:08 +08:00
8ccc3321a3
Merge pull request #500 from flyingpacer/renderendcrash
...
Renderendcrash
2011-09-05 20:52:50 -07:00
53227073a7
fixed #696 to modify some end() usilization
2011-09-06 11:43:09 +08:00
fea3da3156
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
2011-09-06 11:33:48 +08:00
e69d16e7d6
change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable
2011-09-06 10:52:37 +08:00
624e27497a
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
2011-09-06 09:51:35 +08:00
91f8ed7eb4
CCParticleSystemPoint now derive from CCParticleSystemQuade in linux
2011-09-05 11:57:10 +08:00
717698bf65
fix some compiling mistake
2011-09-05 10:12:14 +08:00
1fc09448a4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
...
Conflicts:
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
018036eb28
Merge pull request #498 from minggo/iss703
...
fixed #703 : refactor Accelerometer
2011-08-31 18:30:22 -07:00
f61fde764b
fixed #703 : refactor Accelerometer
2011-08-31 17:14:29 +08:00
1402350870
fixed #676 , add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet.
2011-08-31 14:20:33 +08:00
dd90e8ce86
issue #702 add invalid point judgement
2011-08-30 16:40:57 +08:00
c8619240c4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702
2011-08-30 16:39:13 +08:00
ab2a6cb2bb
fixed #702 tests crashs at the start on wophone device
2011-08-30 15:59:06 +08:00
554e3fda52
fixed #701 , CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone
2011-08-30 15:26:17 +08:00
9f1e26f8a0
fixed #700 , a stupid typo in CC_SWAP32 marco
2011-08-30 15:20:41 +08:00
0cfbf4344a
fix a compiling error on wophone
2011-08-30 10:54:32 +08:00
414791a684
issue #675 : initialize acceleration_
2011-08-30 10:34:29 +08:00
92f741aa73
issue #675 : remove unneeded header file
2011-08-30 09:49:55 +08:00
c7fd375539
issue #675 : make wophone support only one accelerometer delegate
2011-08-30 09:45:11 +08:00
b38105a70b
issue 675: dispatch accelerometer data to one delegate
2011-08-29 18:18:39 +08:00
a411f4877c
fixed #698:Not invoke init() in the construction of CCSprite
2011-08-29 11:00:31 +08:00
a362d3131c
update debug and release makefiles again
2011-08-28 16:58:10 +08:00
c977f3e07c
commit debug and release makefile
2011-08-28 16:44:20 +08:00
e64bfd6c68
commit subdir.mk
...
delete all obsolete *.d and *.o files
2011-08-28 15:43:50 +08:00
1ac3fdebca
deleted: Box2D/Box2DConfig.cmake
...
deleted: Box2D/CMakeLists.txt
new file: CocosDenshion/.cproject
new file: CocosDenshion/.project
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidDebug/makefile
deleted: HelloCocos2dx/AndroidDebug/objects.mk
deleted: HelloCocos2dx/AndroidDebug/sources.mk
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidRelease/makefile
deleted: HelloCocos2dx/AndroidRelease/objects.mk
deleted: HelloCocos2dx/AndroidRelease/sources.mk
deleted: HelloCocos2dx/Classes/AppDelegate.cpp
deleted: HelloCocos2dx/Classes/AppDelegate.h
deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp
deleted: HelloCocos2dx/Classes/HelloWorldScene.h
deleted: HelloCocos2dx/Linux/main.cpp
deleted: HelloCocos2dx/Linux/main.h
deleted: HelloCocos2dx/Resource/CloseNormal.png
deleted: HelloCocos2dx/Resource/CloseSelected.png
deleted: HelloCocos2dx/Resource/HelloWorld.png
deleted: HelloCocos2dx/Resource/Icon.png
deleted: HelloCocos2dx/Resource/app.config.txt
deleted: HelloCocos2dx/android/AndroidManifest.xml
deleted: HelloCocos2dx/android/build.properties
deleted: HelloCocos2dx/android/build.xml
deleted: HelloCocos2dx/android/build_native.sh
deleted: HelloCocos2dx/android/default.properties
deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java
deleted: HelloCocos2dx/android/jni/helloworld/main.cpp
deleted: HelloCocos2dx/android/local.properties
deleted: HelloCocos2dx/android/proguard.cfg
deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png
deleted: HelloCocos2dx/android/res/layout/game_demo.xml
deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml
deleted: HelloCocos2dx/android/res/values/strings.xml
deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java
modified: HelloWorld/Classes/AppDelegate.cpp
deleted: HelloWorld/Linux/CloseNormal.png
deleted: HelloWorld/Linux/CloseSelected.png
deleted: HelloWorld/Linux/HelloWorld.png
deleted: HelloWorld/Linux/Icon.png
deleted: HelloWorld/Linux/Materhorn.ttf
deleted: HelloWorld/Linux/app.config.txt
deleted: HelloWorld/Linux/cocos2dx-hello
deleted: HelloWorld/Linux/libcocos2dx.so
modified: cocos2dx/.cproject
modified: lib/linux/Debug/libcocos2d.so
modified: lib/linux/Release/libcocos2d.so
modified: template/android/mycopy_files.sh
new file: tests/test.linux/.cproject
new file: tests/test.linux/.project
modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
2011-08-28 14:33:04 +08:00
e0fa5fdd78
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftconfig.h
...
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftheader.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftmodule.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftoption.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftstdlib.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/freetype.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftadvanc.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbbox.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbdf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbitmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbzip2.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcache.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftchapters.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrdef.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrors.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgasp.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftglyph.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgxval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgzip.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftimage.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftincrem.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlcdfil.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlist.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlzw.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmac.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmodapi.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmoderr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftotval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftoutln.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftpfr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftrender.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsizes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsnames.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftstroke.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsynth.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsystem.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttrigon.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttypes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftwinfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftxf86.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/autohint.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftcalc.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdebug.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdriver.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftgloadr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftmemory.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftobjs.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftpic.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftrfork.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftserv.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftstream.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/fttrace.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftvalid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/internal.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/psaux.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/pshints.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svbdf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svcid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgldict.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgxval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svkern.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svmm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svotval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpfr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpostnm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpscmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpsinfo.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svsfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttcmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svtteng.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttglyf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svwinfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svxf86nm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/sfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/t1types.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/tttypes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/t1tables.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttnameid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttables.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttags.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttunpat.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/ft2build.h
new file: cocos2dx/platform/third_party/linux/libjpeg/cderror.h
new file: cocos2dx/platform/third_party/linux/libjpeg/cdjpeg.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jconfig.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jdct.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jerror.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jinclude.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jmemsys.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jmorecfg.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jpegint.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jpeglib.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jversion.h
new file: cocos2dx/platform/third_party/linux/libjpeg/transupp.h
new file: cocos2dx/platform/third_party/linux/libpng/PngFile.h
new file: cocos2dx/platform/third_party/linux/libpng/cexcept.h
new file: cocos2dx/platform/third_party/linux/libpng/config.h
new file: cocos2dx/platform/third_party/linux/libpng/png.h
new file: cocos2dx/platform/third_party/linux/libpng/pngconf.h
new file: cocos2dx/platform/third_party/linux/libpng/pngpriv.h
new file: cocos2dx/platform/third_party/linux/libpng/readpng.h
new file: cocos2dx/platform/third_party/linux/libpng/readpng2.h
new file: cocos2dx/platform/third_party/linux/libpng/resource.h
new file: cocos2dx/platform/third_party/linux/libpng/writepng.h
new file: cocos2dx/platform/third_party/linux/libraries/libfreetype.a
new file: cocos2dx/platform/third_party/linux/libraries/libjpeg.a
new file: cocos2dx/platform/third_party/linux/libraries/libpng.a
new file: cocos2dx/platform/third_party/linux/libraries/libpng15.a
new file: cocos2dx/platform/third_party/linux/libraries/libxml2.a
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/DOCBparser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLparser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLtree.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.am
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.in
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX2.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/c14n.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/catalog.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/chvalid.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/debugXML.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/dict.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/encoding.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/entities.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/globals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/hash.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/list.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanoftp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanohttp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parserInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/pattern.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/relaxng.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schemasInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schematron.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/threads.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/tree.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/uri.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/valid.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xinclude.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xlink.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlIO.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlautomata.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlerror.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlexports.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmemory.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmodule.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlreader.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlregexp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlsave.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemas.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemastypes.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlstring.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlunicode.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h.in
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlwriter.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpath.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpathInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpointer.h
HelloWorld/Classes/
HelloWorld/android/assets
HelloWorld/postCompiled.sh
installLinuxLib.sh
2011-08-25 19:08:55 +08:00
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
e26eaae5e1
[android] fixed #688 : support reading file other than apk
2011-08-25 11:24:31 +08:00
55dd2545d7
Merge pull request #488 from minggo/iss672
...
fixed #672 : implement copywithzone for CCShow & CCHide
2011-08-24 01:51:30 -07:00
ff34ada115
assign correct value to CCSkewY::m_fStartSkewY
2011-08-24 15:02:40 +08:00
952a01f43e
fixed #672 : implement copywithzone for CCShow & CCHide
2011-08-24 14:21:23 +08:00
75339b7630
Merge pull request #486 from minggo/master
...
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
2011-08-23 02:10:22 -07:00
a7e8c36eee
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
2011-08-23 17:04:38 +08:00
66b453edc9
[iOS] fixed #693 : CCLabelTTF support line break with \n
2011-08-23 16:19:31 +08:00
11679d9723
Merge branch 'master' into LinuxPort
2011-08-23 11:49:46 +08:00
d57d9ca6f6
modified: cocos2dx/.cproject
...
modified: cocos2dx/CCConfiguration.cpp
modified: cocos2dx/CCConfiguration.h
modified: cocos2dx/actions/CCActionGrid3D.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.h
modified: cocos2dx/platform/Linux/CCImage_Linux.cpp
modified: mycreate-android-project.sh
new file: post.sh
modified: template/android/mycopy_files.sh
modified: tests/AppDelegate.cpp
new file: tests/test.linux/Res
deleted: tests/test.linux/Res/Hello.png
deleted: tests/test.linux/Res/Images/BoilingFoam.plist
deleted: tests/test.linux/Res/Images/BurstPipe.plist
deleted: tests/test.linux/Res/Images/Comet.plist
deleted: tests/test.linux/Res/Images/Comet.png
deleted: tests/test.linux/Res/Images/ExplodingRing.plist
deleted: tests/test.linux/Res/Images/Flower.plist
deleted: tests/test.linux/Res/Images/Fog.png
deleted: tests/test.linux/Res/Images/Galaxy.plist
deleted: tests/test.linux/Res/Images/HelloWorld.png
deleted: tests/test.linux/Res/Images/Icon.png
deleted: tests/test.linux/Res/Images/LavaFlow.plist
deleted: tests/test.linux/Res/Images/Pea.png
deleted: tests/test.linux/Res/Images/Phoenix.plist
deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png
deleted: tests/test.linux/Res/Images/SendScoreButton.png
deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png
deleted: tests/test.linux/Res/Images/SpinningPeas.plist
deleted: tests/test.linux/Res/Images/SpinningPeas.png
deleted: tests/test.linux/Res/Images/Spiral.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.png
deleted: tests/test.linux/Res/Images/Upsidedown.plist
deleted: tests/test.linux/Res/Images/atlastest.png
deleted: tests/test.linux/Res/Images/b1-hd.png
deleted: tests/test.linux/Res/Images/b1.png
deleted: tests/test.linux/Res/Images/b2-hd.png
deleted: tests/test.linux/Res/Images/b2.png
deleted: tests/test.linux/Res/Images/background.png
deleted: tests/test.linux/Res/Images/background1-hd.png
deleted: tests/test.linux/Res/Images/background1.png
deleted: tests/test.linux/Res/Images/background2-hd.png
deleted: tests/test.linux/Res/Images/background2.png
deleted: tests/test.linux/Res/Images/background3-hd.png
deleted: tests/test.linux/Res/Images/background3.png
deleted: tests/test.linux/Res/Images/ball-hd.png
deleted: tests/test.linux/Res/Images/ball.png
deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/Images/bitmapFontTest3.png
deleted: tests/test.linux/Res/Images/blocks-hd.png
deleted: tests/test.linux/Res/Images/blocks.png
deleted: tests/test.linux/Res/Images/btn-about-normal.png
deleted: tests/test.linux/Res/Images/btn-about-selected.png
deleted: tests/test.linux/Res/Images/btn-highscores-normal.png
deleted: tests/test.linux/Res/Images/btn-highscores-selected.png
deleted: tests/test.linux/Res/Images/btn-play-normal.png
deleted: tests/test.linux/Res/Images/btn-play-selected.png
deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.png
deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist
deleted: tests/test.linux/Res/Images/bugs/circle-hd.png
deleted: tests/test.linux/Res/Images/bugs/circle.plist
deleted: tests/test.linux/Res/Images/bugs/circle.png
deleted: tests/test.linux/Res/Images/bugs/corner.png
deleted: tests/test.linux/Res/Images/bugs/edge.png
deleted: tests/test.linux/Res/Images/bugs/fill.png
deleted: tests/test.linux/Res/Images/bugs/picture-hd.png
deleted: tests/test.linux/Res/Images/bugs/picture.png
deleted: tests/test.linux/Res/Images/close-hd.png
deleted: tests/test.linux/Res/Images/close.png
deleted: tests/test.linux/Res/Images/debian.plist
deleted: tests/test.linux/Res/Images/f1-hd.png
deleted: tests/test.linux/Res/Images/f1.png
deleted: tests/test.linux/Res/Images/f2-hd.png
deleted: tests/test.linux/Res/Images/f2.png
deleted: tests/test.linux/Res/Images/fire-grayscale.png
deleted: tests/test.linux/Res/Images/fire.png
deleted: tests/test.linux/Res/Images/fps_images.png
deleted: tests/test.linux/Res/Images/grossini-hd.png
deleted: tests/test.linux/Res/Images/grossini.png
deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr
deleted: tests/test.linux/Res/Images/grossini_dance_01.png
deleted: tests/test.linux/Res/Images/grossini_dance_02.png
deleted: tests/test.linux/Res/Images/grossini_dance_03.png
deleted: tests/test.linux/Res/Images/grossini_dance_04.png
deleted: tests/test.linux/Res/Images/grossini_dance_05.png
deleted: tests/test.linux/Res/Images/grossini_dance_06.png
deleted: tests/test.linux/Res/Images/grossini_dance_07.png
deleted: tests/test.linux/Res/Images/grossini_dance_08.png
deleted: tests/test.linux/Res/Images/grossini_dance_09.png
deleted: tests/test.linux/Res/Images/grossini_dance_10.png
deleted: tests/test.linux/Res/Images/grossini_dance_11.png
deleted: tests/test.linux/Res/Images/grossini_dance_12.png
deleted: tests/test.linux/Res/Images/grossini_dance_13.png
deleted: tests/test.linux/Res/Images/grossini_dance_14.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr
deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng
deleted: tests/test.linux/Res/Images/grossinis_sister1.png
deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister2.png
deleted: tests/test.linux/Res/Images/landscape-1024x1024.png
deleted: tests/test.linux/Res/Images/logo-mipmap.pvr
deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr
deleted: tests/test.linux/Res/Images/menuitemsprite.png
deleted: tests/test.linux/Res/Images/paddle-hd.png
deleted: tests/test.linux/Res/Images/paddle.png
deleted: tests/test.linux/Res/Images/particles-hd.png
deleted: tests/test.linux/Res/Images/particles.png
deleted: tests/test.linux/Res/Images/pattern1.png
deleted: tests/test.linux/Res/Images/piece.png
deleted: tests/test.linux/Res/Images/powered.png
deleted: tests/test.linux/Res/Images/r1-hd.png
deleted: tests/test.linux/Res/Images/r1.png
deleted: tests/test.linux/Res/Images/r2-hd.png
deleted: tests/test.linux/Res/Images/r2.png
deleted: tests/test.linux/Res/Images/snow.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png
deleted: tests/test.linux/Res/Images/spritesheet1.png
deleted: tests/test.linux/Res/Images/stars-grayscale.png
deleted: tests/test.linux/Res/Images/stars.png
deleted: tests/test.linux/Res/Images/stars2-grayscale.png
deleted: tests/test.linux/Res/Images/stars2.png
deleted: tests/test.linux/Res/Images/streak.png
deleted: tests/test.linux/Res/Images/test-rgba1.png
deleted: tests/test.linux/Res/Images/test_blend.png
deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr
deleted: tests/test.linux/Res/Images/test_image.jpeg
deleted: tests/test.linux/Res/Images/test_image.png
deleted: tests/test.linux/Res/Images/test_image.pvr
deleted: tests/test.linux/Res/Images/test_image.pvrraw
deleted: tests/test.linux/Res/Images/test_image_a8.pvr
deleted: tests/test.linux/Res/Images/test_image_ai88.pvr
deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr
deleted: tests/test.linux/Res/Images/test_image_i8.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz
deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr
deleted: tests/test.linux/Res/Images/texture1024x1024.png
deleted: tests/test.linux/Res/Images/texture2048x2048.png
deleted: tests/test.linux/Res/Images/texture512x512.png
deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx
deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png
deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test.png
deleted: tests/test.linux/Res/TileMaps/iso-test.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2.png
deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx
deleted: tests/test.linux/Res/TileMaps/iso.png
deleted: tests/test.linux/Res/TileMaps/levelmap.tga
deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx
deleted: tests/test.linux/Res/TileMaps/ortho-test1.png
deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png
deleted: tests/test.linux/Res/TileMaps/ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx
deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx
deleted: tests/test.linux/Res/TileMaps/tiles-hd.png
deleted: tests/test.linux/Res/TileMaps/tiles.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png
deleted: tests/test.linux/Res/animations/dragon_animation-hd.png
deleted: tests/test.linux/Res/animations/dragon_animation.png
deleted: tests/test.linux/Res/animations/ghosts.plist
deleted: tests/test.linux/Res/animations/ghosts.png
deleted: tests/test.linux/Res/animations/grossini-aliases.plist
deleted: tests/test.linux/Res/animations/grossini-aliases.png
deleted: tests/test.linux/Res/animations/grossini.plist
deleted: tests/test.linux/Res/animations/grossini.plist.xml
deleted: tests/test.linux/Res/animations/grossini.png
deleted: tests/test.linux/Res/animations/grossini.ztp
deleted: tests/test.linux/Res/animations/grossini_blue.plist
deleted: tests/test.linux/Res/animations/grossini_blue.png
deleted: tests/test.linux/Res/animations/grossini_family.plist
deleted: tests/test.linux/Res/animations/grossini_family.png
deleted: tests/test.linux/Res/animations/grossini_gray.plist
deleted: tests/test.linux/Res/animations/grossini_gray.png
deleted: tests/test.linux/Res/app.config.txt
deleted: tests/test.linux/Res/background.mp3
deleted: tests/test.linux/Res/effect1.wav
deleted: tests/test.linux/Res/effect2.ogg
deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf
deleted: tests/test.linux/Res/fonts/Abberancy.ttf
deleted: tests/test.linux/Res/fonts/Abduction.ttf
deleted: tests/test.linux/Res/fonts/Paint Boy.ttf
deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf
deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf
deleted: tests/test.linux/Res/fonts/arial16.fnt
deleted: tests/test.linux/Res/fonts/arial16.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png
deleted: tests/test.linux/Res/fonts/fps_images-hd.png
deleted: tests/test.linux/Res/fonts/fps_images.png
deleted: tests/test.linux/Res/fonts/futura-48.fnt
deleted: tests/test.linux/Res/fonts/futura-48.png
deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt
deleted: tests/test.linux/Res/fonts/konqa32-hd.png
deleted: tests/test.linux/Res/fonts/konqa32.fnt
deleted: tests/test.linux/Res/fonts/konqa32.png
deleted: tests/test.linux/Res/fonts/larabie-16-hd.png
deleted: tests/test.linux/Res/fonts/larabie-16.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png
deleted: tests/test.linux/Res/music.mid
deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist
deleted: tests/test.linux/Res/zwoptex/grossini-generic.png
deleted: tests/test.linux/Res/zwoptex/grossini.plist
deleted: tests/test.linux/Res/zwoptex/grossini.png
CocosDenshion/AndroidDebug/
CocosDenshion/AndroidRelease/
HelloCocos2dx/AndroidDebug/2
HelloCocos2dx/android/assets
HelloCocos2dx/postCompiled.sh
installLinuxLib.sh
2011-08-23 11:28:04 +08:00
d5457526d4
fixed #689 : the width & height of CCRect should big or equal to 0
2011-08-23 10:46:00 +08:00
19244406d6
fixed #689 : assert the width and height of rect is big than 0
2011-08-22 14:55:51 +08:00
cd4a08aa6a
Merge pull request #479 from minggo/iss678
...
fixed #679 : add constructor for CCArray
2011-08-21 20:14:06 -07:00
8f4d47900b
new file: cocos2dx/.cproject
...
new file: cocos2dx/.project
2011-08-21 19:03:46 +08:00
807ae36d6a
CCMutableArray optimization
2011-08-20 01:30:33 +04:00
1f9f1f59d4
fixed #679 : add constructor for CCArray
2011-08-19 16:15:06 +08:00
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
871abb4a32
Merge branch 'master' into LinuxPort
2011-08-19 13:20:23 +08:00
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
5087f6ddb2
[android] fixed #683 : remove unneeded includes
2011-08-18 16:19:36 +08:00
b4ab3f6b75
[android] fixed #683 : remove unneeded includes
2011-08-18 16:18:26 +08:00
1640e48d5a
[android] fixed #683 : let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer
2011-08-18 16:09:49 +08:00
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
a8d87a9976
Non-trivial arguments passed by reference now.
...
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
4244fdb62b
fixed #643 , swap accelerometer input x/y according to the orientation (on ios devices)
2011-08-17 20:11:33 +08:00
e39d551294
fixed #680 : fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed
2011-08-17 15:00:32 +08:00
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
3afe6ebfb2
fixed #638 , add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.
2011-08-16 11:56:17 +08:00
0881668cc2
fixed #661 . Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well
2011-08-15 12:10:11 +08:00
2eafb827cf
avoid memory leaking from lua script module
2011-08-14 17:26:51 +08:00
f47df23363
Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661
...
Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h
2011-08-11 20:47:54 -07:00
4aa33b0942
Merge pull request #463 from minggo/master
...
fixed #668
2011-08-10 19:32:44 -07:00
6d3941ebc1
Merge pull request #464 from leon-li/master
...
fix some warnings under xcode 4.0 llvm clang
2011-08-10 19:32:16 -07:00
771e2349c5
fix some warnings under xcode 4.0 llvm compiler
2011-08-10 22:39:02 +08:00
9a884ffda6
[iOS] fixed #668 : CCLabelBMFont looks ok in retina mode
2011-08-10 15:07:34 +08:00
6eba0b658f
fixed #651 , add CCFileUtils to doxygen api document
2011-08-08 23:05:47 +08:00
2b5635898a
fixed #665 : add test of RenderTextureSave
2011-08-08 14:06:03 +08:00
7a0e8b4a0a
Merge pull request #457 from minggo/iss642
...
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-07 20:08:16 -07:00
41ea2e98a1
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-08 11:01:47 +08:00
70e19d7245
fixed #347 fixed 'AddFontResource' path error!
2011-08-08 10:32:21 +08:00
976d886263
Merge pull request #455 from giom/master
...
Lua AddSearchPath issue #647
2011-08-05 18:43:44 -07:00
2d5a04b9ca
Merge pull request #454 from flyingpacer/608
...
fixed #608 rendertexture disappears after going to background
2011-08-04 23:55:26 -07:00
dd43f16c8e
fixed #622 : add comment of CCUserDefault
2011-08-05 11:02:42 +08:00
5f08bb24fe
Merge branch 'master' into 608
2011-08-05 10:59:40 +08:00
016c463659
Merge pull request #449 from flyingpacer/savecrash
...
fixed #657 Latest git version was broken
2011-08-04 02:39:33 -07:00
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
4745b85af9
fixed #657 Latest git version was broken
2011-08-04 16:37:43 +08:00
bbc4bbeb6c
issue #347 lost [] in 'delete array'
2011-08-04 13:47:21 +08:00
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
78ffea3049
Merge pull request #443 from natural-law/master
...
fixed #513
2011-08-02 23:35:35 -07:00
6892787afa
fixed #653 : add CCScheduler::unscheduleScriptFunc()
2011-08-03 14:15:35 +08:00
3a80e51d25
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-03 11:39:03 +08:00
94f2d8a5e2
fixed #513 , CCProgressTimer support sprite generated from CCSpriteFrame.
2011-08-03 11:38:38 +08:00
78642a39ac
[android] fixed #652 : refactor JniHelper::jstringtochar()
2011-08-03 10:44:39 +08:00
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
90f403d8a2
Merge pull request #441 from liswei/issue347
...
issue #347 add ttf support in wophone
2011-08-02 03:16:06 -07:00
188b168d30
issue #347 add ttf support in wophone
2011-08-02 18:02:27 +08:00
4a8e3f468e
fixed #649 the user could save any domain of the render texture
2011-08-02 17:22:57 +08:00
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
3a3a52c59a
fixed #649 the user could save any domain of the render texture
2011-08-02 14:25:58 +08:00
730ff63c9f
rename scene to node
2011-08-02 14:09:23 +08:00
c4d1dedba8
Merge https://github.com/reflog/cocos2d-x into reflog
2011-08-02 14:03:34 +08:00
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
9a86582cd2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-02 11:06:47 +08:00
d6221cfa36
Use the setter to set the value of m_tAnchorPoint.
2011-08-02 11:02:02 +08:00
d575d40ab3
fixed #648 savebuffer may crash on some machines like Motorola Defy
2011-08-02 10:27:52 +08:00
335d2d30b4
fixed #648 savebuffer may crash on some machines like Motorola Defy
2011-08-02 10:05:15 +08:00
f86da27a38
Merge branch '0.9.0'
2011-08-02 03:49:36 +08:00
b789927ca3
added possibility to add a path to the lua search path (package.path/LUA_PATH)
2011-08-02 03:47:39 +08:00
63839de12a
Merge https://github.com/cocos2d/cocos2d-x into iss347
2011-08-01 18:23:14 +08:00
895d4992e4
issue #347 : FontTest runs ok on iOS
2011-08-01 18:22:47 +08:00
5b0f25466a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-08-01 10:45:40 +08:00
bf44d13bc9
fixed #644 , m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked.
2011-08-01 10:44:18 +08:00
52df611822
Merge pull request #434 from flyingpacer/641
...
fixed #641 the user could save buffer to any path
2011-07-31 18:20:28 -07:00
41bdb281dc
corrected bug and leak in getBool
2011-07-31 15:31:39 +03:00
af61a7c650
added support for optional default values in CCUserDefault getters
2011-07-31 15:08:25 +03:00
9c5fa51e6b
usuful macros for defining scene() and node() methods with params
2011-07-30 11:55:38 +03:00
b2dce6ab80
Merge remote-tracking branch 'upstream/master'
2011-07-30 09:32:44 +03:00
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
a54fda812b
fixed #641 the user could save buffer to any path
2011-07-29 11:36:04 +08:00
cfb3765035
issue #347 : iOS support font defined by ttf file
2011-07-29 10:15:10 +08:00
d37a694529
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/platform/CCImage.cpp
2011-07-29 09:51:43 +08:00
5ad318fa71
Resolve the cocos2d compile error on wophone.
2011-07-29 09:50:06 +08:00
87f0b6c63f
Merge pull request #431 from flyingpacer/640
...
fixed #640 the image read from render texture is upseted
2011-07-28 18:42:14 -07:00
41ec0ba945
modification to support radio menu
2011-07-28 22:18:45 +03:00
ae945f4880
changes to support CCScrollLayer
2011-07-28 17:09:06 +03:00
50038b7cc2
Merge https://github.com/cocos2d/cocos2d-x into iss347
2011-07-28 18:06:20 +08:00
c7aa948817
fixed #640 the image read from render texture is upseted
2011-07-28 18:02:25 +08:00
c1fdf9afb5
issue #608 rendertexture disappears after going to background
2011-07-28 17:32:09 +08:00
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
a7404dc2bf
fixed #639 , Initialize the m_tPosition of CCParticleSystem with the setter.
2011-07-28 16:16:51 +08:00
d4db9eb566
fixed #636 , Modify the implementation of method CCTextureCache::textureForKey().
2011-07-28 15:08:07 +08:00
a8e4d5ea89
rename CCMenu::menu() -> CCMenu::node()
2011-07-28 14:24:24 +08:00
4c06cb853b
Merge remote branch 'upstream/master'
2011-07-28 12:27:07 +08:00
0f94423b9b
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:52:09 +08:00
4510101e96
add CCMenu::init() and CCMenu::menu() to create empty menus
2011-07-28 10:45:32 +08:00
aec1ddc4b4
Merge branch 'master' into 630
2011-07-28 10:10:47 +08:00
eda6228374
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:09:56 +08:00
a253909030
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-27 16:55:04 +08:00
8afa3a9be1
fixed #619 CCFadeTo may crashed on android
2011-07-27 16:21:00 +08:00
33e85bdc53
Merge pull request #421 from leon-li/master
...
add CCMenuItem::setTarget
2011-07-26 18:48:24 -07:00
c5f7036f7b
add CCMenuItem::setTarget
2011-07-26 18:41:58 +08:00
1e8e036da7
issue #633 add playeffect loop in wophone
2011-07-26 17:04:39 +08:00
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
20bba80c73
Merge remote branch 'origin/master'
2011-07-25 15:02:41 +08:00
059e5ebc0b
add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak
2011-07-25 15:00:00 +08:00
ab4ef0f180
Merge https://github.com/cocos2d/cocos2d-x into iss623
2011-07-25 14:13:20 +08:00
b105b6005e
[android] fixed #623 : refactor Cocos2dJni.cpp
2011-07-25 14:12:30 +08:00
9ce402655d
Merge remote branch 'upstream/master'
2011-07-24 12:24:16 +08:00
864878d15a
fix warning on android
2011-07-24 12:16:40 +08:00
b43d233c08
issue #629 , pass eImgFmt param to initWithImageData. But still haven't add test case for this.
2011-07-24 09:04:08 +08:00
45e8915963
fixed #628 , CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)
2011-07-24 08:30:49 +08:00
62ea6a2d46
issue #623 : create JniHelper and use it somewhere
2011-07-22 18:14:29 +08:00
0dac01b3d8
Merge pull request #409 from natural-law/master
...
fixed #621
2011-07-20 00:43:02 -07:00
36a1f574b3
Merge pull request #408 from minggo/iss620
...
[win32] fixed #620 : change the output of lua to a lib
2011-07-20 00:40:53 -07:00
32e7ee6e2f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-20 15:35:52 +08:00
6a8b563feb
fixed #621 , Add Texture2dTest in tests project.
2011-07-20 15:35:20 +08:00
3e080476f3
[win32] fixed #620 : change the output of lua to a lib
2011-07-20 15:21:51 +08:00
6996ccee95
Merge pull request #407 from leon-li/master
...
fix: passing std::string object to CCLOG
2011-07-19 20:42:29 -07:00
6426e96f82
Merge remote branch 'upstream/master'
2011-07-20 11:42:00 +08:00
5f1f63dabf
fix: passing std::string object to CCLOG
2011-07-20 08:52:29 +08:00
0c495628ea
Merge pull request #405 from minggo/iss618
...
invoke java code(System.exit()) to finish programe
2011-07-19 02:20:36 -07:00
d2d02e0c52
fix compile error with android-ndk-r6
2011-07-19 16:54:42 +08:00
d2b44a203f
issue #536 , build success on win32
2011-07-19 16:03:42 +08:00
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
768bfa9a9b
issue #536 , add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet.
2011-07-19 15:22:13 +08:00
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
7a12bb9cdc
fixed #613 : Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate()
2011-07-18 10:31:41 +08:00
a3e9679578
fixed #611 : add some functions for lua
2011-07-18 10:18:36 +08:00
29efe9bd39
Merge pull request #402 from minggo/iss615
...
fixed #615 : CCLog may crash when invoke lua function
2011-07-17 18:40:23 -07:00
9bbab7897a
fixed #615 : CCLog may crash when invoke lua function
2011-07-14 17:52:56 +08:00
0817d59edf
Merge pull request #401 from minggo/master
...
[android] fixed #609 : retain & release obj in CCSet
2011-07-14 02:27:56 -07:00
4694926edb
[android] fixed #609 : retain & release obj in CCSet
2011-07-14 15:32:11 +08:00
dd42936bb3
[android] fixed #610 : remove the support of ndk-r4
2011-07-14 10:37:40 +08:00
fe3aadf800
update to 1.0.0 07-12
2011-07-13 10:20:24 +08:00
faa1c8ee16
Merge pull request #393 from minggo/master
...
[win32] modify for vs2010
2011-07-12 03:09:44 -07:00
760ec3201e
[win32] modify for vs2010
2011-07-12 18:05:44 +08:00
48420dca0c
fixed #605 , add CC_DLL to pure C methods in CCNS.h
2011-07-12 17:10:10 +08:00
935051a363
set gl perspctive project
2011-07-12 16:04:13 +08:00
8b5282a0cf
fixed #603 , The test case TMXGIDObjectsTest in TileMapTest not crash any more.
2011-07-12 14:21:29 +08:00
51b751aade
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-12 11:26:28 +08:00
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
d3960a13df
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-12 10:36:30 +08:00
3d24fc5be4
fixed #606 , Resolve the wrong effect of the test case PageTransitionForward in TransitionsTest.
2011-07-12 10:36:07 +08:00
eb675073ee
remove inline to comiple ok on android
2011-07-11 16:36:19 +08:00
ae3dd1f497
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
2011-07-11 15:33:53 +08:00
c8f5f703a5
to commit LuaCocos2d.cpp
2011-07-11 15:33:27 +08:00
76d15b8767
Merge pull request #379 from minggo/master
...
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
2011-07-11 00:30:54 -07:00
60bf07b859
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
2011-07-11 15:25:02 +08:00
fcbe0443be
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
2011-07-11 15:16:29 +08:00
a64783d4d2
fix the usage of sort()
2011-07-11 10:12:29 +08:00
1bdce00740
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/ccConfig.h
2011-07-08 17:08:57 +08:00
a1531cd478
Merge pull request #369 from flyingpacer/master
...
fix #592
2011-07-08 01:59:36 -07:00
6c37f42414
Merge pull request #368 from minggo/master
...
fixed #586
2011-07-08 01:46:54 -07:00
cba538d5d0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-08 15:58:14 +08:00
de7150214c
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
2011-07-08 15:40:27 +08:00
7b74372cac
fix #592
2011-07-08 15:38:32 +08:00
39a3b715cd
fixed #589
2011-07-08 15:28:13 +08:00
810cf3f8c3
fixed #591
2011-07-08 15:02:46 +08:00
f0ea58651b
fixed #586
2011-07-08 15:01:51 +08:00
5c8b04bc25
fixed #585
2011-07-08 14:48:25 +08:00
134a3a0fcf
fixed #590
2011-07-08 14:32:09 +08:00
db6a5fce23
fixed #588 .
2011-07-08 14:16:10 +08:00
5db1719302
fixed #587
2011-07-08 14:15:51 +08:00
90564fac49
[airplay] fix : incorrect calculation of the bit depth
2011-07-07 08:40:29 -07:00
b0416adaf2
Merge pull request #364 from minggo/master
...
upgrade to rc3
2011-07-07 01:06:27 -07:00
96289b20c4
upgrade to rc3
2011-07-07 16:03:03 +08:00
ae466898b0
Merge pull request #363 from minggo/master
...
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
2011-07-07 00:49:31 -07:00
b08788d810
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
2011-07-07 15:41:42 +08:00
94ac50bad0
fixed #582 , use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.
2011-07-07 14:45:59 +08:00
8e370eeb10
fix some compiling warnings
2011-07-07 11:27:45 +08:00
2bc8427b3c
Resolve the bug of some particle test cases can't be shown.
2011-07-07 11:02:47 +08:00
348a05a329
fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference
2011-07-07 08:23:31 +08:00
72dfb3f919
fixed #576 , replace std::string to _KeyT in CCMutableDictionary class template
2011-07-07 08:19:29 +08:00
3dc1967f6c
fixed #579 : change zorder to int
2011-07-06 20:48:56 +08:00
e56547b9f5
fixed #580 : use int or it will loop for ever
2011-07-06 19:54:25 +08:00
6cb945a8ca
fix bug of particle_node when upgrade to rc3
2011-07-06 18:16:19 +08:00
f894e00f27
fix a bug of CCProgressTimer when upgrade to rc3
2011-07-06 16:29:56 +08:00
980ce79ead
[android] fixed #577 : init member variable to default value
2011-07-06 15:22:25 +08:00
59ed71df03
Merge pull request #353 from minggo/master
...
upgrade to 1.0.0-rc3
2011-07-06 00:02:45 -07:00
ff50997eb0
issue #574
2011-07-06 14:56:05 +08:00
ac700583cc
fixed #573 , init m_tColor & m_tBlendFunc in CCLayerColor constructor
2011-07-05 15:39:50 +08:00
7603665165
fix merging confict of CCDirector.cpp
2011-07-05 14:54:41 +08:00
7adb140439
fixed #568
2011-07-05 14:51:17 +08:00
2b963060ab
Merge pull request #352 from natural-law/master
...
fixed #563
2011-07-04 22:56:40 -07:00
12aa33e0ee
fix an unsafe call in CCDirector::isOpenGLAttached(). Thanks to Ben Smith http://www.cocos2d-x.org/boards/6/topics/2092
2011-07-05 12:13:07 +08:00
6c95a3190f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-05 12:05:43 +08:00
7107c6612b
fixed #563 , Upgrade folder support to rc3.
2011-07-05 12:05:19 +08:00
ad3bad964f
fixed #567
2011-07-05 11:36:46 +08:00
0d80326392
fixed #564 : upgrade textures to 1.0.0-rc3
2011-07-05 10:47:25 +08:00
James Chen