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

851 Commits

Author SHA1 Message Date
James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding 
Conflicts:
	cocos/editor-support/cocostudio/TriggerMng.cpp
 2013-12-30 21:06:57 +08:00
James Chen 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +08:00
Huabing.Xu c030553d8c Fix missed popMatrix 2013-12-30 20:25:25 +08:00
minggo 3680995f0b Merge pull request #4742 from minggo/develop 
update cocos2d-x version string
 2013-12-30 04:23:41 -08:00
minggo 046d6696bc update cocos2d-x version string 2013-12-30 20:22:25 +08:00
boyu0 0984eafaef closed #2050: move autorelease to CLN 2013-12-30 15:32:04 +08:00
Huabing.Xu 1962dfa52d migration transition page turn to new renderer 2013-12-30 14:43:18 +08:00
minggo 0e9b43248c Merge pull request #4728 from dabingnn/develop_removeCommandPool 
Develop remove command pool
 2013-12-29 21:53:12 -08:00
boyu0 1f72fafd08 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 
Conflicts:
	cocos/2d/CCTMXXMLParser.cpp
	cocos/2d/CCTMXXMLParser.h
 2013-12-30 12:30:59 +08:00
James Chen d72a9d2c0d Merge pull request #4727 from dumganhar/develop 
Fix of wrong include symbol of CCVector.h
 2013-12-29 19:55:58 -08:00
James Chen c5c03a3b35 Fix of wrong include symbol of CCVector.h 2013-12-30 11:55:01 +08:00
boyu0 a76c59f644 closed #2050: add tile map xml format test and fix tile property bug. 2013-12-30 11:33:41 +08:00
James Chen 200f07dc34 closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch. 2013-12-30 11:10:02 +08:00
James Chen 31e2b3d5c2 Merge pull request #4715 from SBKarr/develop 
closed #3542: AngelCode binary file format support for LabelBMFont.
 2013-12-29 18:11:19 -08:00
Roman "SBKarr 93f6d9c4f5 Added test case for binary fnt file 
Also, fixed nul-termination issue in file parsing
 2013-12-28 23:00:07 +04:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
Roman "SBKarr b0e6b5a43f AngelCode binary file format support for LabelBMFont 2013-12-27 22:32:07 +04:00
minggo 3760cddf49 Merge pull request #4705 from Dhilan007/failed_dispatch_receive 
fix failed to receive dispatch signal on some android device
 2013-12-27 04:33:30 -08:00
James Chen 9baa64f274 Merge pull request #4688 from walzer/develop 
make CC_USE_PHYSICS can ACTUALLY be switch off
 2013-12-27 04:04:48 -08:00
James Chen bf881f3ac0 Merge pull request #4691 from samuele3hu/DispatcherBak1 
Reconstruct the operation of handling lua script event
 2013-12-27 03:58:08 -08:00
Dhilan007 b319cb58ac fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m]. 2013-12-27 18:05:48 +08:00
minggo ec3b3ea012 Merge pull request #4696 from dumganhar/warning-fix 
Some warning fixes on linux.
 2013-12-27 01:56:47 -08:00
CaiWenzhi 385894548d Merge branch 'develop' into develop_nutty_modify_framework_addnewreader 2013-12-27 17:19:29 +08:00
James Chen a47a7075e4 Merge pull request #4699 from boyu0/iss3509_physics_switch_foreground_bug 
closed #3509: Sprites with PhysicsBody moves to wrong position when swit...
 2013-12-27 00:28:43 -08:00
CaiWenzhi e45c2a8601 Modify manager of some widgets' children 2013-12-27 16:01:03 +08:00
boyu0 1e8e15506d closed #3509: Sprites with PhysicsBody moves to wrong position when switch foreground/background. 2013-12-27 15:53:55 +08:00
walzer ece68aafc2 add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0 2013-12-27 15:49:08 +08:00
James Chen febc19ea8d Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
Dhilan007 861925e752 fix compiling error in vs project on win7. 2013-12-27 14:38:22 +08:00
Huabing.Xu 66e550e5a0 Merge branch 'develop' into develop_removeCommandPool 
* develop: (33 commits)
  fix black screen when back to foreground  on android.
  Fix set FPS broken.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Update CCString.cpp
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Renames: IntValueMap —> ValueMapIntKey
  Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
  Modify reader
  long --> ssize_t for TableView callback.
  Generates execute file in cocos root_dir/bin folder for HelloCpp.
  Add listview and pageview  reader
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Modify actionnode
  [AUTO] : updating submodule reference to latest autogenerated bindings
  optimize loop
  fix LabelTestNew
  Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
  Fix box2dView
  ...
 2013-12-27 14:07:04 +08:00
Huabing.Xu 76d07fc76e remove empty interface releaseToCommandPool 2013-12-27 14:02:17 +08:00
Huabing.Xu 268f2fcc21 adjust comment codes 2013-12-27 13:52:44 +08:00
Huabing.Xu 40af66a7bc remove commandPool in renderCommand 2013-12-27 13:51:11 +08:00
minggo ef6295f046 Merge pull request #4693 from Dhilan007/black_screen_android 
fix black screen when back to foreground  on android.
 2013-12-26 21:46:18 -08:00
Dhilan007 f250d24766 fix black screen when back to foreground on android. 2013-12-27 11:56:56 +08:00
James Chen 0d9fe874a3 Fix set FPS broken. 2013-12-26 19:49:54 -08:00
samuele3hu d51440f62a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
 2013-12-27 11:17:11 +08:00
samuele3hu 6d9e865f15 Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong 2013-12-27 10:35:44 +08:00
walzer d7704d574a issue #3517, enable CC_USE_PHYSICS by default 2013-12-27 00:00:50 +08:00
walzer c5e95618d9 fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment 2013-12-26 23:55:05 +08:00
James Chen 17ff6ef764 Renames: IntValueMap —> ValueMapIntKey 2013-12-26 22:07:20 +08:00
boyu0 a19d212f4f fix bug. 2013-12-26 22:00:52 +08:00
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
James Chen e56a4a7c00 Merge pull request #4567 from dumganhar/for_each-gone 
All std::for_each has gone. uses for(const auto& ...) instead.
 2013-12-19 18:50:50 -08:00
James Chen a53f00c579 #include <string> in CCComponentContainer.h to fix linux build failure. 2013-12-20 10:41:29 +08:00
minggo 756f8f7a11 Merge pull request #4482 from dabingnn/develop_gridNode 
Develop grid node
 2013-12-19 18:30:42 -08:00
James Chen 58772d7dec const love in CCFileUtils.cpp. 2013-12-20 10:11:41 +08:00
James Chen 34382b4a8a More std::for_each —> for(const auto& …) 2013-12-20 09:54:50 +08:00
boyu0 19e1609c27 issue #2050: unsigned int to int 2013-12-20 09:50:53 +08:00
Ricardo Quesada f5d0d1ce43 batched children work as expected 
Fixed order in the multi matrix.
 2013-12-19 16:33:47 -08:00
Ricardo Quesada 59fee6b8d2 replaces std::for_each with for() 
replaces `std::for_each` with C++11 `for( : )`
 2013-12-19 13:34:41 -08:00
Damien 52c66a678c Fixed non-functioning default value for CCUserDefault::getDoubleForKey() 
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
-  CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);

Fix Tested on Android. Affects Android only.
 2013-12-19 12:32:51 -08:00
Huabing.Xu 61cf9e49eb change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter 2013-12-19 22:01:32 +08:00
Huabing.Xu 517fec4de7 change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter 2013-12-19 21:49:21 +08:00
Huabing.Xu 034e1152e5 minor change accord to cocos2d coding style 2013-12-19 21:41:07 +08:00
Huabing.Xu 9fec597ff3 remove unreachable code 2013-12-19 21:36:44 +08:00
James Chen 3dc052db4f Fixes linux and windows building failure. 2013-12-19 20:32:22 +08:00
Huabing.Xu 44366c653c fix compile error 2013-12-19 17:20:36 +08:00
Huabing.Xu d51ad36613 Merge branch 'develop' into develop_gridNode 
* develop: (67 commits)
  Adds const in ShaderTest2.h
  Skew works again!
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Reverts submodule.
  Updates submodule of bindings-generator.
  Adds `std::for_each` test in invocation
  Reverts bindings-generator.
  fixed not render
  iterator in Sprite fixes
  update vs project for removes unneeded files
  getNodeToParentTransform fixes
  Node cleanup
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Improves SpriteTest
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Android and Linux fixes
  removes `using namespace std` from header file
  Removes unneeded files
  change play arguments
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-19 17:20:22 +08:00
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 2013-12-19 17:05:59 +08:00
Huabing.Xu 911e5b0bac fix bug : group command nesting will cause infinite loop 2013-12-19 16:55:22 +08:00
Huabing.Xu 1bc7250f7e node grid migrating to new renderer 2013-12-19 16:54:39 +08:00
Ricardo Quesada 1d3cc7a24c Skew works again! 2013-12-18 21:11:06 -08:00
James Chen d31c1457b1 Merge pull request #4546 from Dhilan007/update_vsProject 
update vs project for removes unneeded files
 2013-12-18 19:30:21 -08:00
Ricardo Quesada d138925aa0 Merge branch 'develop' into node_fixes 2013-12-18 18:33:56 -08:00
Ricardo Quesada b9a64725ab iterator in Sprite fixes 
And replaces some std::for_each() with for() to prevent another object in the stack.
 2013-12-18 18:33:04 -08:00
Dhilan007 ffa6ad3cb2 update vs project for removes unneeded files 2013-12-19 10:24:50 +08:00
minggo 9fc28e6c7d Merge pull request #4534 from boyu0/edit_hungarian_notation 
Edit hungarian notation
 2013-12-18 18:10:17 -08:00
Ricardo Quesada 89701f5006 getNodeToParentTransform fixes 
Code is cleaner.
`Armature` calls parent to reduce code.

[]: Skew is still not working properly
 2013-12-18 18:00:55 -08:00
boyu0 c6cc77e75b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-19 09:45:21 +08:00
Ricardo Quesada 8390e7eadb Node cleanup 
Uses "normal" interation without the lambda to prevent another object in the stack.

removed unused code.
 2013-12-18 16:56:59 -08:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest 
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
 2013-12-18 13:52:10 -08:00
Ricardo Quesada b36d77b1c2 Android and Linux fixes 2013-12-18 12:07:51 -08:00
Ricardo Quesada 903844c7bd Removes unneeded files 
New functionality is merged into the 'official' classes
 2013-12-18 11:44:45 -08:00
boyu0 d0b039ceda fix compile errors. 2013-12-18 22:44:03 +08:00
boyu0 71be55a9aa revert AccelerometerSimulation.m 2013-12-18 19:02:49 +08:00
boyu0 f16384a105 fix more code with hungarian notation 2013-12-18 18:51:36 +08:00
boyu0 082c3d274a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:05:30 +08:00
boyu0 e07c4ffec1 Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
Huabing.Xu 46d1d5bb91 add GridNode New renderer imp 2013-12-18 17:19:50 +08:00
James Chen 7719c692b8 More warning fixes. 2013-12-18 16:03:07 +08:00
James Chen 581ba49399 Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-18 15:41:57 +08:00
James Chen 2892e8be3f Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
Dhilan007 2d9b7ee4fc update vs project for new renderer and fix compiling fail on vs. 2013-12-18 14:36:49 +08:00
Ricardo Quesada 24f89ac45c Revert... android platform is 10 2013-12-17 19:07:28 -08:00
Ricardo Quesada 156f69c528 Renderer is subclass of Object again... needed for Android. 
ouch
 2013-12-17 19:06:22 -08:00
Ricardo Quesada 5c9b8db0cb Updates project files file Linux and Android 2013-12-17 18:47:46 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Ricardo Quesada f369a8eec3 Adds correct License to Renderer files 2013-12-17 18:12:15 -08:00
Ricardo Quesada 3f3071fbb6 Cleanup RenderCommand code 
RenderCommand code is cleaner
 2013-12-17 18:02:11 -08:00
Ricardo Quesada d6be81b7a8 The Renderer is not a singleton 
In order to access, you have to get it from the Director

`Director::getInstance()->getRenderer()`
 2013-12-17 17:50:17 -08:00
Ricardo Quesada 441cb6c282 fixes warnings in QuadCommand 2013-12-17 10:35:15 -08:00
Ricardo Quesada ff106ed070 fixes warning on Label Fragment shader 2013-12-17 10:01:38 -08:00
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode 
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-17 18:16:05 +08:00
James Chen 3829f841e7 Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other). 2013-12-17 18:09:07 +08:00
James Chen d16fa07661 Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort. 2013-12-17 17:45:29 +08:00
minggo 85ba3ee1a9 Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError 
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
 2013-12-17 00:32:50 -08:00
LinWenhai 649e6b8065 use size_t replace unsigned int for record redeque::size returned value. 2013-12-17 16:04:48 +08:00
James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 
Conflicts:
	cocos/2d/CMakeLists.txt
 2013-12-17 15:50:24 +08:00
James Chen 7fc7757470 issue #2171: Adds header files of renderer in cocos2d.h. 2013-12-17 15:40:50 +08:00
James Chen 08edcca9be issue #2171: small fix in ccTypes.h 2013-12-17 15:39:35 +08:00