Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,044 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4874 Commits

Author SHA1 Message Date
James Chen 2abd61b967 Warning fix in CCRenderTexture.h. 2013-07-26 14:15:19 +08:00
James Chen 9ae7bd33e2 typedef enum Director::Projection ccDirectorProjection; can't work on Windows, since Director::Projection is already a type, no need to add enum. 2013-07-26 14:14:55 +08:00
James Chen 5dca03c061 Fixing compilation errors in CCImageCommon_cpp.h. 2013-07-26 13:59:27 +08:00
James Chen df8273d960 Fixing an issue that wrong implementation in 'ccGLDeleteTextureN'. 2013-07-26 13:58:59 +08:00
samuele3hu 2288280b2d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator 2013-07-26 13:57:11 +08:00
James Chen 8459376f3d More deprecated definitions. 2013-07-26 13:49:49 +08:00
James Chen 4f9d0672aa Fixing errors when disabling VAO. 2013-07-26 13:49:24 +08:00
James Chen 37f6685894 MODE_GRAVITY --> Mode::GRAVITY, POSITION_TYPE_XXX --> PositionType::XXX 2013-07-26 13:48:32 +08:00
samuele3hu f49277d367 issue #2404:replace deprecated functions in testlua and hellolua sample 2013-07-26 13:43:28 +08:00
Timothy Qiu d1e46940ab Documentation fix: use \p to reference a parameter 
The orginal @param is meant to describe a parameter, resulting in a
strange doc output.
 2013-07-26 12:04:03 +08:00
minggo f94a02ac01 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-26 11:25:18 +08:00
Ricardo Quesada 4772674ff4 Removes Layer::TouchesDispatchMode... 
...since it is declared in Touch::DispatchMode
 2013-07-25 19:06:32 -07:00
Ricardo Quesada 8bf24f0475 ccGLXXX -> GL::xxx 
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`

Also, converts the class `DrawPrimitives` into a namespace
 2013-07-25 18:42:53 -07:00
carlo morgantini 7d141a3f57 the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore) 2013-07-25 17:58:13 -07:00
Ricardo Quesada 191aaebe2a More const fixes 
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
 2013-07-25 17:47:42 -07:00
Ricardo Quesada 07c6c904cc Removes more Hungarian notation and more 
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
 2013-07-25 16:27:24 -07:00
Ricardo Quesada 058935aa8d Removes Hungarian notation 
Removes Hungarian notation from the code.
 2013-07-25 15:53:24 -07:00
Ricardo Quesada d683e10808 More constant fixes 
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()

And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
 2013-07-25 14:49:43 -07:00
Ricardo Quesada 16d0b43181 Constant fixes 
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE

Also adds more constant for BlendFunc
 2013-07-25 13:36:19 -07:00
minggo 4caea01021 Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum 2013-07-25 23:09:56 +08:00
minggo b36a4f1df0 issue #2430:use upper letters for enum item in Image 2013-07-25 23:09:18 +08:00
James Chen fd9e2235be Delete CC_DLL. 2013-07-25 22:43:12 +08:00
James Chen f7c0ad8151 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-25 22:39:14 +08:00
James Chen a1c3631962 issue #2404: DrawPrimitives deprecated. 2013-07-25 22:38:55 +08:00
minggo 323af3c889 issue #2430:use upper letters for enum item in AssetsManager and WebSocket 2013-07-25 22:29:12 +08:00
minggo 4ef197b579 Merge pull request #13 from dumganhar/iss2430-modify_enum 
issue #2430: Fixing compilation errors for Mac and JSB projects.
 2013-07-25 07:02:57 -07:00
James Chen 3f36e8300e issue #2430: Fixing compilation errors for Mac and JSB projects. 2013-07-25 21:59:47 +08:00
minggo 17946c084a issue #2430:fix android compiling error 2013-07-25 21:59:37 +08:00
minggo 4d7ac6c800 issue #2430:fix conflict 2013-07-25 21:37:12 +08:00
boyu0 a2b611d8c3 Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR 2013-07-25 21:35:00 +08:00
minggo e95c3b9150 issue #2430:make functions really deprecated 2013-07-25 21:15:24 +08:00
minggo f5b116095c issue #2430:make functions really deprecated 2013-07-25 21:09:44 +08:00
minggo 8b748e2992 issue #2430:use const member variable instead of macro 2013-07-25 21:04:32 +08:00
minggo 051caf5e54 issue #2430:move TransitionScene enum into class 2013-07-25 20:50:39 +08:00
minggo df48f52aa3 issue #2430:use Image::Format instead of tImageFormat 2013-07-25 20:38:15 +08:00
minggo 2bb577be8b issue #2430:change Image enum item to upper letter 2013-07-25 20:29:53 +08:00
minggo 18a19d5168 issue #2430:move Layer enum into class 2013-07-25 20:12:55 +08:00
minggo beb192ecaa issue #2430:move Menu enum into class 2013-07-25 20:04:24 +08:00
samuele3hu 11d7c9c653 issue #2404:Add more functions to Deprecated.lua and modify some .pkg files 2013-07-25 19:58:59 +08:00
minggo 77afae124b issue #2430:move Texture2D enum into class 2013-07-25 19:52:44 +08:00
minggo 2293630335 issue #2430:move enum in ccTypes.h class 2013-07-25 18:46:43 +08:00
minggo acdd1cfe9d issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
James Chen 90fbcec9c5 issue #2404: Reverting cocos2dx/proj.linux/cocos2dx.mk, ignoring deprecated methods since linux build will treat warning as errors. 2013-07-25 15:32:46 +08:00
minggo 3d6f3bf8b2 issue #2430:move ProgressTimer enum into class 2013-07-25 15:11:36 +08:00
James Chen 6a0a4ed0f9 #issue #2404: Using Texture2D::getDefaultAlphaPixelFormat instead of Texture2D::defaultAlphaPixelFormat in TextureCache. 2013-07-25 15:05:56 +08:00
James Chen f8392adce2 issue #2404: Open deprecated warning for Android and Linux. 2013-07-25 15:05:56 +08:00
James Chen 387ea1899c issue #2404: Disabling warning of invoking deprecated methods in engine. Rename CCCallFuncND to __CCCallFuncND, and add deprecated typedef CCCallFuncND. 
Only disable warning for CCActionInstant.cpp and CCMenuItem.cpp
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
#pragma warning (push)
#pragma warning (disable: 4996)
#endif

#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
#pragma warning (pop)
#endif
 2013-07-25 15:05:56 +08:00
minggo 658bffbb69 issue #2430:use upper letter for enum item in ccGLStateCache.h 2013-07-25 15:04:13 +08:00
minggo 08b13e9867 issue #2430:move Configuration enum into class 2013-07-25 14:47:12 +08:00
minggo 8dab462f6f issue #2430:move Director enum into class 2013-07-25 14:39:32 +08:00
minggo edcea3eb8d issue #2430:move more Particle enum into class 2013-07-25 14:27:46 +08:00
minggo 4519a09ce4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-25 13:54:55 +08:00
minggo 4bfe6c2439 issue #2430:move Particle enum into class 2013-07-25 13:54:32 +08:00
James Chen 6c3878fc45 issue #2404: Fixing a warning in ccTypes.h. 2013-07-25 13:45:41 +08:00
James Chen af3b8a0390 issue #2404: Rename CallFuncND/CallFuncO to CCCallFuncND/CCCallFuncO and mark them as deprecated classes. In v3.0, we could use CallFuncN instead. 2013-07-25 13:45:02 +08:00
James Chen 306587167d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	AUTHORS
 2013-07-25 11:28:48 +08:00
minggo a13a46e54f Merge pull request #3243 from azmeuk/emscripten-package 
Use of a single emscripten HTML template file
 2013-07-24 18:36:28 -07:00
Ricardo Quesada a7760d117d Adds more tests 2013-07-24 17:21:51 -07:00
Ricardo Quesada e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge 
Conflicts:
	cocos2dx/textures/CCTexture2D.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	scripting/javascript/bindings/generated
	tools/bindings-generator
 2013-07-24 15:15:08 -07:00
Ricardo Quesada 943b805bc8 Fixes some warnings 
... and updates the version to pre-alpha0
 2013-07-24 14:02:36 -07:00
Thomas Perl 6e1c9b24f3 Qt 5: Add support for changing animation interval at runtime 2013-07-24 20:23:10 +02:00
Thomas Perl 97c4e4898a Qt 5: Fix language mapping in CCApplication 
Reorder language mappings as listed in the enum
definition and remove comment after checking all
available languages are added to the mapping.
 2013-07-24 20:23:09 +02:00
Thomas Perl 539f71c814 Qt 5: Implement input method showing/hiding 
[nemo] Integration of QInputMethod
 2013-07-24 20:23:09 +02:00
Thomas Perl bcee05d471 Qt 5: Add CCAccelerometer implementation 
[nemo] Add QtSensors-based Accelerometer implementation
 2013-07-24 20:23:08 +02:00
Thomas Perl 6f4f8c0e38 Qt 5: System-wide installation of targets 2013-07-24 20:23:08 +02:00
Thomas Perl 366dbeda31 Qt 5: Build test application (Cpp/TestCpp) 2013-07-24 20:23:07 +02:00
Thomas Perl 8044c52d6d Qt 5: Add support for building libextension 2013-07-24 20:23:07 +02:00
Thomas Perl db230a3d2b Do not include Qt headers in CCApplication.h 
This avoids name collisions with the extensions sub-project
where "slots" is used as attribute of a class ("slots" is
redefined in Qt headers).
 2013-07-24 20:23:07 +02:00
Thomas Perl 4b52754dd3 CocosDenshion build setup for Qt 5 (no-op implementation) 
Right now, all operations are implemented as no-op, but
libcocosdenshion can now be built as shared library and used.
 2013-07-24 20:19:50 +02:00
Thomas Perl e1baba5407 Build SimpleGame example 2013-07-24 20:19:20 +02:00
Thomas Perl b64c0a0e87 Platform abstraction implementation with Qt 5 
Based partially on the Linux platform abstraction, therefore
this right now works only with Qt 5 on Linux.
 2013-07-24 20:18:43 +02:00
Thomas Perl 4860e3551c Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
Thomas Perl 62958c8321 Qt5 build support (initial work) 2013-07-24 20:18:42 +02:00
carlo morgantini 97363c9382 some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
James Chen e5c2ad0cb8 issue #2404: Mark Texture2D::setTexParameters(const ccTexParams* texParams) as deprecated. 2013-07-24 17:54:17 +08:00
James Chen d42ff355b6 issue #2404: Mark RenderTexture:: newCCImage as deprecated. 2013-07-24 17:53:34 +08:00
James Chen 7fd0a923e9 issue #2404: Updating CCDeprecated.h, CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent; 2013-07-24 17:52:00 +08:00
James Chen 44a338f63c issue #2404: Re-add CallFuncND and CallFuncO and mark them as deprecated class. 2013-07-24 16:45:11 +08:00
minggo aac1a4c78a Merge pull request #3214 from bmanGH/develop 
修复CCTexturePVR创建GLTexture时没有使用GLStateCache
 2013-07-23 20:02:56 -07:00
James Chen 35dec5d71e More CCLog --> log. 2013-07-24 10:46:13 +08:00
James Chen e5b0bc1fc7 Put the deprecated method 'CCLog' to 'CCDeprecated.h'. 2013-07-24 10:26:36 +08:00
James Chen 7bc6abfac7 Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it. 2013-07-24 10:14:42 +08:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes 
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
 2013-07-23 15:20:22 -07:00
James Chen c7cf577b1a issue #2378: Deprecating some getters. Getter function needs to have 'get' prefix. 2013-07-23 22:07:33 +08:00
James Chen 8ad6fbd415 issue #2378: Mark getStoringCharacters as deprecated function. 2013-07-23 21:56:01 +08:00
James Chen baed1c5b48 issue #2378: More override functions. 2013-07-23 21:51:19 +08:00
James Chen a88d173d68 issue #2378: Compilation error fixes. 2013-07-23 21:37:30 +08:00
James Chen ab7d57feb7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2378-remove-CC_PROPERTY 2013-07-23 20:47:39 +08:00
James Chen 9c859d5f9d issue #2378: Mark ParticleSystem::getOpacityModifyRGB as deprecated. 2013-07-23 20:44:42 +08:00
James Chen d942de1ae1 issue #2378: Variables to protected for Texture2D. 2013-07-23 20:42:43 +08:00
James Chen a0851cb5e0 issue #2378: Minor fix in CCParticleSystem. 2013-07-23 20:39:54 +08:00
James Chen a6b880a124 issue #2378: Reverting CCPlatformMacros.h 2013-07-23 20:38:35 +08:00
James Chen 4110b95e96 issue #2378: inline function are in header files now. 2013-07-23 20:36:41 +08:00
James Chen a1c4c73c1c issue #2378: More setter/Getter, removing CC_PROPERTY_XXX macros. 2013-07-23 18:26:26 +08:00
James Chen ed5bd2309e issue #2378: Setter/Getter for AtlasNode, removing CC_PROPERTY_XXX macros. 2013-07-23 15:19:49 +08:00
James Chen 50ba072bac issue #2378: Setter/Getter for Director, removing CC_PROPERTY_XXX macros. 2013-07-23 15:19:26 +08:00
James Chen d6f15bc79f issue #2378: Setter/Getter for TextureAtlas, removing CC_PROPERTY_XXX macros. 2013-07-23 14:18:35 +08:00
minggo 8af95adbdf Merge pull request #3220 from minggo/develop 
closed #2393:fix a bug caused by marking functions as deprecated
 2013-07-22 23:17:03 -07:00
minggo b416511e6b closed #2393:fix a bug caused by marking functions as deprecated 2013-07-23 14:13:44 +08:00
James Chen 75a0cb6a29 issue #2378: Setter/Getter for CCTexture2D, removing CC_PROPERTY_XXX macros. 2013-07-23 14:05:05 +08:00
minggo f840564c05 issue #2412:remove platform.h/.cpp from vs project 2013-07-23 11:45:20 +08:00
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
carlo morgantini 98bb0c26f3 working on the new label stuff 2013-07-22 14:43:45 -07:00
carlo morgantini 98c52cd98d new FontCache 2013-07-22 13:08:37 -07:00
carlo morgantini 5668607e0e merging with Ricardo stuff and fixin the new Label 2013-07-22 11:40:39 -07:00
bmanGH b983830bec 修复CCTexturePVR创建GLTexture时没有使用GLStateCache导致下一个Sprite::draw的时候可能会使用不正确的纹理 2013-07-23 02:23:40 +08:00
Éloi Rivard cca57e39de fixed a bug in emscripten makefile 2013-07-22 16:56:02 +02:00
James Chen 2aa1fae266 closed #2418: Unused spriteframes also need to be removed when purgeCachedData. 2013-07-22 18:13:13 +08:00
James Chen 1db847ad7c issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
James Chen 0164946779 issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance. 2013-07-22 17:19:31 +08:00
James Chen 2228614748 issue #2344: JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now. 2013-07-22 17:12:53 +08:00
James Chen a188fd4261 Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes 2013-07-22 14:45:38 +08:00
James Chen f32f1dff33 Cast fix: GLbyte --> GLubyte. 2013-07-22 14:45:01 +08:00
James Chen b58d18e20a More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix. 2013-07-22 14:28:19 +08:00
James Chen 50c280fb9d Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp. 2013-07-21 19:10:22 +08:00
Ricardo Quesada 89d210bdb3 CCAssert -> CCASSERT 
and other best pracitces like:

capacity and "index" are ints and not unsigned int (google's recomendation).
 It is easier to detect underflow bugs like this

plus other minor improvements
 2013-07-19 22:01:27 -07:00
Ricardo Quesada 2219bde542 bmfont sample working 
...still TTF working OK
 2013-07-19 16:49:51 -07:00
Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/textures/CCTexture2D.h
	samples/Javascript/Shared
 2013-07-19 16:04:23 -07:00
Ricardo Quesada 1f0dac4ed0 Removes CC_PROPERTY / CC_SYNTHESIZE from some parts of the code 
As agreed previously, CC_PROPERTY_XXX and CC_SYNTHESIZE_XXX should
not be used in the code.
This patch removes some of them. There are still many more to remove
 2013-07-19 13:16:38 -07:00
carlo morgantini c977e6c3fa Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge 
Conflicts:
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontDefinition.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	cocos2dx/label_nodes/CCStringTTF.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-07-19 12:24:25 -07:00
carlo morgantini 9f629835de some more cleanup 2013-07-19 11:19:35 -07:00
carlo morgantini 5068622c04 working on the new atlas stuff 2013-07-19 10:33:26 -07:00
James Chen 4043ca7e23 Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
 2013-07-19 08:15:39 -07:00
boyu0 ebafab4583 delete the file added by misstake. 2013-07-19 16:19:19 +08:00
boyu0 948acd6e29 Refactor CCTexture2D and CCImage 2013-07-19 15:37:54 +08:00
James Chen 7356e7c4c0 issue #2407: Minor fix in CCTMXLayer.h 2013-07-19 15:03:28 +08:00
James Chen 7c7d21dd03 issue #2407: more best practices fixes, more getter and const.. 2013-07-19 14:57:54 +08:00
Lee, Jae-Hong 980a053e50 [Tizen] Fix compile error. 
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
 2013-07-19 15:16:05 +09:00
minggo 687c088b51 issue #2412:remove blackberry and marmalade port because they don't support c++11 2013-07-19 13:55:03 +08:00
minggo 7704ab9161 issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
James Chen 2dc6a58d2c Merge branch 'more_more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_more_best_practices_fixes 2013-07-19 11:59:24 +08:00
James Chen 9270a28275 issue #2404: return nullptr in Clonable::copy(). 2013-07-19 11:56:01 +08:00
James Chen 6ffac07a81 More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize 2013-07-19 11:08:47 +08:00
Ricardo Quesada ba6ab126c6 More best practices fixes 
- class order fixes
  - static methods (creators) at the beginning
  - then constructors / destructors
  - then init
- more `const` fixes
  - adds some const getters
  - some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
 2013-07-18 16:30:19 -07:00
carlo morgantini 31b40263a7 render and font IOS are no more 2013-07-18 14:14:09 -07:00
carlo morgantini 9c53da22fa some more cleanup 2013-07-18 14:11:12 -07:00
carlo morgantini 5480810a9c clean up and now using FreeType for rendering fonts 2013-07-18 13:13:41 -07:00
James Chen 7de69edad8 Merge pull request #3187 from dumganhar/ricardoquesada-more_best_practices_fixes 
Merge https://github.com/cocos2d/cocos2d-x/pull/3183
 2013-07-18 08:52:15 -07:00
minggo 208c1312f4 Merge pull request #3171 from samuele3hu/ScriptHandler 
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGL,ScrollView handlers operation
 2013-07-18 02:48:37 -07:00
boyu0 76e05ee802 Merge https://github.com/cocos2d/cocos2d-x into 2345 2013-07-18 17:47:43 +08:00
James Chen a425dd3dc0 Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes 
Conflicts:
	cocos2dx/actions/CCActionTiledGrid.h
 2013-07-18 15:46:14 +08:00
James Chen bf45fa86fe Merge pull request #3176 from dumganhar/iss2413-overload-virtual 
closed 2413: Warning fixes for overload virtual functions.
 2013-07-18 00:33:53 -07:00
James Chen 6277ae191b issue #2404: Removing duplicated codes in platform/mac/CCImage.mm. 2013-07-18 13:40:32 +08:00
James Chen 469e13607a issue #2404: Marking CC prefix class as deprecated. 2013-07-18 13:38:23 +08:00
carlo morgantini 80247d409b rendering using free type. This commit is a work in progress and should NOT be used 2013-07-17 17:31:28 -07:00
Ricardo Quesada 6e25301b43 more best practices fixes 
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
  # creators first, then constructor, destructors, init
  # then overridden methods
  # variables at the end
- removes Hungarian notation from parts of the code
 2013-07-17 16:56:19 -07:00
boyu0 70140bb4cb refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
James Chen d6f713a31b Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code 
Conflicts:
	samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h
 2013-07-17 17:06:47 +08:00
James Chen f4edc7a922 closed #2413: Warning fixes for overload virtual functions. 2013-07-17 16:25:13 +08:00
samuele3hu 847b87b297 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-17 14:45:02 +08:00
samuele3hu c9f0f09dac issue #2377:Del CallFunc and CallFuncN handler operation and Modify LuaWebScoket linux config 2013-07-17 14:44:28 +08:00
James Chen e7452bc912 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2407-class-order 2013-07-17 14:36:55 +08:00
James Chen 53ace33d26 issue #2407: Adds more readability to the class internals for 'ParallaxNode'. 2013-07-17 14:32:10 +08:00
James Chen d3bf9935cd Merge pull request #3166 from dumganhar/iss2410-blackscreen-android 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117
 2013-07-16 23:25:01 -07:00
James Chen cd136e6330 issue #2410: [Reverting] Don't use 'ccGLEnableVertexAttribs' when using VAO, use 'glEnableVertexAttribArray' instead. 2013-07-17 13:55:31 +08:00
James Chen 209392085c issue #2410: Reverting some changes about VAO. And adding CC_ENABLE_CACHE_TEXTURE_DATA to 'EVNET_COME_TO_FOREGROUND' in DrawNode. 2013-07-17 13:53:16 +08:00
James Chen 7b51599cbd closed #2410: Fixing a bug that loading a wrong texture in ShaderCache::loadDefaultShaders. This could fix DrawNode displays nothing when resume. 2013-07-17 12:55:27 +08:00
James Chen 56419b9e90 issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 
Reset the order of reloading shaders and textures in main.cpp.
 2013-07-17 12:53:30 +08:00
Ricardo Quesada 5d499d351d Some more changes to make the code more c++ friendly: 
- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
   - Deprecates the old methods
   - adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
   - the new one is const
   - Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
 2013-07-16 18:16:04 -07:00
carlo morgantini 9cfe1b7823 new stuff for FreeType 2013-07-16 15:18:39 -07:00
James Chen 80590dcfc1 Merge pull request #3132 from samuele3hu/ScriptHandler 
issue 2377:Add scriptHandlerMgr to manager lua script handler
 2013-07-16 02:40:50 -07:00
minggo 52a27c5fc9 Merge pull request #3118 from jotel/text-shadow-opacity-fix 
Now opacity option for shadow in CCLabelTTF works.
 2013-07-16 02:39:36 -07:00
James Chen 5b06824036 closed #2410: Formatting codes in Texture2D::initWithString. 2013-07-16 16:47:35 +08:00
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2013-07-16 16:33:02 +08:00
samuele3hu 241c01bec3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-16 14:47:46 +08:00
James Chen 2ed5a40a36 Merge pull request #3146 from tks2shimizu/develop 
closed 2408: Add componentsSeparatedByString function for String class.
 2013-07-15 23:00:12 -07:00
samuele3hu 1761669832 issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr 2013-07-16 12:47:40 +08:00
samuele3hu c955a559bf issue #2377:Del register/unregister function in .cpp and .h files 2013-07-16 09:55:06 +08:00
Ricardo Quesada f9268c8054 small API changes 
::create()
and const chars
 2013-07-15 14:35:25 -07:00
Ricardo Quesada 9958e0d7f9 Adds more readability to the class internals. 
Changes:
  - creator (static) methods, and singleton methods (static) are always at the top of the class
  - Constructors, destructros, and init methods comes next
  - Then the instance methods for the class
  - Then the overriden methods
  - and finally the ivars

Also, overriden methos have the "override" context keyword
 2013-07-15 12:43:22 -07:00
minggo 93e75bad9f Merge pull request #3154 from minggo/add-deprecated-header 
Add deprecated header
 2013-07-15 03:20:32 -07:00
minggo bee3b60b5a Merge branch 'add-deprecated-header' of https://github.com/minggo/cocos2d-x into add-deprecated-header 2013-07-15 17:52:20 +08:00
minggo cb271e21d8 issue #2404:fixed some compiling warnings 2013-07-15 17:51:36 +08:00
minggo dc2daf31ea issue #2404:fixed some compiling errors 2013-07-15 17:29:35 +08:00
minggo 07ae0c6da2 issue #2404:remove unneeded files 2013-07-15 17:18:30 +08:00
minggo b97ea0815f issue #2404:re-add some global functions and variables and mark them as deprecated 2013-07-15 16:42:31 +08:00
James Chen 3bdf6b9c69 issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
James Chen 39fc98d7fb issue #2403: Removing unused implemented methods like setOpacityModifyRGB, isOpacityModifyRGB since they're defined in their super class. 2013-07-15 16:08:42 +08:00
James Chen b6f78b257f closed #2403: Reverting commit 239323c to fix the bug that Tint and Fade action can't work for ProgressTimer. 2013-07-15 16:06:59 +08:00
James Chen a6a237c017 Merge pull request #3144 from jllust/Fix#2354 
closed 2401: CCLabelBMFont crashes in glDrawElements of CCTextureAtlas::drawNumberOfQuads sometimes
 2013-07-14 20:53:15 -07:00
minggo 2c499a6a9a Merge pull request #2658 from michaelcontento/use-onWindowFocusChanged-instead-of-onPause 
[Android] use onWindowFocusChanged(bool) instead of onResume()/onPause()
 2013-07-14 20:37:23 -07:00
samuele3hu 80a6811f9f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
samuele3hu 51c3ced4ba issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples 2013-07-15 10:38:16 +08:00
Tomoaki Shimizu 5e285add28 Add componentsSeparatedByString function for String class. 
For String Class and string, there is no function to split the string.
So, I added componentsSeparatedByString function.
The function name is the same as NSString.
 2013-07-14 17:56:34 +09:00
Jason Lust 5455d20fc1 Fix Issue #2354 
Once a Texture Atlas VAO has deallocated by glDeleteVertexArrays. The GLStateCache may have been recently set to that vaoID. When shortly after a new glGenVertexArrays gets the same vaoID but the glBindVertexArray is bypassed because of the GLStateCache is not aware the VAO was just invalidated, and new vertex are copied to the old freed address.
 2013-07-12 19:51:42 -07:00
carlo morgantini 45f9edcdc3 some more work on freetype 2013-07-12 17:31:23 -07:00
carlo morgantini a4073025d5 Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel<<<<<<< HEAD 
=======

>>>>>>> origin
 2013-07-12 12:41:16 -07:00
carlo morgantini e4af13f1f6 use freetype 2013-07-12 12:39:47 -07:00
Ricardo Quesada a598db0db0 library compiled without bzip2 2013-07-12 11:58:42 -07:00
minggo 34b60e99f1 Merge pull request #3140 from minggo/iss2393-mark_deprecated 
Use Point, Rect and Size member functions instead of global functions
 2013-07-12 08:59:27 -07:00
minggo 249e67d1f7 closed #2393:fix a compiling error 2013-07-12 18:25:36 +08:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
James Chen 8d0888aa60 issue #2398: Trigger an assert when the default texture of Sprite was created unsuccessfully. 2013-07-12 16:36:19 +08:00
James Chen ec1be2c1b2 closed #2398: [MAC] Adding Support for initializing Image with raw data. Otherwise, Sprite with no texture can't be created with default 2x2 texture which is RGBA raw data. 2013-07-12 16:35:07 +08:00
James Chen 1939534a2e [ci skip] Reverting cocos2dx/platform/android/java/project.properties. 2013-07-12 16:26:42 +08:00
James Chen 72f35aa14e issue #2397: Updating CCUserDefaultAndroid.cpp. 2013-07-12 15:32:37 +08:00
James Chen f7b9c54cd1 issue #2397: Updating CCUserDefaultAndroid.cpp. 2013-07-12 15:21:21 +08:00
minggo 58fe3c7563 closed #2393: fixed conflicts 2013-07-12 15:07:44 +08:00
James Chen d5447eaea5 issue #2397: Typo fix. 2013-07-12 15:01:51 +08:00
James Chen d1527f39f5 issue #2397: FileUtils::sharedFileUtils() is not needed to be defined in CCFileUtilsXXX.cpp 2013-07-12 15:00:10 +08:00
minggo 5d9fea1416 issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
James Chen 4a7e884de8 issue #2397: UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance(); 2013-07-12 14:34:57 +08:00
minggo 15096b0716 issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated 2013-07-12 14:30:26 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
minggo bb758df0d0 issue #2393:mark ccp as deprecated 2013-07-12 14:11:55 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
carlo morgantini ea72e046c6 Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
 2013-07-11 17:38:07 -07:00
Ricardo Quesada 2d0aed4f0e libfreetype for iOS and Mac 
libfreetype for iOS and Mac
 2013-07-11 17:20:10 -07:00
carlo morgantini a034d5bff5 ready to integrate FreeType 2013-07-11 17:17:29 -07:00
carlo morgantini 1caa6dfbd7 start integrating FreeType for font rendering 2013-07-11 15:43:45 -07:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
carlo morgantini 002ae77698 new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
samuele3hu c4de89870a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-11 16:43:25 +08:00
minggo c37af8fa77 issue #2393:mark functions in CCPointExtensions deprecated 2013-07-11 16:38:58 +08:00
James Chen a5470aaa45 Minor fix in BezierTo::initWithDuration and BezierTo::clone. 2013-07-11 15:41:05 +08:00
James Chen f414803e92 Minor fix of PR 3128. 2013-07-11 15:36:00 +08:00
samuele3hu ff29d2b5d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-11 13:40:16 +08:00
samuele3hu 9007b9feee issue #2377:Replace the CallFunc script Handler and repair Testlua Bug 2013-07-11 13:38:25 +08:00
Ricardo Quesada 48b1ed9f8f re adds copy() as a deprecated method 
...in order to make easier the port to v3.0
 2013-07-10 18:11:37 -07:00
carlo morgantini 9264b3de1d more clean up 2013-07-10 11:59:05 -07:00
minggo bbaa938cf7 Merge pull request #3121 from tks2shimizu/develop 
Add append function for String class.
 2013-07-10 00:58:43 -07:00
minggo df53e5235c Merge pull request #3125 from dabingnn/Iss2386-ClippingNode-AsChild-Bug 
closed issue #2386 : ClippingNode works wrongly when being set as a child
 2013-07-10 00:54:44 -07:00
minggo 630937aa3d Merge pull request #3124 from dumganhar/rename-method 
issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime).
 2013-07-10 00:49:58 -07:00
Huabing.Xu 010a33c009 closed issue #2386 : Fix bug : add a new method to clear the stencil buffer bit used by ClippingNode 2013-07-10 15:33:43 +08:00
James Chen 146914b288 Merge pull request #3123 from pyrasis/tizen_2.2 
Support Tizen 2.2 SDK
 2013-07-10 00:15:31 -07:00
samuele3hu 31d0e492c2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-10 15:05:02 +08:00
samuele3hu cf1cbe1bd6 issue #2377:add scriptHandlerMgr and modify ActionManager.lua 2013-07-10 15:04:00 +08:00
James Chen d830bb5f96 'tile' --> 'getTile', 'orignalTile' --> 'getOrignalTile' 2013-07-10 14:17:42 +08:00
James Chen a6db6db334 issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime). 2013-07-10 14:16:42 +08:00
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK. 
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
 2013-07-10 13:04:08 +09:00
minggo 91fc0b2a45 Merge pull request #3114 from dumganhar/iss2388-default-texture 
closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked.
 2013-07-09 21:03:20 -07:00
James Chen 86b6f26cee issue #2388: Fixing a bug in FadeIn::clone. 2013-07-10 11:58:07 +08:00
James Chen 7594136985 issue #2388: Updating comments for cc_2x2_white_image variable. 2013-07-10 11:57:35 +08:00
James Chen ad8a3ac1b5 issue #2388: One more static_cast. 2013-07-10 10:08:07 +08:00
James Chen f6e0b6ca0b issue #2388: Checking whether the texture exists. 2013-07-10 10:07:45 +08:00
Tomoaki Shimizu eca7db6a50 Add append function for String class. 
The append function is useful when adding a string.
So, I added it to String class.
 2013-07-10 10:50:13 +09:00
Jaroslaw Lewandowski 1fcd6883f1 fixing Linux build 2013-07-09 23:32:10 +01:00
Jaroslaw Lewandowski f1023232db Now opacity option for shadow in CCLabelTTF works. 2013-07-09 23:23:41 +01:00
Jaroslaw Lewandowski 626ba2686f Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
Éloi Rivard 05ae6f8518 Fixed some warnings 2013-07-09 16:33:21 +02:00
Éloi Rivard e6354bbf0a Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
Éloi Rivard e5db95d2b9 Added deprecated functions ignoring in libcocos2d eclipse project 2013-07-09 15:23:19 +02:00
Éloi Rivard d853934f1b Added -std=c++0x flag in C++ eclipse projects 2013-07-09 15:23:19 +02:00
James Chen 87cec1622c closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked. 2013-07-09 18:33:36 +08:00
James Chen f752196f8e issue #2379: Removing CCZone.cpp/.h for win32 project. 2013-07-09 15:42:37 +08:00
James Chen 582baa0bac issue #2379: Removing CCZone.cpp for Makefile. 2013-07-09 15:31:28 +08:00
James Chen 7f6811e61e issue #2379: Removing unused file - cocos2d.vcxproj.filter.orig. 2013-07-09 15:30:50 +08:00
James Chen a517e68c59 closed #2379: Removing CCZone.h/.cpp. 2013-07-09 14:50:31 +08:00
James Chen 596c4c3cf2 issue #2387: Using static_cast instead of C style cast while iterating CCDictionary. 2013-07-09 14:40:43 +08:00
James Chen 9b9fe67d25 issue #2387: Using static_cast instead of C style cast in iteration of CCArray. 2013-07-09 14:29:51 +08:00
minggo e5a80eed91 fixed conflict 2013-07-09 10:39:16 +08:00
James Chen 976d4ad11e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	cocos2dx/actions/CCActionInterval.cpp
	cocos2dx/cocoa/CCDictionary.cpp
	samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
 2013-07-09 09:48:41 +08:00
Ricardo Quesada 9fe9341646 From C++ best practices 
Uses static_cast<> instead of C casting.
 2013-07-08 14:38:14 -07:00
dumganhar b41dd9277d issue #2300: Warning fixes. 2013-07-08 23:12:11 +08:00
dumganhar 9b126e79d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-08 23:09:48 +08:00
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
James Chen d64fb7339c issue #2129: FontDefinition* --> const FontDefinition& 2013-07-08 15:18:16 +08:00
James Chen fe2a3c3d69 issue #2129: Using 'const FontDefinition&' instead of 'FontDefinition*' and resolving memory leak in FontDefinition LabelTTF::getTextDefinition() 2013-07-08 15:17:37 +08:00
James Chen 16ec50e86b issue #2129: Adding explicit for 'Color4B(const Color4F &color4F);' and 'explicit Color4F(const Color3B &color3B)'. 2013-07-08 15:16:22 +08:00
James Chen 4a0fe35d5a iss2129: bug fix in CCDrawNode.cpp 2013-07-08 15:15:22 +08:00
James Chen 37f9c4415a vertex --> getVertex, originalVertex --> getOriginVertex. 2013-07-08 15:12:06 +08:00
James Chen 3d4005ebbc issue #2129: Bug fix in "Color4B::Color4B(const Color4F &color4F)". 2013-07-08 14:53:47 +08:00
James Chen 1eacab0278 Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-08 10:51:07 +08:00
James Chen e28cf8d258 issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +08:00
Ricardo Quesada c65b6f1417 Adds const to more getters 
adds `const` to more getters.
 2013-07-06 22:01:21 -07:00
James Chen db0a15b02f Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-06 15:19:09 +08:00
James Chen 43260a2bf1 [Windows] Fixing complication errors for WINDOWS. 2013-07-06 10:49:13 +08:00
minggo dfde41b932 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
minggo 7e56bb57c8 Merge pull request #3076 from samuele3hu/execDev 
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
 2013-07-05 01:32:06 -07:00
James Chen 268245635d issue #2373: Fixing a bug in CardinalSplineTo::clone function. this->_points needs to be cloned. 2013-07-05 15:08:52 +08:00
James Chen ec902c3550 issue #2373: Adding missing overload const getter functions. 2013-07-05 15:08:52 +08:00
James Chen d2746bbe90 issue #2373: Removing inline for virtual function. Adding more const getter functions. 2013-07-05 15:08:52 +08:00
samuele3hu 9eb31df9f3 issue #2244:Replace the tab with space 2013-07-05 11:29:21 +08:00
samuele3hu 2aef49f251 issue #2244:Replace the tab with space 2013-07-05 11:24:28 +08:00
James Chen 267823d473 Merge pull request #3077 from dumganhar/iss2371-template 
Updating multi-platform-template for iOS and Mac, and deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
 2013-07-04 20:01:33 -07:00
James Chen a25dce5b2d issue #2371: Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder. 2013-07-05 10:52:46 +08:00
samuele3hu bb244edae6 issue #2244:Modify a function name to createCCBReader 2013-07-05 10:25:37 +08:00
samuele3hu c0e89a4ee9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-05 09:49:01 +08:00
Rene Klacan 5d5b962f38 removed extra _currentTileIndex 2013-07-04 13:28:54 +02:00
Rene Klacan c753f79497 added _currentTileIndex member to TMXLayerInfo 2013-07-04 13:07:44 +02:00
minggo 7bcafb46a4 Merge pull request #3051 from samuele3hu/execDev 
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
 2013-07-04 03:33:12 -07:00
samuele3hu b0e4757c24 issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader 2013-07-04 17:54:02 +08:00
James Chen a67ac821f7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-04 17:15:09 +08:00
James Chen 84ce80dcd2 issue #2371: [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL . 2013-07-04 16:31:50 +08:00
James Chen 50a8067b74 issue #2371: std::vector<std::string>::iterator --> auto in CCFileUtils.cpp. 2013-07-04 16:30:35 +08:00
samuele3hu 570f2663f4 issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00
minggo ddf54a4f49 Merge pull request #3054 from simpliplant/windows_keyboard_support 
Hardware keyboard support (Windows support + Mac fix)
 2013-07-03 23:37:13 -07:00
minggo 4880543305 Merge pull request #3073 from xxuejie/add-namespace-to-macro 
Add namespace prefix to selector macros
 2013-07-03 23:28:16 -07:00
minggo f019700b91 Merge pull request #3072 from minggo/const_love 
Fix compiling errors of #3070
 2013-07-03 23:19:14 -07:00
Xuejie Xiao a1fbee0bdf Merge remote-tracking branch 'upstream/develop' into add-namespace-to-macro 
Conflicts:
	cocos2dx/cocoa/CCObject.h
 2013-07-04 13:59:36 +08:00
Xuejie Xiao 3401c909d8 Add namespace prefix to selector macros 2013-07-04 13:35:11 +08:00
minggo c327bc7906 issue #2373:add const in pkg files 2013-07-04 12:50:17 +08:00
samuele3hu c5e5c49332 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-04 09:52:28 +08:00
Ricardo Quesada 1d011510af setTexParams() is passed as a const reference 
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
 2013-07-03 17:59:22 -07:00
Ricardo Quesada 216c6eada5 Adds more const in getters 
In Sprite and Texture2D
 2013-07-03 17:44:41 -07:00
Ricardo Quesada adaa72fbb4 Adds const to getters 
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
 2013-07-03 17:22:15 -07:00
Ricardo Quesada 77dbe995d4 Merge branch 'develop' into ios_mac_one_project 2013-07-03 11:39:00 -07:00
James Chen 3fa5c776b8 issue #2359: Using PositionColor shader when texture is NULL in Sprite. 
TODO: PostionTextureColor shader should support empty texture.
 2013-07-03 23:34:45 +08:00
Rene Klacan b040addd53 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into tilemap_plain_xml_format_support 2013-07-03 16:55:32 +02:00
Rene Klacan 294f9f34f7 KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT 2013-07-03 15:51:24 +02:00
James Chen 7892f1ac9d Merge pull request #3053 from dumganhar/iss2285-js-motionstreak 
Adding MotionStreak test for TestJavascript.
 2013-07-03 01:36:07 -07:00
Rene Klacan 92c382be04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into windows_keyboard_support 2013-07-03 10:19:35 +02:00
James Chen 501afdd2e3 closed #2359: Sprite will become white block when using CCControlSwitch. 
setShaderProgram should not be in Sprite::setTexture since setTexture is not related to shader.
 2013-07-03 16:16:30 +08:00
James Chen 331c688f6f Merge pull request #3063 from dumganhar/DarraghCoy-selector_cast_safety 
Merge PR#3058:  Adding extra safety to selector casting macros
 2013-07-03 01:09:09 -07:00
minggo bf47cf55c7 Merge pull request #3059 from jotel/shadow-fix 
Text Shadows fix
 2013-07-03 01:00:03 -07:00
minggo 2f88109a96 Merge pull request #3055 from DarraghCoy/add_rect_union_with_rect 
Add Rect::unionWithRect
 2013-07-03 00:42:55 -07:00
minggo de15064317 Merge pull request #3062 from minggo/iss2346-opengl-error 
Fixed a bug in CCTMXLayer when set uniform
 2013-07-03 00:31:10 -07:00
minggo f089e62e8f closed #2361:fix a crsash caused by Set::removeAllObjects 2013-07-03 15:26:58 +08:00
minggo 1bd5398f91 Merge branch 'cc_draw_solid_circle' of https://github.com/DarraghCoy/cocos2d-x into cc_draw_solid_circle 2013-07-03 14:45:36 +08:00
samuele3hu 5a64c9e1b3 issue #2244:Add some constructor 2013-07-03 14:19:00 +08:00
James Chen 661a934e82 Merge branch 'selector_cast_safety' of https://github.com/DarraghCoy/cocos2d-x into DarraghCoy-selector_cast_safety 2013-07-03 14:06:53 +08:00
samuele3hu 82ba8b0198 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-03 11:20:17 +08:00
Ricardo Quesada 2b73d0cb5f ios and mac projects unified in one simple xcode project 
Not finished yet:
 - iOS only includes Test Cpp (Simple Game not working yet on iOS)

It is easier to maintain and add more targets, files, etc.
 2013-07-02 18:20:38 -07:00
Jaroslaw Lewandowski d26fa847d8 - Fixing shadows for text with stroke in iOS 
- Improved text shadows in Android (they look the same as in iOS)
 2013-07-02 22:45:07 +01:00
Darragh Coy abbbc3191e Add extra safety to selector casting macros 
Use static_cast<> instead of C-Style casts in the callfunc0_selector() etc. series of macros as this will allow the compiler to perform more stringent error checking and catch out cases where incompatible function signatures are being casted. This helps prevent very subtle and difficult to track down bugs where the signature of the function being casted is not what Cocos2dx expect - which can cause strange things to happen and corrupt the current stack frame.
 2013-07-02 14:36:09 -07:00
Darragh Coy e6270e64de Bugfixes to the Set class. 
1: If adding an object to the container then only retain the object again provided it's not already been added. The underlying std::set does not support duplicate entries. (see: www.cocos2d-x.org/boards/6/topics/10876)
2: When removing an object only CC_SAFE_RELEASE it if it was actually contained in the set. (see: http://www.cocos2d-x.org/boards/6/topics/10876)
3: Fix a bug in 'removeAllObjects' where the underlying std::set container was not being cleared. (see: https://github.com/cocos2d/cocos2d-x/issues/2283)
 2013-07-02 14:24:14 -07:00
Darragh Coy e247b5d960 Add ccDrawSolidCircle 
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
 2013-07-02 13:39:16 -07:00
Darragh Coy da58f035c5 Add CCRect::unionWithRect 
Add a new CCRect utility function called 'unionWithRect' which computes the minimum rectangle that contains the current rectangle and another given rectangle, similar to to the following .NET function: http://msdn.microsoft.com/en-us/library/ms521839.aspx
 2013-07-02 11:39:49 -07:00
James Chen ed1fa76fd6 issue #2285: ccColor3B --> const ccColor3B& for MotionStreak::create. 2013-07-02 17:46:45 +08:00
Rene Klacan fc8b60a2cf fixed issues on win32 and mac keyboard 2013-07-02 11:39:18 +02:00
minggo 55202b978a Merge pull request #3048 from dabingnn/iss2328-refractor-etc 
Iss2328 refractor etc
 2013-07-02 01:37:55 -07:00
Huabing.Xu 5929c7662c issue #2328 refractor etc support: 
1. GL_ETC1_RGB8_OES not defined will return not support hardware etc
2. remove some space and comments
 2013-07-02 15:36:47 +08:00
samuele3hu ec801ae89d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-02 15:29:19 +08:00
samuele3hu 9b08cee01f issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
James Chen b843d3cd88 LayerColor::initWithColor should return false when Layer::init() returns false. 2013-07-02 14:45:06 +08:00
Huabing.Xu 5aa0299160 adjust cocos2d.vcxproj.filters 2013-07-02 14:09:01 +08:00
Huabing.Xu 041bef148a Merge branch 'origin/develop' 
Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d.vcxproj.filters
 2013-07-02 13:47:02 +08:00
James Chen 4e5ee103ec Fixing errors on windows. 2013-07-01 18:22:09 +08:00
Huabing.Xu 9642930779 give Texture2D::_pixelFormat a default value in construction 2013-07-01 18:16:56 +08:00
Huabing.Xu 4e9e893c8e 1. Add C++ code to decode ETC file 
2. Configuration and function supportsETC()
 2013-07-01 17:40:57 +08:00
James Chen c2ce65a32b issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too. 2013-07-01 17:35:51 +08:00
James Chen 1ae41d07aa closed #2347: Keyboard is supported from cocos2d-x 3.0. 2013-07-01 17:15:49 +08:00
James Chen 0d040bae76 closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file. 2013-07-01 16:48:42 +08:00
minggo ce3cea2fdb closed #2346: use shader program to set uniform 2013-07-01 16:02:46 +08:00
samuele3hu fe8e30c3e0 issue #2243:Add a uniform fund in ScriptEngineProtocol 2013-07-01 15:04:14 +08:00
Squallium c770a4bdc8 Added ccFPSImages entity as linked resource 2013-06-30 22:00:29 +02:00
Sergey Shambir 1c52517770 CocosDenshion: added effects customization for 7 platforms. 
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.

Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
 2013-06-29 13:44:16 +04:00
James Chen b76798505c closed #2342: Fixing indention. 2013-06-29 15:04:43 +08:00
James Chen bb2f19535b closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled. 2013-06-29 15:01:50 +08:00
Justin Hawkwood 37ca32e75c Corrected code to use textDefinition properties 2013-06-29 15:00:17 +08:00
James Chen e2b9863bf7 issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT. 2013-06-29 11:44:14 +08:00
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
Rene Klacan 47e2421d77 the latest develop code merged 2013-06-29 02:42:47 +02:00
Rene Klacan 444a6e689e added windows keyboard support 2013-06-29 01:46:39 +02:00
Ricardo Quesada b0de6d0e8c Project fixes 
In debug: optimization is NONE, and other small fixes for Mac
 2013-06-27 18:14:24 -07:00
minggo 4dd2b07a32 Merge pull request #3019 from Squallium/develop 
removed libxml2 dependence from libcocos2d
 2013-06-27 00:13:48 -07:00
Squallium f53e4f692f removed libxml2 dependence from libcocos2d 2013-06-27 08:30:55 +02:00
boyu0 9d227f6f1f Fixed Bug#2327:CCNode::isScheduled() is not implemented 
Add CCScheduler::isScheduledForTarget() method
 2013-06-27 12:05:47 +08:00
minggo 8938268183 issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
minggo ca2966745e closed #2305: fix a running time error 2013-06-26 15:11:13 +08:00
minggo 9d44b52ebf issue #2305:use c++11 thread correctly 2013-06-26 14:48:19 +08:00
James Chen 10f4446596 Merge pull request #2998 from sbc100/emscripten_linux 
closed #2333: 1) Share top level Makefile between emscripten, linux and nacl.
2) Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
 2013-06-25 22:43:16 -07:00
James Chen ad7d606b48 Merge pull request #2703 from sergey-shambir/linux_qmake 
close #2332: [Linux] Adding project part for QtCreator.
 2013-06-25 21:57:20 -07:00
James Chen 229e181625 issue #2305: [Win32] Removing the third party library pthreadVCE2. 2013-06-26 12:52:38 +08:00
Sam Clegg f9ae701a4b Fix emscripten build on linux 
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
 2013-06-25 11:47:52 -07:00
minggo 8d782133b8 Merge pull request #2983 from folecr/ccx_filesystem 
Improve Android file system read performance
 2013-06-25 02:05:37 -07:00
James Chen 38d597b308 Merge pull request #2985 from ricardoquesada/mac_workspace 
issue #2325: Adds mac workspace. Not finished.
 2013-06-24 19:56:25 -07:00
Ricardo Quesada ef6f67902f Adds mac workspace 
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
 2013-06-24 18:04:05 -07:00
folecr ee5f319a77 Fix include path 2013-06-24 17:29:24 -07:00
folecr 295f9e0fec Do nothing in the case of forAsync 2013-06-24 16:42:56 -07:00
folecr 2e0804ae29 Remove references to zip file 2013-06-24 15:15:25 -07:00
folecr 21405531aa getFileData() 
* The async case is NYI
 * include stdlib for abort() when forAsync is true
 2013-06-24 15:14:15 -07:00
folecr 7090d8daad isFileExist() 2013-06-24 15:14:15 -07:00
folecr 0422953bbe Native Asset Manager 2013-06-24 15:14:14 -07:00
folecr e916cef32b #define LOGD 2013-06-24 15:14:14 -07:00
folecr be6633b560 Add -landroid to LOCAL_LDLIBS and LOCAL_EXPORT_LDLIBS 2013-06-24 15:14:14 -07:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 62902ad212 Fixing compilation errors for Emscripten port. 2013-06-24 10:21:36 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 1b3d0c39ad issue #2322: Action now is inherited from Object and Clonable now. 2013-06-23 17:22:23 +08:00
James Chen 195605c85d issue #2322: Macro CC_DLL take no effect now since we are using static library. 2013-06-23 17:21:13 +08:00
James Chen aaeb4e13b0 issue #2322: Adding Property Sheet cocos2dx.props for sharing project configuration. Now it's only for linking libraries. 2013-06-23 17:20:12 +08:00
Ricardo Quesada 64d7cd404e Removes copy from Point. 
Adds clone instead
 2013-06-21 15:13:52 -07:00
Ricardo Quesada 6c0c48a3a9 Removes CallFuncO and CallFuncND 
...which can be simualted with CallFunc and CallFuncN.

Adds std::function() support to CallFuncN.
Adds more samples
 2013-06-21 14:58:52 -07:00
James Chen 4a8eabd97f Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 17:01:22 +08:00
minggo b434190a70 issue #2305: tab -> 4 spaces 2013-06-21 15:49:45 +08:00
minggo ef7fd16f76 issue #2305: tab -> 4 spaces 2013-06-21 15:43:17 +08:00
minggo 68559dfa00 issue #2305: use c++11 thread instead of pthread in CCTextureCache 2013-06-21 15:29:21 +08:00
James Chen 56f8ab2675 Typo fixes in CCNode.h. 2013-06-21 13:47:29 +08:00
James Chen e7ee2f2151 [Win32] undef MessageBox since it will be conflicted with cocos2d::MessageBox. 2013-06-21 11:57:14 +08:00
James Chen b74db627af Don't make Action be inherited from Clonable. Why?? Please refer to https://groups.google.com/forum/?hl=en#!topic/cocos2d-js-devel/dGJYz9wIb4Q , but we need to find out the real reason why VS compiler generate linking errors. 2013-06-21 11:19:17 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
James Chen 2a715ec3cf Merge pull request #2956 from ricardoquesada/cc_namespace_obj 
issue #2129: Re-adds 'CC' prefix to objective-c classes.
 2013-06-20 19:10:01 -07:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
Sam Clegg 04d7d5a061 [NaCl] Add support for building using glibc toolchain. 
BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14694016
 2013-06-20 12:56:14 -07:00
Sam Clegg b5a509e65e [NaCl] Don't cache font size 
This avoids churn of the cached font when different
sizes of the same font are requested sequentially.

Review URL: https://codereview.chromium.org/14308007
 2013-06-20 12:56:13 -07:00
Sam Clegg 5c4545de3c [NaCl] Remove use of -lnosys 2013-06-20 12:56:13 -07:00
Sam Clegg 47878c1855 [NaCl] Remove legacy nacl_mounts usage. 
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
 2013-06-20 12:56:12 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
James Chen 8b9090eb55 fixed #2315: [JSB] Iterating through cc.Node children causes crash. 2013-06-20 22:51:54 +08:00
zcgit c9627abd3d Update CCLayer.cpp 
change "_accelerometerEnabled = false"
to "setAccelerometerEnabled(false)"
in method init().
 2013-06-20 21:48:27 +08:00
zcgit 6149f52ffd a potential bug in Layer. 
https://github.com/cocos2d/cocos2d-x/issues/2948
 2013-06-20 21:27:22 +08:00
James Chen 2ceec2f65d Merge pull request #2947 from pyrasis/tizen_2.1 
[Tizen] Fix compile error
 2013-06-20 04:58:21 -07:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 8b2b95ab4d [WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object 2013-06-20 18:02:37 +08:00
James Chen 6ce5064f32 [WIN32] NULL --> nullptr for CCLayer.cpp. 2013-06-20 18:01:53 +08:00
James Chen a90f51d03a Merge branch 'develop' of z:/Project/cocos2d-x into develop 2013-06-20 17:38:23 +08:00
James Chen d79ecd038c Merge pull request #2942 from dumganhar/iss2129-format-codes3 
closed #2129: Removing CC prefix to make cocos2d-x more CPP friendly.
 2013-06-20 01:19:49 -07:00
minggo 9caa40590a Merge pull request #2941 from minggo/iss2304-refator-cclayer 
fix a crash on android
 2013-06-20 00:06:55 -07:00
minggo e39df16d49 use correct pointer to be closed 2013-06-20 15:03:51 +08:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
James Chen 136a9743d4 issue #2129: [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones. 2013-06-20 12:56:51 +08:00
minggo 227e95d429 Merge pull request #2936 from minggo/iss2304-refator-cclayer 
issue #2304:accelerometer fix of mac
 2013-06-19 19:58:15 -07:00
minggo 924ba1bdca issue #2304:accelerometer fix of mac 2013-06-20 10:56:13 +08:00
minggo 8d4f715008 Merge pull request #2929 from minggo/iss2304-refator-cclayer 
issue #2304:use function to simplify acceremeter call back
 2013-06-19 01:43:18 -07:00
James Chen 663673b683 Adding missing include in ZipUtils.h. 2013-06-19 16:11:16 +08:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen 016d34d889 Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919 2013-06-19 15:08:09 +08:00
James Chen 86f7fd4988 Merge pull request #2925 from dumganhar/musikov-develop 
fixed #2303: Missing precision when getting strokeColor and fontFillColor
 2013-06-18 23:27:57 -07:00
James Chen e6c14edf18 Merge pull request #2907 from waiter/master 
fixed #2306: update “solve android crash with CCLabelTTF setString function”
 2013-06-18 23:22:54 -07:00
James Chen b7a33afc71 fixed #2303: float assignment fix. 2013-06-19 14:09:23 +08:00
James Chen f007819f74 Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop 
Conflicts:
	cocos2dx/textures/CCTexture2D.cpp
 2013-06-19 14:05:55 +08:00
James Chen b91e432258 Merge pull request #2924 from dumganhar/j4m3z0r-emscriptenate 
fixed #2301: Asynchronous Image loading for Emscripten.
[emscripten] Merge PR https://github.com/cocos2d/cocos2d-x/pull/2919
 2013-06-18 22:56:02 -07:00
minggo ef254fe6b0 Merge pull request #2918 from superrad/patch-1 
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as P...
 2013-06-18 22:53:29 -07:00
James Chen 8f33bf7e05 issue #2301: _pTextures --> _textures. 2013-06-19 13:40:21 +08:00
James Chen fa6a0d4051 issue #2301: m_pTextures --> _pTextures. 2013-06-19 13:15:03 +08:00
James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate 
Conflicts:
	cocos2dx/proj.emscripten/cocos2dx.mk
 2013-06-19 13:03:51 +08:00
James Chen c4386b9b15 Merge branch 'clone_reverse_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-clone_reverse_fixes 2013-06-19 10:50:27 +08:00
Lee, Jae-Hong b546fc3214 Implement Accelerometer. 2013-06-19 09:31:34 +09:00
Ricardo Quesada 159ef1ec68 clone() doesn't use copy constructor 
... and other bug fixes
 2013-06-18 15:06:53 -07:00
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes 
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
 2013-06-18 09:59:34 -07:00
Andrew Glass 9df6d1271b CCTexturePVR now sets its _format when unpacking from PVRv3 as well as PVRv2 
When loading a PVRv3 the _format variable would not be set, always being the default value.
 2013-06-18 16:16:17 +02:00
minggo e9d8595617 fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe 2013-06-18 17:10:54 +08:00
James Gregory ad90fe88a8 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-06-17 20:30:36 -07:00
waiter ecebf31287 solve android crash with CCLabelTTF setString function 
solve android crash with CCLabelTTF setString function
 2013-06-18 10:08:34 +08:00
James Gregory 5095b03f9c Get async image loading building with -O2 and asm.js 2013-06-17 17:10:41 -07:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
James Chen 8fb40eaee2 android target 17 --> 8. 2013-06-17 15:55:09 +08:00
James Chen 12d83f543b Merge pull request #2900 from dumganhar/flaming0-develop 
merge PR https://github.com/cocos2d/cocos2d-x/pull/2897
 2013-06-15 20:22:28 -07:00
James Chen 4c6043c9d2 Merge pull request #2898 from pyrasis/tizen_2.1 
[Tizen] Add armv7l webp library.
 2013-06-15 20:03:37 -07:00
Ricardo Quesada a0cbef1005 Adds missing methods: clone() and reverse() 2013-06-15 19:44:39 -07:00
Lee, Jae-Hong 8c1953eed9 Add armv7l webp library. 2013-06-16 11:07:55 +09:00
Ricardo Quesada 71ea3c7a3c Fixed headers. Compiles but it doesn't link yet. 
Many methods not implemented yet.
 2013-06-15 18:54:34 -07:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
Ricardo Quesada e40adb7ae7 EaseActions and more 
Added more reverse() const
 2013-06-15 12:38:32 -07:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 1cfca9bc60 Updating property in CCDictionary. 2013-06-15 13:42:05 +08:00
James Chen 7295551f0f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-15 11:15:28 +08:00
minggo 5e83f36433 issue #2284: not treat using deprecated functions as error 2013-06-14 17:32:07 +08:00
minggo 47f4aee3cc issue #2284: use GLuint to fix compiling error 2013-06-14 16:48:18 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
minggo ab8448e96b issue #2284: enable c++11 for emscripten port 2013-06-14 15:27:11 +08:00
minggo 400642baa8 issue #2284: initialize parameter as declared 2013-06-14 15:18:35 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
James Chen e56c63b03d Merge pull request #2884 from ricardoquesada/actions_clone_pattern 
issue #2289: Actions with clone() pattern 1/3
 2013-06-13 23:19:04 -07:00
Ricardo Quesada 8a6d33a212 Adds CC prefix to CALLBACK() 
Now it is called: CC_CALLBACK()
 2013-06-13 20:36:43 -07:00
Ricardo Quesada e2e68aa36d Removes "calling explicit constructor" 2013-06-13 20:08:56 -07:00
Ricardo Quesada 98190a21c0 Actions with clone() pattern 1/3 
This is the 1st patch of 3.

1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
 2013-06-13 17:25:14 -07:00
Mykyta Usikov 28e8899089 fixed strokeColor and fontFillColor of CCLabelTTF 2013-06-13 14:16:33 +03:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen b372fc8534 Merge pull request #2872 from maciekczwa/develop 
fixed #2283: Adding Polish language support.
 2013-06-13 00:00:36 -07:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
minggo 5996e99b74 Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks 
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
 2013-06-12 22:51:21 -07:00
Ricardo Quesada c1d519aac2 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-13 10:46:28 +08:00
minggo 92ce25371a Merge pull request #2874 from ricardoquesada/labelttf_mac_fix 
LabelTTF vertical alignment fixed on OS X
 2013-06-12 19:45:31 -07:00
Ricardo Quesada 1780643c63 merge pull reqeust fixing for iOS7 and Xcode5 into master 2013-06-13 10:43:41 +08:00
James Gregory 872be8e964 Initial commit of browser accelerated async image-loading code for Emscripten. 2013-06-12 14:46:32 -07:00
James Gregory cdb63898d9 Simplify AsyncStruct slightly -- make it a class, add a constructor. 2013-06-12 10:03:12 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada 83b43ab93e Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2 
Handy macros for callbacks.
Instead of:
	std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
	CALLBACK_1(func_ptr, instance)

And also removes more warnings from the tests
 2013-06-11 16:30:05 -07:00
Ricardo Quesada 75b9913c92 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-11 14:59:40 -07:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
Maciej Czerniak dddb487639 fix formatting 2013-06-11 16:43:35 +02:00
Maciej Czerniak c9b88e1c0c add missing Norwegian language for marmelade platform 2013-06-11 16:41:54 +02:00
Maciej Czerniak eb79c01003 add missing Norwegian language for linux platform 2013-06-11 16:39:33 +02:00
Rene Klacan 44851e36e9 removed forgotten debug printf 2013-06-11 15:37:51 +02:00
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
minggo 29607bd741 fixed #2259:add description of path that custom font can put in 2013-06-10 23:01:48 +08:00
James Chen 5da7a7692e Fixing a logic error in CCDirector.cpp. 2013-06-10 21:19:22 +08:00
Rene Klacan 83be06bafb check if delegate is not null when dispatching keyboard event 2013-06-10 00:54:31 +02:00
minggo c84a071ae5 issue #2271: fixed memory leak of CCTextureCache::snapshotTextures() 2013-06-09 15:08:26 +08:00
minggo ec7bf7a9d6 issue #2271: fixed memory leak of CCTextureCache::snapshotTextures() 2013-06-09 15:03:38 +08:00
James Chen 4edd35e2b1 Merge pull request #2829 from dumganhar/nacl-fix 
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
 2013-06-08 03:00:04 -07:00
minggo 6eaa1f97ec Merge pull request #2828 from minggo/develop 
fixed #2161: fixed crash of loading ETC file
 2013-06-08 02:02:52 -07:00
minggo d5bfe10379 fixed #2161: fixed crash of loading ETC file 2013-06-08 17:01:45 +08:00
minggo 2e9c4c55de Merge pull request #2827 from minggo/master 
fixed crash of loading ETC file
 2013-06-08 02:00:19 -07:00
minggo 2b3f3b6744 fixed #2161: fixed crash of loading ETC file 2013-06-08 16:58:18 +08:00
James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix 2013-06-08 15:42:41 +08:00
James Chen 51aa2433fc Updating makefile for native client. 2013-06-08 15:35:45 +08:00
minggo 52f55802b7 Merge pull request #2826 from minggo/develop 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:44:01 -07:00
minggo f56c20657b fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:42:52 +08:00
minggo ababa5e885 Merge pull request #2825 from minggo/master 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:41:54 -07:00
minggo 6d3615157a fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:40:03 +08:00
minggo f2be4c62ee Merge pull request #2820 from minggo/develop 
fixed #2161: don't close AssetManager
 2013-06-07 20:24:27 -07:00
minggo b023158c85 fixed #2161: don't close AssetManager 2013-06-08 11:23:13 +08:00
James Chen 2fae3db792 Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it. 2013-06-08 11:10:39 +08:00
carlo morgantini 494ec43fe8 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-08 10:59:07 +08:00
minggo cdf24ceba1 Merge pull request #2815 from minggo/master 
fix a bug of Cocos2dxETCLoader.java
 2013-06-07 19:58:47 -07:00