Commit Graph

707 Commits

Author SHA1 Message Date
boyu0 6bc0a7066f change CustomCommand variable to class member. 2013-12-26 21:19:12 +08:00
samuele3hu 756a72cbca Reconstruct the operation of handling lua script event 2013-12-26 19:43:49 +08:00
boyu0 dec003477c delete ‘delete ptr’ and add CC_UNUSED_PARAM 2013-12-26 19:25:53 +08:00
boyu0 d32fbbbfca change GroupCommand variable to class member. 2013-12-26 18:11:23 +08:00
boyu0 2fb0179293 change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
boyu0 f878864794 Specialize GroupCommand and CustomCommand, change generateCommand to new. 2013-12-26 15:41:47 +08:00
Huabing.Xu 963d637198 use raw new instead of generateCommand 2013-12-26 14:45:44 +08:00
Huabing.Xu b4c61d5a7c specialize RenderCommandPool<QuadCommand> 2013-12-26 14:44:21 +08:00
James Chen 142b189305 Some warning fixes. 2013-12-25 16:06:39 +08:00
James Chen 55b0ef85d8 Merge pull request #4631 from boyu0/const_char_star_to_std_string
Change const char* to const std::string&
2013-12-24 22:34:34 -08:00
boyu0 2c2953abc1 change “string.compare()” to “==“ 2013-12-25 14:20:37 +08:00
boyu0 f2e18f32a9 fix android compile error 2013-12-25 13:57:17 +08:00
James Chen 6fce4f9061 Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead. 2013-12-25 11:00:51 +08:00
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
2013-12-25 10:41:37 +08:00
James Chen 17a6dbebb6 Compilation error fixes. 2013-12-24 19:05:35 +08:00
James Chen 1f5611ae05 Adds missing ‘)’. 2013-12-24 18:23:36 +08:00
James Chen 0ff85852cc Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead. 2013-12-24 18:08:40 +08:00
Huabing.Xu b6dc3d0371 fix clippingNode bug 2013-12-24 17:16:28 +08:00
James Chen 81d073aff0 Reverts FileUtil::getFileData to virtual function. 2013-12-24 16:29:55 +08:00
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor
Conflicts:
	tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
boyu0 1a453a26ab Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
	cocos/2d/renderer/CCNewSpriteBatchNode.cpp
	cocos/2d/renderer/CCNewSpriteBatchNode.h
2013-12-24 16:07:25 +08:00
James Chen f527b50ce6 Merge pull request #4630 from dumganhar/iss3492-bmfont-fix
closed #3492: LabelBMFont string can't be shown integrally.
2013-12-23 23:56:38 -08:00
James Chen 7ee0771101 closed #3492: LabelBMFont string can't be shown integrally.
Issue URL:  http://www.cocos2d-x.org/issues/3492
2013-12-24 15:55:45 +08:00
boyu0 6e6ccbd5f9 change some const char* to const std::string& 2013-12-24 15:49:58 +08:00
Dhilan007 f140ece282 update vs project for remove some file into renderer. 2013-12-24 15:34:40 +08:00
James Chen 0305ff15db Merge pull request #4625 from dabingnn/develop_NewClippingNode
Develop new clipping node
2013-12-23 23:20:38 -08:00
Huabing.Xu 5cc45493ef remove commented codes 2013-12-24 15:13:37 +08:00
Huabing.Xu ccf47e6422 remove commented codes 2013-12-24 15:11:01 +08:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
2013-12-23 22:55:58 -08:00
Huabing.Xu 07bc4d34a8 some rename for global variables and member functions. 2013-12-24 14:53:49 +08:00
Huabing.Xu c36d920159 remove include reference 2013-12-24 14:15:23 +08:00
Huabing.Xu eee06ec905 update project file:android and linux 2013-12-24 14:12:15 +08:00
Huabing.Xu 9db599c0c9 remove class NewClippingNode 2013-12-24 14:10:54 +08:00
Huabing.Xu e7facf9f85 remove NewClippingNode feature function into ClippingNode 2013-12-24 14:08:57 +08:00
boyu0 8e329501ba Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
	cocos/2d/renderer/CCNewSprite.cpp
	cocos/2d/renderer/CCNewSprite.h
	cocos/2d/renderer/CCNewTextureAtlas.cpp
	cocos/2d/renderer/CCNewTextureAtlas.h
2013-12-24 11:44:08 +08:00
Huabing.Xu b821a33cfa remove comment code 2013-12-24 11:28:42 +08:00
Huabing.Xu 12e2cfedf2 update project file:android and linux 2013-12-24 11:20:21 +08:00
Huabing.Xu 24ac743a3c remove class NewSpriteBatchNode 2013-12-24 11:03:59 +08:00
boyu0 3344c5243c change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
Huabing.Xu b61bf3ad95 LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode
remove NewSpriteBatchNode testcase to SpriteBatchNode
2013-12-24 10:51:35 +08:00
Huabing.Xu 410cfb9ca4 move NewSpriteBatchNode feature function into SpriteBatchNode 2013-12-24 10:48:57 +08:00
Huabing.Xu 8310c18105 update project file: android and linux 2013-12-24 10:07:53 +08:00
Huabing.Xu c4f4f91cb4 Merge branch 'develop' into develop_mergeNewSprite
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Binds Node::setAnchorPoint manually.
  Don’t hide parent’s addChild method in TMXLayer class.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates JS-tests to the latest version.
  [Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
  Updates js tests to the latest version.
  Removes unneeded binding glue codes, Sprite::setPosition.
  Bindings-generator skips Node::setContentSize. Binds it manually.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3353:Add the DisplayLinkDirector lua binding
  issue #2771: fix warning log and fix typo.
  issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-24 10:03:21 +08:00
Huabing.Xu 8d58e43ad2 remove Class NewSprite 2013-12-24 09:40:00 +08:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen 44f9009a5d Merge pull request #4610 from dumganhar/lastest-js-test
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
James Chen 5f17984826 Don’t hide parent’s addChild method in TMXLayer class. 2013-12-23 21:53:23 +08:00
Huabing.Xu e66eb6464d use Sprite instead of NewSprite 2013-12-23 21:07:25 +08:00
Huabing.Xu c3247c800f merge feature function from NewSprite into Sprite 2013-12-23 21:06:37 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
Huabing.Xu b3eb297249 Merge branch 'develop' into develop_mergeNewTextureAtlas
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  closed #3478: BitmapFontMultiLineAlignment test shows some unneeded 'line break'
  Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
  Updates bindings-generator, skips to bind override functions.
  Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 20:12:06 +08:00
Huabing.Xu 1dd2c1c20c remove NewTextureAtlas 2013-12-23 20:11:50 +08:00
James Chen bbbfa4b106 Merge pull request #4603 from dabingnn/develop_mergeNewRenderTexture
Develop merge new render texture
2013-12-23 04:09:33 -08:00
Huabing.Xu 98d573f4cb rename protected _beginWithClear to beginWithClear 2013-12-23 19:59:09 +08:00
James Chen eb9cb237d5 Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
closed #3480: Removes unneeded codes of override function.
2013-12-23 03:43:27 -08:00
Huabing.Xu 0dab85a3bf update CMakeLists.txt 2013-12-23 18:37:18 +08:00
Huabing.Xu 75597bc47f Merge branch 'develop' into develop_mergeNewRenderTexture
* develop:
  [LUA] Removes CCCameraDeprecated table in Deprecated.lua.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
  Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583).
  issue #3403:Delete Camera manual lua binding
  issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-23 18:34:12 +08:00
James Chen 8c3315de76 closed #3478: BitmapFontMultiLineAlignment test shows some unneeded 'line break' 2013-12-23 18:23:39 +08:00
Huabing.Xu 9c97fc6f19 remove NewRenderTexture include file 2013-12-23 18:08:50 +08:00
Huabing.Xu bcaec978d3 remove NewRenderTexture Class 2013-12-23 18:04:04 +08:00
Huabing.Xu 487e0b21af update Xcode project file& android.mk 2013-12-23 18:03:08 +08:00
Huabing.Xu 41a77fed61 TestCase Use RenderTexture instead of NewRenderTexture 2013-12-23 17:13:41 +08:00
Huabing.Xu a7a50dffcc move begin(), end(),draw() to RenderTexture 2013-12-23 17:13:06 +08:00
James Chen ed93f90ccc Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
Huabing.Xu fad585fbef move rendering callback to RenderTexture 2013-12-23 15:59:47 +08:00
boyu0 0cbbfdba8c closed #2050: Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
	cocos/2d/CCTMXLayer.cpp
2013-12-23 15:40:33 +08:00
Huabing.Xu b7c0d7a9e8 1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear 2013-12-23 14:59:44 +08:00
James Chen 2fec81fcae Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
	tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
James Chen aeafe06d7f Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
James Chen 11423b5851 Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant. 2013-12-23 11:53:39 +08:00
boyu0 1072711a4c issue #2050: use static_cast 2013-12-23 10:46:35 +08:00
boyu0 baf8cb06c5 issue #2050: delete max/minGID, fix firstGID bug 2013-12-23 10:37:46 +08:00
samuele3hu 7daace0b2a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-23 09:43:05 +08:00
samuele3hu 50bcdee725 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-22 22:11:17 +08:00
samuele3hu 97f26176e8 issue #3403:Add the EventDispatcher lua binding and the releated test cases 2013-12-22 22:10:21 +08:00
Dhilan007 786b7d9912 update vs project for remove CCCamera. 2013-12-22 17:19:59 +08:00
Ricardo Quesada 4f435a8613 Adds getScene() to Node
helper function to get the Scene containing the Node
2013-12-21 12:28:49 -08:00
Ricardo Quesada 49903ea779 Director emits events after visit, after draw and after update. And when the projection changes
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
2013-12-21 10:55:16 -08:00
Ricardo Quesada eea2e70d1e Adds events in director 2013-12-21 00:56:28 -08:00
Ricardo Quesada 72d77bb035 removes dirty from ActionCamera 2013-12-20 19:45:30 -08:00
Ricardo Quesada eadbaa3bf5 Adds comment to ActionCamera file 2013-12-20 19:37:14 -08:00
Ricardo Quesada fd8c7e9a5d Removes CCCamera
Not needed anymore.
2013-12-20 19:24:56 -08:00
Ricardo Quesada b8b7714431 Camera is working OK in 2d projection 2013-12-20 19:19:24 -08:00
Ricardo Quesada d8ad5291f4 Nore camera 2013-12-20 16:33:31 -08:00
Ricardo Quesada 0703d974e2 NodeGrid fixes
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
2013-12-20 11:52:52 -08:00
James Chen 2a7b2c107a Updates CCUserDefaultAndroid.cpp. 2013-12-20 21:51:53 +08:00
minggo 9bea08ded9 Merge pull request #4580 from dabingnn/develop_MotionStreak
Migrate MotionStreak to new renderer
2013-12-20 05:36:52 -08:00
Huabing.Xu 739cf0ce85 Migrate MotionStreak to new renderer 2013-12-20 21:21:50 +08:00
James Chen 9e05f300f3 [Data Refactor] compilation error fix. 2013-12-20 21:16:46 +08:00
James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
James Chen 3d76281617 Removes an unused assert. 2013-12-20 19:49:25 +08:00
James Chen 5852c66e5a closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
Huabing.Xu a8d2ae9eda Merge branch 'develop' into develop_transitionScene
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  closed #3463: Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()), We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  closed #3457: Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 19:15:50 +08:00
byeonggee.seo f3e4d9277e spine android build phase moved 2013-12-20 19:16:16 +09:00
James Chen e54c993918 Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 00:13:05 -08:00
Huabing.Xu ef5b072182 fix transition scene CrossFade 2013-12-20 14:38:02 +08:00
James Chen 2c590cea3e closed #3457: Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now. 2013-12-20 14:06:24 +08:00
Huabing.Xu 87f62bc8a0 Merge branch 'develop' into develop_transitionScene
* develop:
  #include <string> in CCComponentContainer.h to fix linux build failure.
  #include <algorithm> for std::find in CCVector.h.
  const love in CCFileUtils.cpp.
  More std::for_each —> for(const auto& …)
2013-12-20 12:45:22 +08:00
minggo ea751f8f1f Merge pull request #4568 from dabingnn/develop_transitionScene
fix transition scene progress timer
2013-12-19 19:06:06 -08:00
Huabing.Xu 9385fb3481 fix transition scene progress timer 2013-12-20 10:53:35 +08:00