James Chen
6be44ad7b0
fixed #1279 : NodeNonOpaqueTest can't be shown correctly.
2012-05-30 18:30:11 +08:00
James Chen
93d1879a56
fixed #1277 : CCToggleVisibility should implement copyWithZone.
2012-05-30 16:34:42 +08:00
James Chen
5b4495d982
Opened assert for CCTexture2D::setTexParameters and generateMipmap.
2012-05-30 16:26:47 +08:00
James Chen
bd248b5ac0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-05-30 16:09:52 +08:00
James Chen
7115a7f3c9
issue #1275 : Memory leaks in CCBReader and ActionsTest.
2012-05-30 16:09:19 +08:00
minggo
80389d0611
Merge pull request #941 from minggo/gles20
...
fix some bugs
2012-05-30 00:44:22 -07:00
minggo
4428810fd5
fixed some bugs
2012-05-30 15:42:29 +08:00
James Chen
b662784730
Merge pull request #940 from dumganhar/gles20
...
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest.
2012-05-29 23:31:36 -07:00
James Chen
265cb135ad
fixed #1273 : Passed 'this' to unscheduleSelector rather than 'g_sharedTextureCache'.
2012-05-30 14:27:30 +08:00
James Chen
895de701ba
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat.
2012-05-30 14:24:59 +08:00
minggo
07c46bb445
fixed #1266 : use flag O_CREAT when creating named semaphore
2012-05-30 11:21:36 +08:00
James Chen
228bc1e044
fixed #1240 : Updated vs2010 project setting.
2012-05-29 17:50:27 +08:00
James Chen
ad50d6ee57
fixed #1270 : Fixed some warning on win32.
2012-05-29 17:11:33 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
c1cb8b0e24
fixed #1177 : Updated Android.mk.
2012-05-29 15:56:08 +08:00
James Chen
6e2c257e43
fixed #1177 : Updated win32 project configuration.
2012-05-29 15:52:38 +08:00
James Chen
5f5af82254
fixed #1177 : Moved CCStdC.h/.cpp to relevant platform folder.
2012-05-29 15:51:13 +08:00
James Chen
94701d9315
fixed #1268 : Testjs will crash after clicking the close button on win32.
...
Also, fixed a bug in CCTextureCache::~CCTextureCache().
2012-05-29 15:23:16 +08:00
Jeff Reitman
821c3933b4
Merge branch 'gles20' into rw_fixes
2012-05-28 07:27:36 -07:00
Jeff Reitman
6c5f309180
Revert "* add ability to disable denshion in lua mode"
...
This reverts commit b7746882f7
.
2012-05-28 07:24:20 -07:00
James Chen
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
James Chen
785c3c5d60
fixed 1240# : Added static libraries of tiff for android.
2012-05-28 16:05:52 +08:00
James Chen
6e59d5eab4
fixed #1264 : CCLabelTTF: wrong string alignment when using utf-8 encoded text.
2012-05-28 14:27:32 +08:00
James Chen
99dcb4de86
issue #1263 : Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments.
2012-05-28 14:14:19 +08:00
James Chen
1b7cc47a34
issue #1263 : Removed unused files. Fixed an issue in uthash.h.
2012-05-28 13:59:18 +08:00
Jeff Reitman
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
Jeff Reitman
b7746882f7
* add ability to disable denshion in lua mode
2012-05-27 11:03:45 -07:00
James Chen
330b019361
Added jstest project for vs2008.
2012-05-27 22:53:48 +08:00
James Chen
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
James Chen
6477a02022
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff
2012-05-25 11:00:20 +08:00
James Chen
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
Walzer
df98ed4792
Merge pull request #914 from walzer/gles20
...
javascript binding!
2012-05-24 03:48:14 -07:00
Walzer
1e732930b7
fixed #1258 , testjs and spidermonkey-ios is merged. But only test_actions.js works.
2012-05-24 17:48:05 +08:00
minggo
c258e1e43a
fixed #1247 : add profile lib
2012-05-24 17:47:46 +08:00
James Chen
e5443d22c1
issue #1240 : Added libtiff for android.
2012-05-24 12:00:06 +08:00
minggo
138de3171f
Merge pull request #912 from minggo/merge_nicolasgramlich
...
Merge pull request by nicolasgramlich
2012-05-23 19:56:05 -07:00
minggo
0ba62c3854
issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp
2012-05-24 10:48:39 +08:00
James Chen
6a37158100
issue #1240 : Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format.
2012-05-23 18:20:51 +08:00
James Chen
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
James Chen
ea48413d2d
fixed #1253 : Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak.
2012-05-23 12:11:53 +08:00
James Chen
c7359ba1a0
fixed #1252 : Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.
2012-05-23 11:57:43 +08:00
James Chen
d5f52335d5
fixed #1224 : Wrote some comments in CCParticleSystem.
2012-05-23 11:26:21 +08:00
James Chen
f7ffdd757c
fixed #1244 : deleted unused method "release" of CCImage class.
2012-05-23 11:22:17 +08:00
James Chen
d998b54269
fixed #1224 : Memory leak in CCParticleSystem::initWithDictionary()
2012-05-23 11:18:04 +08:00
Nicolas Gramlich
d69bc23894
Initial version of CCBReader reading ccbi format. (Only reads and checks the header so far).
2012-05-22 17:38:33 -07:00
Nicolas Gramlich
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
Nicolas Gramlich
320b181dbf
CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF.
2012-05-21 17:20:47 -07:00
Walzer
9ee1b32c26
Merge pull request #903 from walzer/gles20
...
add CCBReader_v2.cpp in vcproj & vcxproj
2012-05-21 02:58:59 -07:00
Walzer
9ac0b68981
modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj.
2012-05-21 17:56:09 +08:00
minggo
683c91bbfa
fixed #1236 : return empty string when parameter is null
2012-05-16 14:17:37 +08:00
minggo
1d18c6607a
fixed #1237 : correct line number output by CCAssert
2012-05-16 14:10:27 +08:00
Walzer
a3bd26a52b
modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk
2012-05-11 22:40:31 +08:00
Walzer
d6dde5a5ee
move kBottomLeft series enum from CCNode.h to CCBReader.h
2012-05-11 21:10:02 +08:00
Walzer
dc18dc0942
test ccb v2 format, add relative-position support
2012-05-11 20:53:30 +08:00
Walzer
ae12434128
fixed #1205 , rename CCCustomClass to CCCustomClassProtocol, add windows support.
2012-05-08 11:30:08 +08:00
Walzer
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
Walzer
a91032ccb5
Merge commit 'e895a2a1e8109381329d7cd8e29c780b73643351' into gles20
2012-05-07 18:15:16 +08:00
Walzer
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
minggo
5388e9c863
fixed #1232 : don't do type cast
2012-05-07 17:15:32 +08:00
Walzer
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
minggo
ff6abd1d8c
fixed #1230 : fix a bug in calculating string width
2012-05-07 10:15:57 +08:00
Walzer
07276c3bba
Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20
2012-05-05 15:49:11 +08:00
Walzer
184b31efa3
fix compilation warnings on android & ios
2012-05-05 10:44:42 +08:00
Walzer
6b374881f0
Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20
2012-05-05 10:07:21 +08:00
Walzer
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
Walzer
be2fa353a7
Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20
2012-05-05 09:55:06 +08:00
minggo
1afd7f2701
Merge pull request #893 from minggo/iss1217_EaseAction_reverse
...
Iss1217 ease action reverse
2012-05-04 01:26:56 -07:00
minggo
14b923409a
fixed #1217 : implement reverse() for all subclass of CCEaseAction that missing it
2012-05-04 16:22:50 +08:00
James Chen
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
James Chen
47b8148064
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template
2012-05-04 02:08:31 +08:00
minggo
27b5fb8074
merge commit of issue 1216
2012-05-03 16:30:13 +08:00
Walzer
a584aee897
issue #1205 update license declaration
2012-05-03 15:33:22 +08:00
Walzer
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
James Chen
7cdb11b668
fixed #1215 : fixed a bug in retina support for win32.
2012-05-03 15:05:19 +08:00
Walzer
2fc1322cc8
update copyright and license declaration of CCCBReader relative files
2012-05-03 14:43:27 +08:00
Walzer
5faaab0d16
add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor
2012-05-03 12:17:28 +08:00
Walzer
160b0aba88
Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20
2012-05-03 12:02:13 +08:00
Walzer
9e62412ce9
issue #1205 , add CCBReader, CppReflection, CocosBuilderTestCase
2012-05-03 11:58:53 +08:00
James Chen
b6a1e89aa5
fixed #1211 : Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file.
2012-05-03 11:09:27 +08:00
James Chen
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
James Chen
ca5ef69d50
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
2012-05-02 18:44:30 +08:00
minggo
4bcf67078d
fixed #1201 : add prebuilt libs
2012-05-02 18:37:37 +08:00
James Chen
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
James Chen
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
James Chen
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
minggo
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
James Chen
db92c9c1dc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 14:32:27 +08:00
James Chen
a998062c57
issue #1194 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.
2012-05-02 12:04:27 +08:00
minggo
741f219f16
issue 1201: remove module to prebuilt
2012-05-02 10:45:21 +08:00
minggo
57d6884757
rename modules to prebuilt
2012-05-02 10:44:40 +08:00
Walzer
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
James Chen
de35aaa101
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 09:49:12 +08:00
minggo
cbfe1e0d0c
optimize CCTextureCache::removeUnusedCache()
2012-04-28 11:34:13 +08:00
James Chen
9886f281ee
issue #1191 : Updated win32 project files.
2012-04-27 18:50:55 +08:00
James Chen
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
minggo
a4e8c9ad17
fixed #931 : refactor CCImage and CCTexture2D
2012-04-27 18:37:11 +08:00
minggo
a1570e931f
issue #931:make convert to rgb565 and A8 correct
2012-04-27 15:53:29 +08:00
James Chen
fd08f9852b
issue #1194 : Added some files refer to TextureWatcher.
2012-04-27 12:00:54 +08:00
James Chen
2bffd3a565
issue #931 : dynamically allocate array(row_pointers) in CCImage::_initWithPngData.
2012-04-26 18:17:57 +08:00
minggo
602d34ec78
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-04-26 17:36:59 +08:00
minggo
7ecbd8ea6c
issue #931 : refactor CCImage and CCTexture2D
2012-04-26 17:36:32 +08:00
James Chen
ceb5b122b0
fixed #1190 : closed CC_LUA_ENGINE_DEBUG by default.
2012-04-26 14:37:28 +08:00
James Chen
f5ffe8249e
issue #1190 : Updated ios lua project.
2012-04-26 13:05:05 +08:00
James Chen
8d63e9f1bd
issue #1190 : Updated some files for android port.
2012-04-26 11:52:21 +08:00
James Chen
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
James Chen
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
James Chen
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
James Chen
a5f0bc3cbc
fixed #1189 : syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes
2012-04-25 18:08:23 +08:00
James Chen
568bdce6c1
fixed #1188 : Removed some unused files.
2012-04-25 17:46:29 +08:00
James Chen
8e5668472f
issue #1188 : Updated project configuration for ios platform.
2012-04-25 17:33:28 +08:00
James Chen
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
James Chen
e8b826b7a6
fixed #1187 : spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test.
2012-04-25 10:55:59 +08:00
James Chen
062ae1756d
fixed #1177 : updated project configuration for android and ios platforms.
2012-04-24 17:35:36 +08:00
James Chen
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
James Chen
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
minggo
1e20f2b6db
fixed #1185 : reload image data and recreate buffer of object when backing to foreground
2012-04-24 15:02:18 +08:00
James Chen
5e0682ed77
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
2012-04-23 15:41:01 +08:00
James Chen
af86a52f27
issue #1177:Updated some files for ios port.
2012-04-23 15:40:46 +08:00
James Chen
8fd3518160
issue #1177 : fixed a bug about retina in CCDirector.
2012-04-23 15:38:02 +08:00
James Chen
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
James Chen
24515f009e
issue #1177 : Updated ios project configuration.
2012-04-23 14:35:41 +08:00
James Chen
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
James Chen
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
James Chen
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
James Chen
d1d0fd619a
issue #1177 : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.
2012-04-20 15:23:00 +08:00
minggo
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
James Chen
dbeb7423ad
Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor
2012-04-19 17:53:15 +08:00
James Chen
f619c3e006
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor
...
Conflicts:
cocos2dx/misc_nodes/CCRenderTexture.cpp
2012-04-19 17:51:58 +08:00
minggo
4e4a26a2db
Merge pull request #855 from minggo/iss1150_rendertexture_crash
...
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 02:05:04 -07:00
minggo
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +08:00
James Chen
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
James Chen
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
James Chen
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
James Chen
a950238d1e
updated some files.
2012-04-18 18:45:21 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
e673bfae90
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.
2012-04-18 13:58:24 +08:00
James Chen
c501255a7a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt
2012-04-18 09:40:08 +08:00
James Chen
f8dfe1fca0
issue #1114 : Updated ShaderTest.Added ShaderBlur.
2012-04-17 18:31:31 +08:00
minggo
4d2e2d7183
fixed #1139 : remove unneeded codes
2012-04-17 18:03:48 +08:00
minggo
7750664f8b
fixed #1139 : re add preprocess macro
2012-04-17 18:01:15 +08:00
minggo
cfdc5edf87
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black
2012-04-17 17:55:59 +08:00
minggo
04c0d794af
fixed #1139 : fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 17:55:26 +08:00
James Chen
75da752aa9
issue #1114 : fixed some memory leaks in CCControlExtension.
2012-04-17 17:14:59 +08:00
James Chen
14c10a470a
Updated project configuration for android platform.
2012-04-17 16:41:07 +08:00
James Chen
a215b037b2
fixed a bug in CCControlSwitch.cpp
2012-04-17 16:39:00 +08:00
James Chen
5ce950b961
fixed a memory leak in CCControl.
2012-04-17 16:37:04 +08:00
James Chen
92e44f1c78
Updated ios project configuration.
2012-04-17 16:14:32 +08:00
James Chen
413bc3c343
Finished CCControlSwitch.Added CCActionTween.
2012-04-17 16:00:18 +08:00
James Chen
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
James Chen
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
James Chen
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
James Chen
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
James Chen
0af443a56f
issue #1166 : Checked whether memory is allocated successfully in CCString::initWithFormatAndValist function.
2012-04-16 14:27:49 +08:00
James Chen
be129913a8
issue #1166 : Updated the project configuration for VS2010, android, ios port.
2012-04-16 13:02:44 +08:00
James Chen
a71e5be0d8
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
...
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
2012-04-16 12:45:47 +08:00
James Chen
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
James Chen
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
Phenix Yu
ebc7106164
Merge branch 'gles20' of https://github.com/jbyu/cocos2d-x into gles20
2012-04-15 15:46:16 +08:00
Phenix Yu
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
James Chen
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
phenix.yu
5d9c44f897
add project for iOS
2012-04-14 18:19:30 +08:00
Phenix Yu
61a7ca71c5
fixed getContentSize pass by reference issue
...
update project setting for release mode
2012-04-14 17:13:38 +08:00
James Chen
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
James Chen
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
minggo
34c805590f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director
2012-04-13 14:11:58 +08:00
minggo
b43d5aa654
fixed #1156 syn CCDirector
2012-04-13 14:11:35 +08:00
James Chen
94e056d964
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-13 14:09:02 +08:00
minggo
a20f3fe638
remove unneeded codes
2012-04-13 11:57:25 +08:00
minggo
9bbac0d33d
issue #1156 : remove unneeded macros and functions
2012-04-13 11:45:41 +08:00
James Chen
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
minggo
028cf7874e
issue #1156 : remove unneeded macros and functions
2012-04-13 11:22:17 +08:00
Phenix Yu
1ed6df9de8
add pixel format I8
2012-04-12 20:44:50 +08:00
Phenix Yu
247bf08d98
fixed content size issue for retina
2012-04-11 19:27:34 +08:00
Phenix Yu
ab8af9e04c
retina for win32
2012-04-11 16:41:12 +08:00
James Chen
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
Phenix Yu
b8e6d9c589
fixed memory leak from CCGLProgram.cpp
...
enable retina for win32
2012-04-11 11:15:53 +08:00
James Chen
2b5af66974
updated win32 projects configuration release version.
2012-04-10 23:09:58 +08:00
James Chen
6823704a46
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 18:17:08 +08:00
James Chen
2885664c85
fixed #1136 : Fixed some bugs as follows:
...
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
2012-04-10 17:17:24 +08:00
James Chen
137679d369
Fixed a bug in CCFileUtils::dictionaryWithContentOfFile.
2012-04-10 16:32:53 +08:00
James Chen
8271fdd95b
Initialize m_sString pointer.
2012-04-10 15:24:06 +08:00
James Chen
22052db4bd
Fixed a memory leak in CCLabelBMFont.cpp.
2012-04-10 15:14:55 +08:00
James Chen
5ad6c38500
Fixed two memory leaks in CCArray::copyWithZone and CCDictionary::copyWithZone.
2012-04-10 15:01:29 +08:00
James Chen
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
James Chen
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
James Chen
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
James Chen
baa27540a0
Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage.
2012-04-09 09:55:06 +08:00
Phenix Yu
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
minggo
4c61035231
return correct content size
2012-04-08 22:37:58 +08:00
minggo
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
minggo
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
minggo
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
minggo
75d6972da8
remove unneeded macros
2012-04-08 14:26:50 +08:00
minggo
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
James Chen
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
James Chen
64665fe7c8
issue #1094 : Make ParticleBatchNode works on win32.
2012-04-07 12:02:40 +08:00
Walzer
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
James Chen
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
James Chen
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
James Chen
2b17a7276c
issue #1056 : Updated CCTextureAtlas.cpp
2012-03-29 14:33:50 +08:00
James Chen
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
James Chen
a0520d8f27
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 11:25:57 +08:00
James Chen
56d5c496e9
issue #1056 : Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.
2012-03-29 11:25:08 +08:00
James Chen
c759f29d76
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 10:11:42 +08:00
James Chen
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
James Chen
a626271b06
issue #1056 : Made setupVBO as CCTextureAtlas's member function.
2012-03-28 22:01:12 +08:00
James Chen
bb7485621e
issue #1056 : Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
2012-03-28 21:44:28 +08:00
James Chen
3d63f9c58e
issue #1056 : Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.
2012-03-28 17:51:26 +08:00
James Chen
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
James Chen
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
James Chen
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
James Chen
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
James Chen
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
James Chen
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
James Chen
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
James Chen
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
James Chen
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
James Chen
900de7328a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 18:29:26 +08:00
James Chen
c5d0b1ca6f
issue #1056 : Updated ParticleTest.
2012-03-22 18:29:07 +08:00
minggo
a8eaf85cfb
Merge pull request #804 from minggo/RenderTextureTest
...
Rendertexturetest
2012-03-22 01:37:58 -07:00
minggo
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
James Chen
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
James Chen
fc2fd4d353
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 09:46:23 +08:00
James Chen
59393c2fef
issue #1056 : Update CCLabelBMFont.
2012-03-22 09:46:07 +08:00
James Chen
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
James Chen
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
James Chen
6f4a01f454
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 17:35:39 +08:00
James Chen
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
minggo
6242656049
issue #1506 : fix a confict
2012-03-21 17:23:33 +08:00
minggo
92c30a328e
issue #1506 : implement ShaderTest
2012-03-21 17:02:52 +08:00
James Chen
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
James Chen
8ef5e4ae3b
issue #1056 : Update the configuration of ios project.Sort the the project folder.
2012-03-21 11:07:31 +08:00
James Chen
00a81f5bd0
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-21 10:43:54 +08:00
James Chen
02ae04c1d6
issue #1056 : Modified the configuration of ios project.
2012-03-21 10:41:21 +08:00
James Chen
bb4d7c2f88
issue #1056 : Updated some files for ios platform. Added some 'TODO'.
2012-03-21 10:36:20 +08:00
James Chen
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
James Chen
7c0af610ff
issue #1056 : Added CCArray::copyWithZone implementation. CCDictElement bound check.
2012-03-20 23:30:18 +08:00
James Chen
15e03f8b14
issue #1056 : Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
...
Update CCDICT_FOREACH implementation.
2012-03-20 21:08:52 +08:00
James Chen
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
minggo
382e4e7eb8
issue #1056 : modify code according new code after pull
2012-03-20 17:27:06 +08:00
minggo
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
minggo
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
James Chen
ae2b3307fa
Merge pull request #779 from dumganhar/iss1056_CCDict
...
issue #1056 : Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 00:07:58 -07:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
minggo
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +08:00
James Chen
9203b60fb0
add CCDictionary based on UTHASH, improve the performance.
2012-03-19 14:53:44 +08:00
James Chen
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
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
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
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
303818ef6d
issue #1056 : Update CCGLProgram.
2012-03-15 10:54:07 +08:00
James Chen
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +08:00
James Chen
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
James Chen
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
James Chen
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +08:00
James Chen
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
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
Paolo Giangrandi
4f2f403827
Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp
2012-03-12 14:22:48 +01:00
Paolo Giangrandi
7820be7841
Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}
2012-03-12 14:22:39 +01:00
James Chen
bd59979495
add gles2.0 libraries for win32.
...
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
2012-03-12 15:22:03 +08:00
minggo
cc7542a86b
Merge pull request #766 from assoulter/master
...
Fix m_nEntryID typo
2012-03-11 20:06:24 -07:00
minggo
7fc0ffbf26
fixed #737 : remove view id
2012-03-12 11:00:12 +08:00
Anton Rusanov
8e53d9db9f
fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG
2012-03-12 00:59:03 +04:00
Wartortle
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
minggo
7dfe4224e1
Merge pull request #756 from dualface/fix-lua-engine-bugs
...
fixed #1030 : Improve Lua engine
2012-03-07 21:42:35 -08:00
minggo
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
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
Liao YuLei
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
James Chen
c91fd243dc
Update cocos2dx/include/CCString.h
2012-03-07 16:15:26 +08:00
James Chen
2564f39eb8
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file
2012-03-07 16:13:16 +08:00
James Chen
00745ae172
fixed #1022 : add the comment for CCString::stringWithContentsOfFile.
2012-03-07 16:12:46 +08:00
minggo
a0f0971782
fixed #1017 : improve win32 timing accuracy
2012-03-06 14:12:57 +08:00
James Chen
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
minggo
ed68855e19
fixed #1009 : fix a typo error
2012-03-06 09:35:36 +08:00
James Chen
fd9dd6c7fe
add stringWithContentsOfFile static method in CCString class.
2012-03-05 11:13:45 +08:00
James Chen
cb1f94df47
revert CCFileUtils::getFileData method.
2012-03-05 09:55:50 +08:00
James Chen
347a8294ac
fixed #1007 : Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
2012-03-03 12:24:02 +08:00
minggo
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
minggo
2360a9a04e
fixed #762 : let zfont display on center
2012-03-02 14:22:01 +08:00
minggo
5485eb19d9
fixed #762 : compute correct text rect and display it on center
2012-03-02 14:17:22 +08:00
minggo
79495fd743
Merge pull request #741 from minggo/master
...
remove libiconv.a
2012-03-01 19:28:35 -08:00
minggo
c196f2dff2
issue #983 : remove libiconv.a
2012-03-02 11:25:35 +08:00
minggo
528a769cf6
fixed #762 : make label display on center on iOS
2012-03-02 11:15:44 +08:00
James Chen
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
James Chen
6c01009a18
fixed #986 : Add init() member funciton of CCMenu class.
2012-02-29 10:07:18 +08:00
James Chen
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
James Chen
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
minggo
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +08:00
James Chen
2bc48219f8
remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.
2012-02-27 18:18:40 +08:00
minggo
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
moadib
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
minggo
fd9445f6df
add commet for CCArray
2012-02-23 10:06:36 +08:00
moadib
7fcdb3b114
Added CCEGLView::EventHandler class for qnx-platform
2012-02-22 12:27:13 +04:00
minggo
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +08:00
James Chen
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
James Chen
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
James Chen
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
James Chen
abbda72b2f
modify bada 2.0 project setting
2012-02-14 23:31:37 +08:00
James Chen
dac63dd2c2
rename include file name from uppercase to lowercase for linux platform
2012-02-14 22:41:33 +08:00
James Chen
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
James Chen
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
James Chen
4f523bf986
remove .settings folder
2012-02-14 18:06:29 +08:00
James Chen
f8ff388e8d
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
...
test ok on win32 and android
2012-02-14 18:04:56 +08:00
James Chen
e3e016331c
issue #972 : move extensions folder to cocos2dx
2012-02-14 16:08:12 +08:00
James Chen
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
James Chen
0adca5774c
move CCNotificationCenter to extensions folder
2012-02-14 11:45:59 +08:00
James Chen
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
minggo
c98dd0cf2d
fixed #948 : remove getIndexOfObject()
2012-02-14 10:49:53 +08:00
minggo
538adcec3e
merge code from duleface
2012-02-10 13:56:20 +08:00
James Chen
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
minggo
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
James Chen
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
YuLei Liao
1d6d966717
fix CCScriptEngineManager::purgeSharedManager()
2012-02-09 20:07:55 +08:00
minggo
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
YuLei Liao
e74b842a58
update HelloLua
2012-02-09 17:48:15 +08:00
minggo
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
minggo
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
YuLei Liao
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
dumganhar
ca94a11190
fixed #951 : removed definition of NSMutableSet.
2012-02-07 15:35:10 +08:00
minggo
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
minggo
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
YuLei Liao
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
dumganhar
1e807d00c3
fixed #967 : fixed PVR Textures can not be reloaded after GL context lost on android.
2012-02-07 11:18:39 +08:00
minggo
8770976884
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
2012-02-07 10:48:07 +08:00
Wartortle
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
Wartortle
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
minggo
babbd64f0d
Merge pull request #691 from winbinar/master
...
fixed #626 : Fix bug #626
2012-02-05 23:00:31 -08:00
YuLei Liao
4fe0c10e10
merge upstream/master
2012-02-06 10:54:51 +08:00
moadib
f5b8aa79c5
Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 16:49:47 +04:00
YuLei Liao
69a7e2a2e3
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
2012-02-04 11:34:17 +08:00
dumganhar
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
folecr
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
folecr
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
folecr
516c56a793
Add EXPORT_C_INCLUDES and correct the paths to third party modules
2012-02-02 20:04:29 -08:00
dumganhar
f6d6d0dd49
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 17:46:45 +08:00
minggo
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
minggo
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
martinezgerman
c78bf39601
Member variable added to keep the current window active status
2012-01-31 22:55:44 -08:00
martinezgerman
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
martinezgerman
e8f9c5f675
merging the original update
2012-01-31 20:06:39 -08:00
dumganhar
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
Nicholas Kostelnik
edaf2cf269
fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon
2012-01-31 09:57:58 +00:00
martinezgerman
38cd599bdc
Functionality to detect when the application goes to the background and return from it
2012-01-31 00:25:09 -08:00
minggo
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00