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

1157 Commits

Author SHA1 Message Date
James Chen 9b02f97217 Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'. 2014-01-23 09:58:12 +08:00
minggo a1729fa1b4 Merge pull request #5159 from natural-law/develop 
Add test case for issue 2572
 2014-01-22 17:49:56 -08:00
Ricardo Quesada c48415ef3c Merge pull request #5163 from dabingnn/develop_improve_renderer 
Develop improve renderer
 2014-01-22 17:04:19 -08:00
Ricardo Quesada dceb9cb1b9 compiles on Linux 2014-01-22 14:17:32 -08:00
Ricardo Quesada 6b8781241c code is cleaner 2014-01-22 13:51:01 -08:00
Ricardo Quesada 7249d3ca76 Unified CCEAGLView on Linux and Mac 2014-01-22 13:05:37 -08:00
Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-01-22 11:21:16 -08:00
James Chen 45bbbca8c6 Merge pull request #5164 from Dhilan007/develop_label 
close #3642:fix bounding box of new label is incorrect.
 2014-01-22 06:23:39 -08:00
Huabing.Xu 159f44a5dc issue #3812: performance improvement, 1. add vector reserve 2. use C++11 range loop 2014-01-22 18:24:23 +08:00
Dhilan007 ec297a2c31 close #3642:fix bounding box of new label is incorrect. 2014-01-22 18:01:37 +08:00
Dhilan007 a2f5146731 close #3642:fix bounding box of the new label is a bit off. 2014-01-22 17:45:56 +08:00
James Chen 351814c0be Merge pull request #5158 from Dhilan007/develop_label 
Label:remove unused code and optimization performance.
 2014-01-22 01:24:48 -08:00
Huabing.Xu cc39ca4f16 issue #3812: rename convertToWorldCoordiantes->convertToWorldCoordinates 2014-01-22 17:09:13 +08:00
minggo 9c6a65baba Merge pull request #5156 from minggo/deprecate-function 
deprecated some functions in Object
 2014-01-22 00:51:50 -08:00
Huabing.Xu 7ea9a4f025 issue #3812: remove member variable _lastCommand 2014-01-22 16:03:04 +08:00
Huabing.Xu 5bbd48a9bf issue #3812: remove member variable _firstCommand, remove comment codes 2014-01-22 15:52:00 +08:00
zhangbin 3c2ef04f2b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 15:39:28 +08:00
zhangbin 3007f34240 issue #2572, Add test case for issue 2572. 2014-01-22 15:38:59 +08:00
Huabing.Xu 5397618aab Merge branch 'develop' into develop_refactor_culling 
* develop: (127 commits)
  issue #3677: Wrong include fix.
  issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
  issue #3677: Updates Windows project to add PerformanceEventDispatcherTest.
  issue #3677: Updates Android.mk and CMakeLists.txt.
  issue #3677: Adds EventDispatcher performance test.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3713: every autorelease will cause a release operation
  do not mix github access token with jenkins job trigger token
  issue #3781, Update travis-scripts, llvm-installing parts no need now.
  issue #3713: use reference in loop
  issue #3781, Minor fix & update submodule.
  closed #3808: EditBox on Mac works again.
  issue #3713:fix memory leak of autoreleas pool
  closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
  global Z order uses floats
  ActionsProgress test include fixes
  Removed unused code and files.
  ...

Conflicts:
	cocos/2d/renderer/CCRenderer.cpp
 2014-01-22 15:37:25 +08:00
Dhilan007 4095ab36b6 update xcode project. 2014-01-22 15:22:46 +08:00
Huabing.Xu cf6785ffcf issue #3812: using std::vector<QuadCommand*> to hold current batched command 2014-01-22 15:18:27 +08:00
Dhilan007 65c2e03721 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-22 15:08:05 +08:00
Dhilan007 df21bbf7df 1.remove unused code 
2.reduce calculation amount.
3.reduces expenses of function calls
 2014-01-22 14:57:11 +08:00
minggo 4381685a9d deprecated some functions in Object 2014-01-22 13:47:29 +08:00
Hanju Kim 64ab0c0e35 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontDefinition.cpp
 2014-01-22 14:15:21 +09:00
James Chen 3aac0b32a2 Merge pull request #5142 from Dhilan007/develop_label 
close #3805:fix wrap error and alignment error.
 2014-01-21 19:35:45 -08:00
James Chen 0ab5ec742a closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context 2014-01-22 10:16:34 +08:00
Ricardo Quesada 1113587f47 mac/CCEGLView moved to desktop/ 2014-01-21 17:52:30 -08:00
Ricardo Quesada 94ea94a113 global Z order uses floats 2014-01-21 16:36:19 -08:00
Ricardo Quesada b51b04f315 ActionsProgress test include fixes 2014-01-21 16:28:52 -08:00
Ricardo Quesada 06be466f29 Removed unused code and files. 
Making the mac platform easier to mantain
 2014-01-21 16:25:29 -08:00
Ricardo Quesada 98d23d30a6 First step in simplifying the mac platform 2014-01-21 15:44:01 -08:00
Ricardo Quesada e402f35e7f BatchCommand API fixes 
don't pass Texture Id.
Instead fetch it from the `TextureAtlas`
 2014-01-21 11:13:21 -08:00
Ricardo Quesada 7a8707cb08 Merge branch 'develop' into local_z_Order_fixes 
Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/CCNode.h
 2014-01-21 10:10:50 -08:00
Ricardo Quesada f1444a26a1 Improves documentation with local z order 2014-01-21 09:26:58 -08:00
minggo 4833810c6e Merge pull request #5132 from minggo/iss3713-replace_CCObject 
remove Object::_autoReleaseCount
 2014-01-21 02:26:40 -08:00
Dhilan007 697b0289c7 close #3805:fix wrap error and alignment error. 2014-01-21 17:55:49 +08:00
James Chen b647659c9e Merge pull request #5138 from natural-law/develop 
closed #2572, Amend the arithmetic of child's position in ParallaxNode::addChild().
 2014-01-21 01:51:57 -08:00
James Chen ccecaeb94f Merge pull request #5125 from Dhilan007/develop_label 
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
 2014-01-21 00:58:21 -08:00
zhangbin 6c0ccea547 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-21 16:33:53 +08:00
zhangbin 89c8e7e2fb closed #2572, The arithmetic of child's position in ParallaxNode::addChild() is wrong. 2014-01-21 16:25:35 +08:00
Hanju Kim 09579abac9 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-01-21 17:24:07 +09:00
minggo 5fd35c3bab Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject 2014-01-21 13:46:40 +08:00
Dhilan007 f22e4d474f move some method to FontFreeType that only relating to FontFreeType from Font. 2014-01-21 10:36:32 +08:00
James Chen 0f9c3fa59c closed #3789: EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case. 2014-01-21 10:23:05 +08:00
minggo ee06a5908c issue #3713:invoke static member function to destroy singleone object 2014-01-21 10:14:00 +08:00
James Chen 43b2217fcf Include fix: CCFileUtils.h —> platform/CCFileUtils.h 2014-01-20 21:30:32 +08:00
James Chen 432534d857 #include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes. 2014-01-20 17:31:12 +08:00
minggo 3e5fbb2422 issue #3713: remove Object::_autoReleaseCount 2014-01-20 17:08:22 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
Hanju Kim a8f21761a7 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
 2014-01-20 16:03:16 +09:00
James Chen 0468a1234b A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY. 2014-01-20 14:22:30 +08:00
Dhilan007 802fc092be fix compiling error cause by miss include header file. 2014-01-20 11:43:13 +08:00
Dhilan007 7d44da43c4 fix compiling error cause by include a non-existent file. 2014-01-20 11:34:31 +08:00
Dhilan007 b8943da99e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-20 11:24:42 +08:00
James Chen 5018c9ba6c Removes unused cast in CCTMXTiledMap.cpp. 2014-01-20 11:13:29 +08:00
Dhilan007 a0b86abcf4 close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage. 2014-01-20 10:32:12 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:38:06 -08:00
Ricardo Quesada 069a4fb170 Renderer: Don't sort z=0 Commands 
If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
 2014-01-17 23:10:04 -08:00
Ricardo Quesada 8931d968c0 Renderer uses a float as a key 
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
 - No need to convert the 32-bit float into 24-bit int
 - keys are shorter
 2014-01-17 16:08:29 -08:00
James Chen 0a6316a2f3 Merge pull request #5105 from Dhilan007/develop_label 
close #3678:fix incorrect spacing between characters
 2014-01-16 23:18:44 -08:00
Ricardo Quesada feec6a1e8a Adds some Asserts in the renderer 
Linux still has a bug, but I can't reproduce it all the time.
Hoping that these asserts will help me find it
 2014-01-16 22:29:25 -08:00
Dhilan007 db4dc28c1a close #3678:fix incorrect spacing between characters 2014-01-17 14:04:52 +08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
Ricardo Quesada a74a524eaa Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes 2014-01-16 21:36:22 -08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
James Chen 31199183b2 Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas 2014-01-17 11:10:04 +08:00
James Chen 09f56f3a8b Merge pull request #5047 from btspoony/develop 
closed #3750: Fix long string will be cut off by function “cc_utf8_to_utf16”.
 2014-01-16 19:06:39 -08:00
James Chen 4302f3886d issue #2789: Adds performance test for Vector and CCArray. 2014-01-17 10:02:12 +08:00
Dhilan007 f5afa09de1 remove unneeded empty line. 2014-01-17 09:46:59 +08:00
Ricardo Quesada cb9761125b Renderer: When not using VAOs, call... 
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
 2014-01-16 15:02:39 -08:00
Ricardo Quesada ce633b44ab Adds GL::activeTexture() 
`GL::activeTexture()` is the cached version of `glActiveTexture`
All code must use it.
 2014-01-16 13:44:18 -08:00
Luis Parravicini 3210e12e1c fixes #3734 2014-01-16 14:23:52 -03:00
Dhilan007 53be67c653 update project file. 2014-01-16 18:12:53 +08:00
Dhilan007 671b008f3d fix compiling error cause by sprintf_s. 2014-01-16 17:50:09 +08:00
Dhilan007 a765e5e7e1 closed #3628:Integrate LabelAtlas with new Label 2014-01-16 16:37:29 +08:00
James Chen 21dc91bf78 Merge pull request #5082 from Dhilan007/develop_label 
closed #3726:Fix crash when using unknown character.
 2014-01-16 00:10:53 -08:00
Dhilan007 18bd978480 1.add label crash test 
2.fix lose char when label have unknown character.
 2014-01-16 14:37:07 +08:00
minggo 91b89fc647 Merge pull request #5083 from natural-law/android_bugs 
Solve some bugs on android
 2014-01-15 22:04:54 -08:00
James Chen 8dd999309b Merge pull request #5070 from hbbalfred/develop 
closed #3725: Crash if file doesn't exist when using FileUtils::getStringFromFile
 2014-01-15 20:01:15 -08:00
zhangbin e7b584908e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs 2014-01-16 11:58:49 +08:00
James Chen ae0993bc06 Merge pull request #5072 from natural-law/develop 
closed #3688, LabelAtlas set a shorter string than before, the effect will be wrong.
 2014-01-15 19:54:01 -08:00
Dhilan007 afe49b3a2b 1.Fix crash bug when using unknown character 
2.Fix text align mistake
 2014-01-16 11:47:06 +08:00
zhangbin 3c816c3c85 closed #3723, Make sure the init method of Cocos2dxHelper only invoked once. 2014-01-16 11:26:23 +08:00
Ricardo Quesada 3b20ad5ab7 More renderer optimizations 2014-01-15 19:10:40 -08:00
Ricardo Quesada f6ad3a9971 Merge pull request #5078 from ricardoquesada/sprite_fixes 
Sprite: removed _hasChildren
 2014-01-15 18:38:04 -08:00
James Chen 2e7516c582 Merge pull request #5041 from Dhilan007/develop_label 
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF  to reduce parameters and make this interface more easily to use.
 2014-01-15 18:37:40 -08:00
Ricardo Quesada 9b490a9124 Sprite: removed _hasChildren 
_hasChildren has been replaced with !_children.empty()
 2014-01-15 18:37:07 -08:00
hbb 5ef9eef0ae use data.isNull() instead of !data.getBytes() 2014-01-16 10:09:04 +08:00
Dhilan007 a410c38e54 Update VS project file. 2014-01-16 09:55:13 +08:00
Ricardo Quesada 9388253606 SpriteBatchCommand and ParticleBatchCommand use the BatchCommand 
BatchCommand is being used by SpriteBatchCommand and ParticlesBatchCommand

This improves performance in batches
 2014-01-15 16:07:38 -08:00
Ricardo Quesada 65602a4574 Updates Xcode, Android and Linux project 
with new BatchCommand
 2014-01-15 16:06:47 -08:00
Ricardo Quesada f8dc8f0b38 Renderer performance fixes 
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
 2014-01-15 14:35:26 -08:00
Dhilan007 629f111f7d Relieve inherit from LabelProtocol 2014-01-15 17:21:08 +08:00
zhangbin 04d8c7514c closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong. 2014-01-15 16:35:08 +08:00
hbb 8fac676a82 add check data valid in getStringFromFile 
so far no check would be crashed when getData faild.
maybe return an empty string is better.
 2014-01-15 12:39:56 +08:00
Ricardo Quesada f0537f17da ooops 2014-01-14 18:55:14 -08:00
Ricardo Quesada 2efeb32352 Merge pull request #5063 from ricardoquesada/performance_test_fixes 
Performance Test fixes
 2014-01-14 17:24:49 -08:00
Ricardo Quesada c267c479db Performance Test fixes 
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
 2014-01-14 17:22:45 -08:00
Nite Luo a18788ff0a Fix artifects when VBO is full 2014-01-14 16:45:40 -08:00
James Chen cd1c408e6b Merge pull request #5054 from dumganhar/iss3698-retina-mac 
closed #3698: Wrong display when dragging window through retina and non-retina screen.
 2014-01-13 23:02:49 -08:00
James Chen 7e1fd18f76 FLT_MIN —> FTL_EPSILON. 2014-01-14 14:38:34 +08:00
Dhilan007 92d345156b un-define clash with the existing macro definition in platform/win32/CCStdC.h 2014-01-14 14:20:22 +08:00
James Chen 83a42dc760 closed #3698: Wrong display when dragging window through retina and non-retina screen. 2014-01-14 13:59:00 +08:00
Dhilan007 a1d8e8bdb1 fix compiling error cause by macro define on window platform. 2014-01-14 12:28:24 +08:00
Ricardo Quesada 6eed3a2b27 Adds missing copyright headers in some files 2014-01-13 14:48:12 -08:00
Ricardo Quesada f2c3d2f3ae Camera and Node fixes 
OrbitCamera: added getters (public). Setters moved from `protected` to `public
	: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
 	: Setters receives `kmVec3` as well. Old API is still supported

Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
	Instead, once the additional transform is set, in order to remove it the user needs to pass
	the identity matrix
 2014-01-13 12:52:07 -08:00
BoydTang 565288f587 - fix long string will be cut off by function “cc_utf8_to_utf16” ( “cc_utf8_strlen” returns long ) 2014-01-13 22:54:26 +08:00
Hanju Kim 567455dd38 convert tab to space 2014-01-13 21:28:42 +09:00
Hanju Kim b45abf3f2d Bug fixes for new label 2014-01-13 21:14:50 +09:00
Hanju Kim 4bbcd91bdf Fix for compiling error for windows 2014-01-13 20:51:56 +09:00
Dhilan007 fd481d64a0 1.update lua binding configuration for label. 
2.recover old method[createWithTTF]
 2014-01-13 16:32:35 +08:00
Dhilan007 69c004108b issue#3630:Adjust some method for more easily create and change type. 2014-01-11 22:33:07 +08:00
Ricardo Quesada f4a99d0627 Removes DirectorDelegate 2014-01-10 20:26:15 -08:00
Ricardo Quesada 9386866d56 cocos2d::log() moved to CCConsole 
Unified console code since it is 90% similar to all platforms
 2014-01-10 19:04:07 -08:00
Ricardo Quesada c68ad76bfe don't send "unknown command". 
... if the command is an empty command
 2014-01-10 18:11:35 -08:00
Ricardo Quesada 2316e4d55f Debug messages are forward to the console 2014-01-10 17:58:54 -08:00
Ricardo Quesada 2a6b9fe08e Console is a property of Director. 
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
 2014-01-10 17:11:14 -08:00
minggo a013565420 Merge pull request #5023 from dabingnn/develop_layerColorBugForShaderChange 
fix layerColor bug for shader change
 2014-01-10 06:26:49 -08:00
James Chen 0088399d94 Merge pull request #5016 from akof1314/develop 
Support MinGW with CMake for TestCpp
 2014-01-09 23:13:19 -08:00
WuHuan 16367b7594 solve conflicted with math.h isnan 2014-01-10 14:20:00 +08:00
Huabing.Xu a1629a09e8 fix layerColor bug for shader change 2014-01-10 10:03:47 +08:00
Ricardo Quesada 1dc169b19f Camera is working again 
Projection is passed in the shader.
Since P is in the shader, QuadCommand uses `Vec3Transform` instead of `Vec3TransformCoord` since it is faster.
 2014-01-09 14:26:22 -08:00
WuHuan 2f4b094598 Merge pull request #4 from cocos2d/develop 
update
 2014-01-09 02:56:21 -08:00
James Chen 2e4c76a5d7 closed #3644: Keyboard pressed events are being repeatedly fired before keyboard is released. 2014-01-09 18:34:35 +08:00
James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode 
Conflicts:
	cocos/2d/CCDrawNode.h
 2014-01-09 17:03:08 +08:00
James Chen 3bb1fae660 Merge pull request #5010 from boyu0/fix_texture2dtest_crash_bug 
closed #3638: Fix Image crashes when load tga file.
 2014-01-09 00:40:09 -08:00
boyu0 e34ef0d38f change initialization _data from 0 to nullptr. 2014-01-09 16:33:31 +08:00
boyu0 e063755596 fix Image crashes in mac when load tag file 2014-01-09 15:26:05 +08:00
walzer 1ad14340bf issue #3627, remove Hungarian Notation in LabelAtlas 2014-01-09 14:26:34 +08:00
walzer 8da4879560 issue #3627, remove lua/js doxygen mark from LabelAtals constructor & destructor. 2014-01-09 14:21:43 +08:00
walzer d15874fdf7 fixed #3627, an extra benefit from adding LabelAtlas::create() is that we can hide its default constructor into protected. 2014-01-09 14:16:26 +08:00
walzer 2d8fcb2c00 issue #3627, remove UICCLabelAtlas, add LabelAtlas::create() for GUI module 2014-01-09 12:40:51 +08:00
Dhilan007 fe7d5cbdfb update If Construct 2014-01-09 09:46:17 +08:00
Dhilan007 d18da42695 fix addImageAsync bad judgment of generate image for the first ImageFile. 2014-01-08 23:42:54 +08:00
WuHuan 1cd68accc1 Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
WuHuan 954ee61022 testcpp mingw 2014-01-08 16:58:36 +08:00
WuHuan 668c4b83ef Merge pull request #3 from cocos2d/develop 
update
 2014-01-08 00:44:40 -08:00
James Chen eb8f621ab0 closed #3597: Uses !xxx.empty() instead of xxx.size() > 0. 2014-01-08 10:47:27 +08:00
James Chen 685b80796b Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist 2014-01-08 10:36:51 +08:00
Daniel T. Borelli 939e94d568 const correctness 2014-01-07 22:09:43 -03:00
Daniel T. Borelli 1d435a3e8e const correctness: use cbegin/cend, const std::string 2014-01-07 18:02:31 -03:00
minggo ac8a7b4ce1 Merge pull request #4983 from dabingnn/develop_layerColorBug 
fix layerColor occlude sprite bug on android
 2014-01-07 06:25:59 -08:00
Huabing.Xu b1d9d5e55e fix layerColor occlude sprite bug on android 2014-01-07 22:08:00 +08:00
minggo feb4ac1cdb Merge pull request #4959 from minggo/actionprogress-fade-tint 
ActionProgress has fade and tint effect
 2014-01-07 00:32:43 -08:00
minggo 1275d03c77 add override 2014-01-07 16:30:12 +08:00
minggo 6bb4f9822a ActionProgress has fade and tint effect 2014-01-07 16:23:58 +08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
Ricardo Quesada aa2168f66f RenderQuad with bigger size 
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
 2014-01-06 23:41:01 -08:00
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
minggo 49d314363f Merge pull request #4945 from dabingnn/develop_label_shaderBug 
fix label fnt bug for wrong shader
 2014-01-06 19:44:06 -08:00
Huabing.Xu 6c6da4cf77 fix label fnt bug for wrong shader 2014-01-07 11:39:55 +08:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
minggo 721181632b Merge pull request #4930 from Dhilan007/develop_crash 
fix error for load spriteFrames from plist in CCAnimationCache class.
 2014-01-06 18:57:47 -08:00
Dhilan007 aec4045797 fix error for load spriteFrames from plist in CCAnimationCache class. 2014-01-06 20:23:45 +08:00
James Chen 75804ac8a2 Warning fix in ccUTF8.cpp/h 2014-01-06 20:04:09 +08:00
James Chen dd0e157c74 Warning fix in CCTextFieldTTF.cpp. 2014-01-06 20:01:28 +08:00
minggo 9b44e80cf2 Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug 
init shader on construction instead of draw in class CCSpriteBatchNode
 2014-01-06 00:11:59 -08:00
minggo e4bec7d1ef Merge pull request #4902 from Dhilan007/develop_crash 
fix TextInput not show IME on android.
 2014-01-05 19:50:19 -08:00
Dhilan007 5b317196c8 fix TextInput not show IME on android. 2014-01-06 11:45:18 +08:00
Huabing.Xu 381be48c56 init shader on construction instead of draw in class CCSpriteBatchNode 2014-01-06 11:26:00 +08:00
James Chen d74d21a6f0 Merge pull request #4884 from daltomi/debug 
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
 2014-01-05 19:08:37 -08:00
minggo fcfa6744f4 make TMXLayer::getProperties() return reference 2014-01-05 18:20:29 +08:00
chengstory 4893c561db Merge branch 'develop' into #3582 2014-01-05 12:43:41 +08:00
James Chen 03200374b0 Merge pull request #4887 from Dhilan007/develop_crash 
fix crash related to not support the z length modifier for size_t on vs
 2014-01-04 20:10:40 -08:00
Dhilan007 49d8b76b9e fix crash related to not support the z length modifier for size_t on vs 2014-01-05 11:59:32 +08:00
chengstory 7efacc4890 issue #3582 void serialize(void *r) -> bool serialize(void *r) 2014-01-05 01:13:16 +08:00
James Chen f94221a93b compilation error fix. ssize_t -> int 2014-01-04 22:21:14 +08:00
James Chen 3c04d586b0 Wrong warning fixes correct in ccUTF8.cpp. 2014-01-04 21:54:05 +08:00
James Chen 42356e8597 Exchanges order of Sprite::setSpriteFrame(string), Sprite::setSpriteFrame(frame) . It’s needed for bindings-generator to generate correct binding glue codes. 2014-01-04 21:53:03 +08:00
Daniel T. Borelli 08dad98592 map:erase() is safe for item.second == FontAtlas* 2014-01-04 07:22:50 -03:00
James Chen 6827538802 Adds override keyword for override functions. 2014-01-04 18:12:09 +08:00
WuHuan e972c97dcf support mingw 2014-01-04 14:40:22 +08:00
James Chen 43cdf1713b Merge pull request #4864 from daltomi/test 
fix bad name variable CCDirector
 2014-01-03 21:44:42 -08:00
Daniel T. Borelli d10992951b fix bad name variable 2014-01-04 02:22:09 -03:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen f55be38ad8 Merge pull request #4853 from Dhilan007/develop_crash 
fix label not appear on the screen
 2014-01-03 19:00:06 -08:00
Dhilan007 b14999a7a7 fix label not appear on the screen 2014-01-04 10:56:14 +08:00
James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash 
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
 2014-01-03 18:51:16 -08:00
James Chen 0082cf3e4d closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time. 2014-01-04 10:28:09 +08:00
Ricardo Quesada 76960ab83a Merge pull request #4851 from ricardoquesada/node_vertex_z_fix 
Node vertex Z fix
 2014-01-03 17:55:32 -08:00
Ricardo Quesada 5a0284c183 Node vertex Z fix 
Node correctly  sets the Z vertex in getNodeToParentTransform(),
and not in transform().

This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
 2014-01-03 17:54:07 -08:00
James Chen 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
Ricardo Quesada a7b33e3ec3 Fixes NodeToWorld 
Multiplication was in the incorrect order
 2014-01-03 14:21:33 -08:00
Dawid Drozd b7314cd655 Fix for missing field in particle file. 2014-01-03 21:27:08 +01:00
Dawid Drozd 43ce4fa546 Fixed mistake in documentation addImage doesn't support gif format 2014-01-03 21:22:05 +01:00
minggo 5ad3414921 Merge pull request #4834 from minggo/bug-fix 
Put "initxx" functions into protected.
 2014-01-03 03:27:55 -08:00
minggo 4fc7ad6e3d Merge pull request #4791 from dabingnn/develop_clippingNodeMobile 
fix bug clippingNodetest on mobile
 2014-01-03 02:36:52 -08:00
minggo 1d04b42947 Put "initxx" functions into protected. 2014-01-03 18:15:56 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config 
don't build spine module when build 2d module
 2014-01-02 06:53:15 -08:00
minggo 676e25d304 2d module don't denpend on spine 2014-01-02 20:17:11 +08:00
James Chen 602468e3f2 Merge pull request #4802 from dumganhar/develop 
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
 2014-01-02 04:08:22 -08:00
James Chen 05b1be3aeb Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners). 2014-01-02 19:59:10 +08:00
minggo ded3e753f3 use std::function for call back 2014-01-02 17:23:00 +08:00
Huabing.Xu 57b0426994 fix bug clippingNodetest on mobile 2014-01-02 16:19:23 +08:00
Dhilan007 ebf3faadc3 fix crash related to not support the z length modifier for size_t on vs 2013-12-31 16:32:16 +08:00
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug 
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
 2013-12-31 14:58:11 +08:00
Dhilan007 b51efbd654 fix align text error in label 2013-12-31 14:13:26 +08:00
Huabing.Xu bf1f5dd0e0 fix rendertexture bug 2013-12-31 11:48:51 +08:00
James Chen 8145bf903e texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled. 2013-12-31 11:02:01 +08:00
James Chen 973adc6b2f Updates nativeactivity.cpp. 2013-12-31 10:55:59 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
James Chen 1d8ee016e5 Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug 
closed #2050: fix tilemap firstgid bug
 2013-12-30 05:42:19 -08:00
Huabing.Xu a14006bb8f calculation matrix 2013-12-30 21:24:16 +08:00
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