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

3726 Commits

Author SHA1 Message Date
WenhaiLin 004cb5464e Fixed crash 2015-05-03 22:15:58 +08:00
Vladimir Timofeev fd3e44b72b Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms. 2015-05-01 12:36:19 +03:00
WenhaiLin 7472bafee3 Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program. 2015-04-30 15:13:41 +08:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
Dale Stammen 904abeab87 added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 09:48:14 -07:00
WenhaiLin ce7e36f76e Fixed warns and crash on Win32. 2015-04-28 20:10:56 +08:00
Milos Jakovljevic 0343fd4061 Changing the name of the Action, adding more comments 2015-04-28 11:48:19 +02:00
WenhaiLin 1af9ce8483 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-28 13:36:34 +08:00
andyque 854fcdf2bf fix spritepolygon 2015-04-28 11:26:21 +08:00
andyque a6a2dddfe9 fix spritepolygon 2015-04-28 10:51:26 +08:00
WenhaiLin 41e2d84116 Fixed compile error on VS 2012. 2015-04-28 10:35:21 +08:00
WuHao a046f74c4d fix anchor point bug 2015-04-27 17:30:38 +08:00
WuHao dcf8f674bc Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 
Conflicts:
	cocos/2d/SpritePolygon.cpp
	cocos/2d/SpritePolygonCache.cpp
 2015-04-27 17:18:26 +08:00
WuHao 815c6a9b74 merge the start and end points 2015-04-27 16:33:54 +08:00
samuele3hu 3de665b9cd Update SpritePolygon 2015-04-27 15:19:26 +08:00
WuHao c7e990dcae Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 
Conflicts:
	cocos/2d/SpritePolygon.cpp
 2015-04-27 13:39:41 +08:00
WuHao 9f2ea5fbb9 fixed some SpritePolygon create, added more tests 2015-04-27 13:34:47 +08:00
samuele3hu d7dbb910d0 Update SpritePolygonCache 2015-04-27 11:57:36 +08:00
samuele3hu cf53d13f6f Update SpritePolygon.cpp 2015-04-27 11:07:08 +08:00
samuele3hu 6f17dcecf2 Update config.json for 3rd-party-libs and SpritePolygonCache 2015-04-27 11:01:47 +08:00
WuHao c2cefadb6f Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 2015-04-27 10:44:56 +08:00
WuHao cd0ebc1801 fix the info struct 2015-04-27 10:44:23 +08:00
samuele3hu bd5ca083e9 Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
Jacky 633c1aed75 Add EaseRateAction::create() method. 2015-04-24 18:31:44 +08:00
WuHao 9496a48800 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-24 18:29:23 +08:00
WuHao c1d10ffa1c fixed poly2tri creation method, added testCase 2015-04-24 18:28:28 +08:00
WuHao 5620da1adf fixed anchor point issue, removed rect rotated property 2015-04-24 18:17:12 +08:00
WuHao 0e318dd8dc fixed UV issue, also taking account of contentScaleFactor, made test case better 2015-04-24 17:39:43 +08:00
minggo 0198c8707b Merge pull request #11572 from super626/v3 
Fix memory leak
 2015-04-24 16:42:33 +08:00
XiaoFeng 07725ce84d fix 2015-04-24 11:40:15 +08:00
WuHao 07349ff588 initial cpp test 2015-04-23 18:03:03 +08:00
XiaoFeng faddbd8e71 Add function to texture cache for studio to check if texture have been already loaded 2015-04-23 16:50:28 +08:00
WuHao ada7ced0a8 change getVecCount to ssize_t 2015-04-23 16:40:11 +08:00
WuHao 1ee87140b1 renamed PolySprite to SpritePolygon 2015-04-23 14:34:56 +08:00
samuele3hu 7c77bc9587 Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
Dale Stammen 0f3ff6f762 Merge branch 'v3' into v3-winrt-typo-fix 2015-04-21 18:18:00 -07:00
Dale Stammen 84a47000b5 rename -win to -winrt 2015-04-21 18:17:18 -07:00
Dale Stammen a2ed8e7234 disable INCREMENTAL for ARM builds. Fixes lnk2013 error 2015-04-21 08:38:19 -07:00
lvlong 4f96037e15 1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
2. fix bug: memory leak!
 2015-04-21 19:38:38 +08:00
hobogenized 22df7df76a Renamed shadowed variables to reduce confusion when reading source code 2015-04-20 22:57:55 -04:00
minggo 7a1a021974 Merge pull request #11517 from andyque/fix-widget-gray-shader-issue 
Fix widget gray shader issue
 2015-04-21 09:34:18 +08:00
andyque 484153aff7 remove ui shaders in windows platform 2015-04-20 17:54:49 +08:00
andyque 1e514f0a2b fix freetype include path on win-8.1 2015-04-20 15:54:31 +08:00
Vladimir Perminov 4c33050536 Optimize Vec2 
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
 2015-04-19 20:40:52 +03:00
Milos Jakovljevic a13c519882 Adding FloatAction to animate any property over time. 2015-04-18 14:35:14 +02:00
WenhaiLin 9c2e39dd49 Label:Fixed the shadow color of system font may be incorrect. 2015-04-17 15:42:41 +08:00
WenhaiLin 5a438ed9a1 Label:Fixed the shadow effect of system font might not be shown. 2015-04-17 15:26:43 +08:00
WenhaiLin 0ac99002d5 Label:disableEffect(LabelEffect::XXXX) support disable all effect. 2015-04-17 14:39:52 +08:00
lvlong f55af40016 fix bug: label action in multiple cameras. 2015-04-17 10:19:20 +08:00
Dale Stammen b1c9c34c19 added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:19:38 -07:00
Dale Stammen 081b9ccac2 updated freetype include path 2015-04-15 08:20:03 -07:00
Dale Stammen c9eb2790be updated chipmunk and freetype libs 2015-04-15 08:08:18 -07:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
minggo 4211b20134 Merge pull request #11414 from likexx/patch-1 
Update CCLabel.cpp
 2015-04-14 10:06:09 +08:00
minggo d246c33974 Merge pull request #11413 from WenhaiLin/v3-label-sf-position 
Label:Fixed the position of system font is wrong if it is visited by a new camera.
 2015-04-14 09:59:09 +08:00
minggo 06a2042a11 Merge pull request #11345 from IgorMats/v3 
Add getStroke/setStroke methods for motion streak.
 2015-04-14 09:36:03 +08:00
Igor Mats e54a51be02 Fix comment. 2015-04-13 19:24:19 +03:00
likexx 6f341e3284 Update CCLabel.cpp 
in rare case, the texture atlas becomes NULL. Added an additional check to make sure it won't crash here.
 2015-04-13 20:53:34 +08:00
WenhaiLin d24a1243da Label:Fixed the position of system font is wrong if it is visited by a new camera. 2015-04-13 18:22:05 +08:00
WenhaiLin 9ef04943a8 Label:Fixed System font can't scale. 2015-04-13 16:28:55 +08:00
minggo 9cc03407a8 Merge pull request #11383 from WenhaiLin/v3-physics-rotation 
Physics: Fixed the rotation of PhysicsBody is wrong if the rotation of node is set before PhysicsBody attached.
 2015-04-10 18:12:43 +08:00
Wenhai Lin 1949348124 Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached. 2015-04-10 17:01:21 +08:00
minggo 698d93a42b Merge pull request #11379 from WenhaiLin/v3-physics-fix 
Physics: Fixed position of physics body is wrong when the position of parent node changes
 2015-04-10 16:45:45 +08:00
Wenhai Lin 97082cb169 Physics: Fixed position of physics body is wrong when the position of parent node changes 2015-04-10 15:39:39 +08:00
andyque c8d8a0d220 add disableEffect API for ui::Text 2015-04-10 14:18:16 +08:00
Igor Mats f5c61b4f9a Ooops. 2015-04-09 13:36:17 +03:00
Igor Mats 60759764ff Add getStroke method. 2015-04-09 12:05:21 +03:00
Igor Mats 7f24eb0cf6 Add setStroke method. 2015-04-08 21:55:24 +03:00
Dale Stammen c88e8064c7 updated dll name to v3.6 2015-04-08 07:51:40 -07:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
andyque f52899c257 update freetype2 and chipmunk on wp8 and wp8.1 2015-04-08 16:21:19 +08:00
minggo e9cdf333f9 Merge pull request #11246 from xiaofeng11/v3 
V3 reader fix
 2015-04-08 11:46:40 +08:00
andyque 8a4a7344b0 fix freetype include 2015-04-08 09:24:34 +08:00
WenhaiLin 927cda3f0d Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label. 2015-04-07 15:51:57 +08:00
minggo eb928432ce Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor 
Label: Fixed shadow color is incorrect.
 2015-04-07 15:27:19 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3 
Optimize Vec3
 2015-04-07 14:04:57 +08:00
WenhaiLin c5c5d3e39d Label: Fixed shadow color is incorrect. 2015-04-07 11:17:01 +08:00
minggo deaa6a19f0 Merge pull request #11257 from super626/terrain 
Terrain
 2015-04-07 09:32:35 +08:00
XiaoFeng 16aa704ffd Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3 2015-04-07 09:11:14 +08:00
XiaoFeng 4929d8102a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-07 09:06:06 +08:00
Ricardo Quesada a782eb022d fixes warnings on Xcode 6.3 
instead of using `abs()` it uses `std::abs()`
 2015-04-06 12:08:30 -07:00
Vladimir Perminov 105bac2d55 Optimize Vec3 
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
 2015-04-05 13:09:50 +03:00
zhukaixy 6eb86f736c add for wp8 support --ziwen.tang 2015-04-03 17:12:44 +08:00
yangxiao 7ea1c1ac1f reset 2015-04-03 16:15:09 +08:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
tangziwen ee41c9b3f1 add win rt support 2015-04-03 14:36:29 +08:00
Huabing.Xu cb77d0145a Merge pull request #11266 from WenhaiLin/v3-at01 
Add getInScene,getDuration for TransitionScene class.
 2015-04-03 11:50:44 +08:00
WenhaiLin f2dc7958bf Add getInScene,getDuration for TransitionScene class. 2015-04-03 11:49:15 +08:00
WenhaiLin a544eadab8 MenuItem: Fixed crash if MenuItem::onExit is called multiple times. 2015-04-02 23:27:07 +08:00
yusheng.lu 82c6e623e0 Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters 2015-04-02 10:15:36 +08:00
minggo 6cf344ded6 Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup 
Remove useless (char*) casts in CCTMXXMLParser.cpp
 2015-04-02 09:45:22 +08:00
xiaofeng11 ea8538117b Merge pull request #7 from pipu/remove_CCNodeReader 
Remove CCNodeReader.h/.cpp.
 2015-04-01 14:12:09 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
yusheng.lu 01a091ef2c Delete CCNodeReader for Win8.1 project 2015-04-01 11:49:36 +08:00
minggo eefd06415b Merge pull request #11229 from xiaofeng11/v3 
Add destroyCocosStudio()
 2015-04-01 10:49:49 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments 
Conflicts:
	cocos/base/CCIMEDelegate.h
 2015-03-30 10:56:42 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
VisualSJ 9ba82584a9 [ci skip] Add javascript notes... 
cocos/2d/CCClippingNode.h
  cocos/2d/CCTMXTiledMap.h
  cocos/2d/CCTMXObjectGroup.h
  cocos/2d/CCTMXLayer.h
  cocos/2d/CCSpriteBatchNode.h
  cocos/2d/CCSprite.h
  cocos/2d/CCRenderTexture.h
  cocos/2d/CCProtectedNode.h
  cocos/2d/CCMenuItem.h
  cocos/2d/CCMenu.h
  cocos/2d/CCLabelAtlas.h
  cocos/2d/CCLabel.h
  cocos/2d/CCGrid.h
  cocos/2d/CCGLBufferedNode.h
  cocos/2d/CCFastTMXTiledMap.h
  cocos/2d/CCFastTMXLayer.h
  cocos/2d/CCDrawingPrimitives.h
  cocos/2d/CCDrawNode.h
  cocos/2d/CCComponentContainer.h
  cocos/2d/CCClippingRectangleNode.h
  cocos/2d/CCTextFieldTTF.h
  cocos/2d/CCTileMapAtlas.h
 2015-03-28 14:28:16 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
Wenhai Lin 8f3bbe3c40 [ci skip]Update comments 2015-03-27 15:25:44 +08:00
Jacky d9b0c67f65 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 
Conflicts:
	cocos/2d/CCNode.h
 2015-03-27 13:43:38 +08:00
Jacky 4edf9e76fd update comments. 2015-03-27 12:07:19 +08:00
minggo 29c5da8429 Merge pull request #11189 from SuYaoHui/cocosapi 
Add comments
 2015-03-27 11:46:02 +08:00
SuYaohui 17bd26e9d4 Add comments 2015-03-27 11:39:31 +08:00
minggo 8b4f662ac0 Merge pull request #11179 from WenhaiLin/v3-doxygen 
[ci skip]Fixed warnings when generating docs by doxygen.
 2015-03-27 11:10:43 +08:00
minggo 24aef7c6bb Merge pull request #11164 from super626/texturecube 
Texturecube
 2015-03-27 11:06:28 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
zhangbin 58bc56f759 Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
minggo 52d53fd7ee Merge pull request #11148 from andyque/finish-v3-comments 
Add missing comments for UI modules
 2015-03-26 10:02:42 +08:00
andyque 248325d055 Add missing comments for UI modules 
Squashed commit of the following:

commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 17:08:07 2015 +0800

    finish all the documents

commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 09:49:33 2015 +0800

    finish scrollview

commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 21:40:26 2015 +0800

    add UIScale9Sprite comments

    Conflicts:
    	cocos/ui/UIScale9Sprite.h

commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 18:05:02 2015 +0800

    add comments for UIRichText

commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 22:08:26 2015 +0800

    add comments for UIPageView and UIRelativeBox

commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 21:12:27 2015 +0800

    finish loadingbar comments

commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:51:30 2015 +0800

    finished UiListView

commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:06:10 2015 +0800

    add comments for LayoutManager and LayoutParameter.

commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 17:09:17 2015 +0800

    finish comments for UILayoutComponent

commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 14:07:58 2015 +0800

    add missing comments

commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 09:31:51 2015 +0800

    add comments

commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 21:02:36 2015 +0800

    add missing docs for UIButton, UILayout, UIIMageview and UIWidget

commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 14:02:05 2015 +0800

    add missing comments for UIHbox and UIHelper

commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 11:28:32 2015 +0800

    add comments for UICheckbox

commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 00:01:42 2015 +0800

    update coments

commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 20:32:57 2015 +0800

    add comments for UIEditbox

commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:51:20 2015 +0800

    add missing comments for UIEditBox

commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:12:08 2015 +0800

    fix indentation problem

commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:08:46 2015 +0800

    add missing comments for CCIMEDispatcher

commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:57:52 2015 +0800

    add missing documents for CCIMedelegate

commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:43:33 2015 +0800

    add missing documentation for CCTilemapatlas

commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:38:59 2015 +0800

    add missing comments for CCTextfieldttf

commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 22:03:31 2015 +0800

    supplement comments for ProtectedNode

commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:55:03 2015 +0800

    add comments to CCMenuitem.h

commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:36:14 2015 +0800

    add comments to Menu
 2015-03-25 18:17:58 +08:00
minggo 51329ac130 Merge pull request #11136 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-25 11:10:08 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
minggo 671be8e157 Merge pull request #11131 from natural-law/v3 
[ci skip] Update the group of CCClippingRectangleNode.
 2015-03-25 09:48:41 +08:00
zhangbin 2f7397f6b9 Update the group of CCClippingRectangleNode. 2015-03-25 09:46:00 +08:00
Huabing.Xu d06d575e6e Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments 2015-03-24 23:01:18 +08:00
Huabing.Xu 133955dba1 [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
zhukaixy 3b8a796404 config project config file for cocos2d-win8.1-universal 2015-03-24 16:01:06 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
minggo 6cc8fb4348 Merge pull request #11092 from fusijie/cocosapi 
[ci skip]update headers' module name.
 2015-03-24 11:27:54 +08:00
Jacky af12891cfc [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
minggo 2dfc0e11db Merge pull request #11081 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-23 22:18:34 +08:00
minggo 67e0cd20d2 Merge pull request #11080 from SuYaoHui/cocosapi 
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
 2015-03-23 22:18:00 +08:00
VisualSJ b5fa6d2e95 [ci skip] Add javascript notes... 
cocos/2d/CCMotionStreak.h
  cocos/2d/CCParticleBatchNode.h
  cocos/2d/CCParticleExamples.h
  cocos/2d/CCParticleSystem.h
  cocos/2d/CCParticleSystemQuad.h
  cocos/2d/CCTransition.h
  cocos/2d/CCTransitionPageTurn.h
  cocos/base/CCConfiguration.h
  cocos/base/CCTouch.h
 2015-03-23 20:27:13 +08:00
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +08:00
minggo c587d19e8b Merge pull request #11059 from SuYaoHui/cocosapi 
add comments.
 2015-03-23 16:24:22 +08:00
minggo 4143eae713 Merge pull request #11061 from fusijie/cocosapi 
add comments.
 2015-03-23 16:23:51 +08:00
SuYaohui 6310e75071 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-23 11:35:30 +08:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
Jacky cc09b84153 add comments. 2015-03-21 18:02:56 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
dingpinglv ef56088886 Issue: Added js Annotates to CCNode.h 2015-03-21 11:07:39 +08:00
dingpinglv b30b6db09b Issue: added js annotates to CCLayer.h 2015-03-21 10:23:42 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
minggo d28e5d61b6 Merge pull request #10998 from dingpinglv/Iss_Annotate 
[ci skip] Added js annotates to -x
 2015-03-19 22:09:43 +08:00
minggo 8e019de83b Merge pull request #11003 from fusijie/cocosapi 
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
 2015-03-19 22:09:20 +08:00
minggo 0648ac7ca0 Merge pull request #11004 from SuYaoHui/cocosapi 
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
 2015-03-19 21:47:32 +08:00
dingpinglv de73f25e42 Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h 2015-03-19 21:44:44 +08:00
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
Jacky 85c04ff605 [ci skip]add comments to CCLayer & CCNode & CCConfiguration. 2015-03-19 21:41:40 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
dingpinglv c03703ddab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:01:17 +08:00
dingpinglv 069791a0a2 Corrected a wrong indent in CCSpriteFrameCache.h 2015-03-19 21:00:33 +08:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 20:28:29 +08:00
Vincent Yang 93ccdae7df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-19 20:22:59 +08:00
Vincent Yang ca4c71bf0e Add MainPageWhiteBook.h, and move doxygen_modules.h to docs. 2015-03-19 20:21:40 +08:00
minggo 1539b5de78 Merge pull request #10991 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 20:09:41 +08:00
minggo f3e518b103 Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash 
fix crash problem when switch to a new scene after call RenderTexture::s...
 2015-03-19 20:00:31 +08:00
dingpinglv 7a50af4407 Issue : added js annotate to CCLight.h 2015-03-19 19:54:46 +08:00
dingpinglv 194c8d8f17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 19:46:01 +08:00
VisualSJ f87b06a1c8 Add javascript notes... 
cocos/2d/CCAction.h
  cocos/2d/CCActionCamera.h
  cocos/2d/CCActionCatmullRom.h
  cocos/2d/CCActionInstant.h
  cocos/2d/CCActionInterval.h
  cocos/2d/CCActionManager.h
  cocos/audio/include/AudioEngine.h
  cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 18:41:11 +08:00
Huabing.Xu 8b04a15ee8 fix crash problem when switch to a new scene after call RenderTexture::saveToFile() 2015-03-19 16:39:45 +08:00
zhangbin f196d213ee Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
minggo a8471dd507 Merge pull request #10978 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-19 13:42:48 +08:00
zhangbin d755a7b46a Update comments of some header files. 2015-03-19 13:41:21 +08:00
minggo 1d37016912 Merge pull request #10962 from dingpinglv/Iss_Annotate 
[ci skip] added js annotate to classes
 2015-03-19 11:56:07 +08:00
minggo aec86d7e61 Merge pull request #10967 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 11:52:44 +08:00
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document 
[ci skip]Update document
 2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
 2015-03-18 21:58:07 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi 
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
 2015-03-18 21:48:28 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs 
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
 2015-03-18 21:38:56 +08:00
zhangbin f31a833df4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 21:10:17 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08:00
VisualSJ cb50c7d89a Add javascript notes... 
cocos/2d/CCActionPageTurn3D.h
  cocos/base/CCAutoreleasePool.h
  cocos/base/CCData.h
 2015-03-18 20:51:18 +08:00
Jacky 2d50327323 update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache 2015-03-18 20:40:29 +08:00
SuYaohui 31944da08c [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:26:16 +08:00
SuYaohui ee8776f041 [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:07:00 +08:00
minggo 359e25327d Merge pull request #10946 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 18:25:31 +08:00
zhangbin b55916c283 Update comments of some header files. 2015-03-18 18:15:34 +08:00
minggo 5271c75c11 Merge pull request #10936 from super626/v3 
Camera mask for label
 2015-03-18 14:00:44 +08:00
yangxiao 44af57459e add comment 2015-03-18 11:58:36 +08:00
yangxiao 21d581a72c set camera mask when member created 2015-03-18 11:41:43 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
Dale Stammen 08ceae3de2 removed no-gl_PointSize shaders for Windows Phone 8.1 2015-03-16 08:08:02 -07:00
yangxiao 5b26ba3c68 override setCameraMask 2015-03-16 17:11:17 +08:00
yangxiao f56d8c4784 fix camra mask for label does not work 2015-03-16 15:31:29 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Huabing.Xu 03c3a4d5ed Merge pull request #10836 from pipu/reconstruct_object_extension_data 
To reconstruct object extension data.
 2015-03-13 15:04:41 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
yangxiao 50c3a9cb4c fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
mogemimi 8cf0ec1aca Minor refactor TMXMapInfo 
* Replace with range-based for loop
* Replace some size() with !empty()
* Refactor scope of local variable
 2015-03-12 01:21:57 +09:00
mogemimi 279604bac5 Add missing white spaces and some minor cleanups 
* Add missing white space
* Fix if-else statement without curly braces
* Fix indentation
* Clean up code
 2015-03-12 01:19:37 +09:00
mogemimi abeb269534 Remove useless (char*) cast 2015-03-12 01:14:05 +09:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
minggo 5ac2fb398c Merge pull request #10774 from minggo/sync-from-v4 
Label:Fixed transform not update correctly
 2015-03-10 09:54:20 +08:00
Dale Stammen 24d706cb7a added /bigobj to C++ compiler command line options 2015-03-09 09:39:36 -07:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
WenhaiLin cd95905a04 Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera 2015-03-09 17:26:43 +08:00
Dale Stammen 6cd881d8f8 added missing Particle3D files 2015-03-08 21:37:29 -07:00
Dale Stammen 362edec6d6 added missing Particle3D files 2015-03-08 21:31:43 -07:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge 
support win8.1
 2015-03-06 17:57:34 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
yangxiao 457ac3fdd7 reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix 
MotionStreak MoveTo/MoveBy action OK
 2015-02-28 11:17:28 +08:00
Dale Stammen e4db9f396e disable LTCG. set warning level to W3 2015-02-27 11:16:40 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen e04fd6eb1d updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:54:27 -08:00
Dale Stammen d486cc78fb updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:52:32 -08:00
Dale Stammen 8bc5b37b40 removed missing include files from project 2015-02-27 10:48:53 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
Dale Stammen e9ef92291f renamed cocos2d dll from 3.4 to 3.5 2015-02-27 10:26:58 -08:00
Dale Stammen 49b16718a2 removed missing .h files from solution 2015-02-27 10:24:02 -08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +08:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
yangxiao a1642757f9 merge setcameramask 2015-02-26 15:33:18 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Ray 1a2aa8633f fix w8 project 2015-02-26 10:27:12 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Dale Stammen 76233d4c6e added missing Particle3D files and tests 2015-02-16 10:41:03 -08:00
Dale Stammen 795f65c85f added missing Particle3D files and tests 2015-02-16 10:01:09 -08:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
Vladimir Perminov 9f5efe5153 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-02-13 11:18:14 +03:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
Justin Fraize 3667cc6e1f Cleaned up CCAction.cpp 
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
 2015-02-12 21:00:12 -08:00
minggo 87e444873f Merge pull request #10268 from kompjoefriek/Fixing-warnings 
Fixed some compiler warnings
 2015-02-13 10:04:19 +08:00
kompjoefriek a2ef1abef3 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
zhukaixy acc0476f01 Solve compile errors on win32 platform 2015-02-12 19:36:03 +08:00
minggo afd4e94c4c Merge pull request #10160 from lite3/wildpointer 
fix wild pointer
 2015-02-12 18:01:10 +08:00
minggo 7fd6b5bfe7 Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const 
make CCTMXObjectGroup::getGroupName const
 2015-02-12 18:00:49 +08:00
minggo 8716164a5d Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node 
Specify default capacity for sprite batch node
 2015-02-12 17:58:59 +08:00
yangxiao 58bfae2e57 adjust and remove unused code 2015-02-12 16:58:34 +08:00
lvlong ee03bb8eea setCameraMask for cocostudio-ui 2015-02-12 09:24:04 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
minggo 1e11f3b3da Merge pull request #10310 from perminovVS/v3 
Fix visual studio project out of date
 2015-02-10 14:18:13 +08:00
Chad befbc0a14e FIX for Build error when CC_USE_CULLING=0 #10373 
Fix for build error when using CC_USE_CULLING
 2015-02-09 18:15:22 -08:00
XiaoYang c9fe5251a9 Merge pull request #229 from lvlonggame/v3 
add Camera::project
 2015-02-04 09:38:31 +08:00
lvlong a0c7723edb add GP_ASSERT 2015-02-03 14:21:12 +08:00
lvlong 6d92b7adc9 modify Camera::project 2015-02-03 11:59:43 +08:00
lvlonggame 4c65332550 add project function to camera 2015-02-01 21:14:37 +08:00
Vladimir Perminov bb2d2c9a07 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-01-30 17:37:19 +03:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
byeonggee.seo fa683ec98b MotionStreak MoveTo/MoveBy action OK 2015-01-29 19:30:00 +09:00
huangshiwu cd00de572d add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
Dale Stammen 652baed1ee increase build heap memory option to /Zm384 2015-01-28 20:37:39 -08:00
Dale Stammen be8075b29c increase build heap memory option to /Zm384 2015-01-28 20:32:32 -08:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
minggo b233d6928e Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix 
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
 2015-01-28 15:16:23 +08:00
Nite Luo be6ca1b6d2 add force depth write 2015-01-27 17:05:51 -08:00
Nite Luo 8f539a0107 Make PositionZ independent from global Z 2015-01-27 15:41:58 -08:00
Wenhai Lin f2335fb3bc Fixed Scale9Sprite can't run move/scale/rotation action in physics scene 2015-01-27 16:13:45 +08:00
minggo 988a2729d7 Merge pull request #10203 from Dhilan007/v3-bmf-performance 
Improved the parsing performance of bitmap fonts
 2015-01-26 13:46:04 +08:00
Ryo Miyajima d1d4ec2ac6 fix grammar in comment 2015-01-26 10:56:43 +09:00
Ryo Miyajima 4985653f5b specify default capacity 2015-01-26 10:56:38 +09:00
WenhaiLin 9afa871164 Improved the parsing performance of bitmap fonts 2015-01-24 16:23:30 +08:00
Huabing.Xu 030394bffe refactor the rendering and creation of DrawNode 
make LayerColor rendering safer
 2015-01-23 18:19:03 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
Ryo Miyajima 75847bc383 make CCTMXObjectGroup::getGroupName const 2015-01-22 16:37:51 +09:00
Wenhai Lin 5076b9f008 Fixed crash 2015-01-21 22:46:31 +08:00
Wenhai Lin 342c582124 Fixed label may become white/black block after resume from background on android 2015-01-21 21:58:18 +08:00
lite3 0923a28e4d fix wild pointer 2015-01-21 21:01:57 +08:00
minggo 26bdd8b532 Merge pull request #10140 from minggo/crash-fix 
check if plist file exist
 2015-01-21 14:41:44 +08:00
minggo 097d4f3266 check if plist file exist 2015-01-21 14:36:49 +08:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix 
Fixed the alpha channel of text color of system font not take effect
 2015-01-21 11:09:27 +08:00
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089 
Fixed lose the precision of label's dimensions
 2015-01-21 10:51:27 +08:00
minggo 372b11422d Merge pull request #10115 from dabingnn/FixCrashOnWin32 
Fix crash on win32
 2015-01-21 10:34:22 +08:00
minggo 5f37ba8096 Merge pull request #10095 from super626/fixnode 
fix anchor point bug
 2015-01-21 09:58:00 +08:00
Huabing.Xu 65b6500491 Merge branch 'v3' into FixCrashOnWin32 
Conflicts:
	cocos/2d/CCDrawNode.cpp
	cocos/renderer/ccShaders.cpp
 2015-01-20 18:09:11 +08:00
Huabing.Xu 79eee9b145 fix crash on windows 2015-01-20 16:50:51 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
samuele3hu d4db54dc64 issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
yangxiao 2a2330438c fix anchor point bug 2015-01-20 14:10:11 +08:00
WenhaiLin f2c6a48976 Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
Huabing.Xu 19bb6a0c68 fix opengl 502 by using glGetBooleanv 2015-01-16 15:21:23 +08:00
Nite Luo 9848a8133b Fix Vertex Z issue 2015-01-15 16:41:07 -08:00
Nite Luo 9d7604cab7 undeprecate init for custom command 2015-01-15 15:56:44 -08:00
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
huangshiwu 65e97450d0 fix DrawNode init error 2015-01-15 11:51:21 +08:00
Mircea Rila 2a235f5b8d add Color3B type parameter to TintTo::create 2015-01-14 11:04:23 +02:00
yangxiao 42c40d895f enable disable culling using macro 2015-01-14 14:41:10 +08:00
Huabing.Xu 34582ba268 Merge branch 'v3' into v3_AddOptionsForCulling 
Conflicts:
	cocos/2d/CCLabel.cpp
 2015-01-14 12:44:24 +08:00
minggo 5459149279 Merge pull request #9969 from huangshiwu/pointSize 
DrawNode enable draw different size points
 2015-01-14 11:38:31 +08:00
minggo 0207c22cb6 Merge pull request #9953 from darkdukey/renderFix 
Render fix
 2015-01-14 11:06:33 +08:00
Huabing.Xu f3d8798d39 add macro to enable to disable culling 2015-01-14 10:56:51 +08:00
huangshiwu f4ac7c4e44 modify WP8 project and update precompileshader 2015-01-14 02:15:04 +08:00
huangshiwu fea492ab4f DrawNode enable draw different size points 2015-01-13 22:30:50 +08:00
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix 
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2015-01-12 20:43:55 -08:00
Nite Luo 8591609128 Implement 3D drawing support for Sprite, Label, Particle, BatchNode 2015-01-12 20:06:50 -08:00
Huabing.Xu af9e49b28d cache director pointer to improve rendering performance 2015-01-13 10:28:25 +08:00
yangxiao 6d297d377b camera visible check 2015-01-12 10:08:55 +08:00
minggo 465bf48442 Merge pull request #9879 from suzukaze/fix-indents 
Replace tabs with spaces in cocos/2d dir
 2015-01-09 14:59:27 +08:00
Takao Kato ba0beaffdc fixed getParentToNodeTransform. it returned a wrong transform if _transformDirty was true. 2015-01-09 09:58:09 +08:00
Nite Luo e7480a7efb Enable tansparent queue and create camera rotation demo 2015-01-08 16:30:00 -08:00
Jun Hiroe e4d560b658 Replace tabs with spaces in cocos/2d dir 2015-01-08 20:17:45 +09:00
Huabing.Xu 5f8d69d447 Merge pull request #9862 from Dhilan007/v3-physics-performance2 
[Physics]Reduce temporary object creation and save mathematical labor
 2015-01-08 14:27:52 +08:00
Wenhai Lin 61438f7297 [Physics]Reduce temporary object creation and save mathematical labor 2015-01-08 14:25:06 +08:00
Huabing.Xu 2b71c57b52 Merge pull request #9840 from Dhilan007/v3-physics-performance 
Improve performance of Physics
 2015-01-08 10:33:51 +08:00
Jun Hiroe ca86bce60d Replace tab with spaces 2015-01-07 23:46:28 +09:00
Wenhai Lin 8524a5fb97 Improve performance of physics 2015-01-07 17:08:04 +08:00
Huabing.Xu 27d4c6a0f6 Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug 
DrawNode override drawPoints function to set pointSize, fix draw points ...
 2015-01-07 14:46:13 +08:00
huangshiwu f41f00fcb2 make rotated rect draw correctly 2015-01-07 11:44:16 +08:00
huangshiwu ac7ddad4ac DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug 2015-01-07 11:02:31 +08:00
minggo 4b0a35d772 Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass 
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
 2015-01-07 10:21:54 +08:00
Eric Muxagata e0143167e6 Making CCMotionStreak _maxPoints framerate independent. 2015-01-06 17:02:32 -02:00
minggo 5b0925d42d Merge pull request #9802 from dabingnn/v3_fixGLProgramLogCrash 
fix delete wild opengl buffers
 2015-01-06 15:13:49 +08:00
WenhaiLin 2847a940ed Update project 2015-01-06 14:40:15 +08:00
minggo 31819bafc3 Merge pull request #9769 from ton1517/fix/jumpto 
fix problem : JumpTo position is changed each repeat.
 2015-01-06 14:09:54 +08:00
WenhaiLin f620038c59 Add miss file for win32 project 2015-01-06 10:55:26 +08:00
Huabing.Xu 7f61a3d97b reset _VAOname to 0 before recreating on android 2015-01-06 09:44:19 +08:00
Huabing.Xu a1654e5714 fix delete wild opengl buffers 2015-01-05 17:53:31 +08:00
ton a445148a5e fix problem : JumpTo position is changed each repeat. 
example:

    sprite->runAction(
        RepeatForever::create(
            Sequence::create(
                JumpTo::create(1, Vec2(300, 200), 100, 2),
                MoveTo::create(1, Vec2(100, 200)),
                nullptr
            )
        )
    );
 2015-01-03 01:13:57 +09:00
Dale Stammen 395b9fbaa7 added /bigobj to c++ command line options to fix arm builds 2014-12-31 12:56:16 -08:00
Dale Stammen d8c2927944 added base/allocator files 2014-12-30 21:41:46 -08:00
Dale Stammen 7276f64f29 updated dll name from 3.3 to 3.4 2014-12-30 21:40:01 -08:00
Dale Stammen ac95d292bd added base/allocator files 2014-12-30 21:21:36 -08:00
Dale Stammen df64718ef1 removed 3dExport.h as it no longer exists 2014-12-30 20:51:54 -08:00
Dale Stammen f73a07c7b9 added missing files 2014-12-30 17:27:37 -08:00
Dale Stammen bd1fef7515 added missing files 2014-12-30 16:40:04 -08:00
minggo da8c007932 add const for Sprite::getTextureRect() and do some format 2014-12-30 11:55:54 +08:00
minggo 7db279220c Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3 2014-12-29 15:04:43 +08:00
minggo d7dfdc9124 Merge pull request #9417 from lite3/spriteretainframe 
retain the sprite frame in sprite
 2014-12-29 10:33:42 +08:00
lvlong f592671df6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
 2014-12-26 13:42:13 +08:00
andyque 19dc8b5d19 fix conflicts and wp8, wp8.1 linker error 2014-12-25 18:11:59 +08:00
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 2014-12-25 18:08:07 +08:00
lvlong a4a108f766 fix lua binding again!! 2014-12-25 14:04:41 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
yangxiao 0db70977f9 wrong scale order 2014-12-25 10:39:48 +08:00
yangxiao 510633ba72 wrong spelling 2014-12-25 10:33:49 +08:00
yangxiao 6eed142e03 rename _rotation_quat to _rotationQuat 2014-12-24 18:12:00 +08:00
yangxiao 17207673ff merge cocos 2014-12-24 17:34:58 +08:00
yangxiao 88e0f025ef make it clean 2014-12-24 17:18:09 +08:00
yangxiao 22ae384edf Rotation representation with quaternion fix #9510 2014-12-24 17:07:54 +08:00
youyou db6ffd7962 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-24 15:59:50 +08:00
lvlonggame 805b248af3 modify win-project 2014-12-24 15:06:58 +08:00
yusheng.lu fa5b4f8df7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters

resolve the conflicts
 2014-12-24 13:06:38 +08:00
minggo 5d8e004b9b Merge pull request #9600 from huangshiwu/v3_allocator_wp 
fix allocator related compile error on wp8/8.1 and winrt
 2014-12-24 10:54:16 +08:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
huangshiwu 01eeb15a8d fix allocator related compile error on wp8/8.1 and winrt 2014-12-24 10:45:29 +08:00
minggo dea483b6ef performance improve 2014-12-23 18:07:22 +08:00
yusheng.lu d543f8f6a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-23 16:12:50 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yusheng.lu 2de5ba7c2f vs filters update 2014-12-22 19:43:14 +08:00
yusheng.lu 02b9269cff completed multiplatform projects 2014-12-22 19:39:10 +08:00
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +08:00
lvlong db9f4a23fe feedback commit. 2014-12-22 18:13:07 +08:00
yusheng.lu 6de7fae114 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-22 18:00:08 +08:00
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
yangxiao e8c7f30541 add quaternion 2014-12-22 17:23:44 +08:00
minggo feacf75f12 Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3 
#9555 MoveTo and MoveBy support Vec3
 2014-12-22 15:57:12 +08:00
yangxiao bdc12dce8b add quaternion property 2014-12-22 15:14:18 +08:00
minggo 81de0ae687 Merge pull request #9566 from austinkelleher/dev 
Fixing variable name lenght -> length.
 2014-12-22 15:07:15 +08:00
minggo 20beb3b9e0 Merge pull request #9567 from joewan/v3-improve-perf 
fix serious performance problem of Animate.
 2014-12-22 14:57:26 +08:00
minggo 1268f73a7c MoveTo and MoveBy support Vec3 2014-12-22 14:34:35 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
joewanchen bb1267cd09 use auto&. 2014-12-21 14:05:34 +08:00
joewanchen a15a4a0739 fix compile error. 2014-12-21 02:03:41 +08:00
joewanchen 3765f87651 fix. 2014-12-21 00:49:23 +08:00
joewanchen 7d6686eb7b fix. 2014-12-21 00:42:55 +08:00
joewanchen fc69dabca2 fix serious performance problem. 2014-12-21 00:22:23 +08:00
Austin Kelleher d3ca364259 Fixing variable name lenght -> length. 2014-12-20 07:34:44 -05:00
XiaoYang 9102c77840 Merge pull request #182 from lvlonggame/v3 
camera frustum update
 2014-12-19 16:14:01 +07:00
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
lvlong f6bea9b6bb 1.add camera culling. 
2.add camera culling sample.
3.fix bug: load .obj file material.
 2014-12-18 17:18:22 +08:00
minggo e800b3d9ba Merge pull request #9501 from joewan/v3-fix-mismatch 
V3 fix uninitialized members.
 2014-12-16 18:28:36 +08:00
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
joewanchen 713d19c830 initialize _contentSizeDirty. 2014-12-15 19:43:54 +08:00
Wenhai Lin 4ed5872ba3 Fixed content size of Label is incorrect after sets empty string. 2014-12-15 14:36:57 +08:00
lite3 91c7127bbd Merge branch 'v3' into spriteretainframe 2014-12-09 10:51:47 +08:00
lite3 4f4c30051e retain the sprite frame 
do not removed by SpriteFrameCache::removeUnusedSpriteFrames
 2014-12-08 21:04:15 +08:00
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
lite3 8df8ee36db print more info 2014-12-04 19:18:54 +08:00
kaile.yin 9f9c4782f1 change file name 2014-12-04 18:51:32 +08:00
kaile.yin a6653c7d8d change name 2014-12-04 18:50:00 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
pipu 6d764bc2c8 Merge branch 'v3' into v3_flatbuffers 
Conflicts:
	tools/cocos2d-console
 2014-12-03 15:47:03 +08:00
kaile.yin fd69a5efc3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
minggo 4bee194a0b Merge pull request #9285 from huangshiwu/v3_drawpolygon 
DrawNode::drawPolygon refactor
 2014-12-03 14:06:48 +08:00
minggo 4d2ea40db0 Merge pull request #9265 from shrimpz/fix_label_crashed_on_android 
Fix label crashed on android #9255
 2014-12-02 15:48:10 +08:00
pipu 26a6c9a724 Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters 2014-12-02 12:30:34 +08:00
pipu 1cbc0120be Merge branch 'v3' into v3_flatbuffers 2014-12-01 22:56:18 +08:00
zhounan 7ffc6f9784 Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters 2014-12-01 13:18:57 +08:00
Dale Stammen 117d7bd5e8 fixed universal app project files for flatbuffers 2014-11-27 05:34:36 -08:00
Dale Stammen 267edeafd3 fixed wp8 project files for flatbuffers 2014-11-27 05:22:07 -08:00
StarWing d5125ae179 nullptr check when Sprite::setTexture with non-exists file 2014-11-27 21:15:09 +08:00
pipu 1633b7f475 Reset libcocos2d_8_1.Windows.vcxproj, libcocos2d_8_1.Windows.vcxproj.filters, libcocos2d_8_1.WindowsPhone.vcxproj, libcocos2d_8_1.WindowsPhone.vcxproj.filters 2014-11-27 20:02:03 +08:00
zhangcheng 12a5443834 Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers 2014-11-27 18:34:18 +08:00
zhangcheng 0c89db7675 Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp 2014-11-27 18:32:35 +08:00
huangshiwu b866a58fc4 DrawNode::drawPolygon refactor 2014-11-27 18:31:04 +08:00
pipu 48f280b478 Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1 2014-11-27 18:27:22 +08:00
Shrimpz 38a6aa30a2 * fixed android crash that a Label instance add to an invisibility parent node. 2014-11-27 10:59:47 +08:00
pipu 889f84e540 newest v3 flatbuffers 2014-11-26 13:29:23 +08:00
minggo 5d58ffc5ab Merge pull request #9212 from Dhilan007/v3-fontfnt-crash 
Fix crash when missing image resource of FNT font.
 2014-11-26 11:48:53 +08:00
minggo 14bbaab0ba Merge pull request #9210 from Dhilan007/v3-physics-scale 
Reducing unnecessary function call
 2014-11-26 10:57:59 +08:00
minggo 7f4cabcd9f Merge pull request #9216 from Dhilan007/v3-debugfix 
fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW
 2014-11-26 10:53:36 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
Ricardo Quesada 9e10d2d32b Revert "Merge pull request #9193 from pipu/v3_flatbuffers" 
This reverts commit fa22b12628, reversing
changes made to 8dce62b94c.
 2014-11-24 10:19:53 -08:00
Wenhai Lin d63474436b fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW 2014-11-24 17:21:14 +08:00
LinWenhai fa90897e5b remove unnecessary keyword 2014-11-24 16:27:42 +08:00
Dhilan007 7119a5855d Fix crash when missing image resource of FNT font. 2014-11-24 15:57:00 +08:00
Dhilan007 4bc4f43b28 Reducing unnecessary function call 2014-11-24 15:27:20 +08:00
zhangcheng 32ce3dca2e 1, Update windows project. 2014-11-21 18:12:46 +08:00
pipu 6be17520c7 Config android, linux, wp8 2014-11-21 18:08:09 +08:00
minggo 02ba67e17f Merge pull request #9082 from Teivaz/v3 
- Optimization in CCClippingNode.
 2014-11-20 11:35:42 +08:00
kaile.yin eb9646ee3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-19 10:58:19 +08:00
Ricardo Quesada 71fec06a11 fixes indentation 2014-11-17 18:11:17 -08:00
kaile.yin bbd971d910 create ActionTimelineNode 2014-11-17 21:05:20 +08:00
Ricardo Quesada dcc4c46d5b Using std::swap instead of CC_SWAP 
CC_SWAP is deprecated. Use `std::swap` instead.
 2014-11-16 09:29:05 -08:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
minggo 156be2e633 Merge pull request #9077 from super626/fixscene 
fix Scene::setScale does not work #9031
 2014-11-13 18:59:49 +08:00
teivaz 2d75ceafb7 - set const modifier to ClippingNode::hasContent() 2014-11-13 12:43:05 +02:00
minggo 222adb22dd Merge pull request #9104 from super626/camera 
add comments to camera and scene
 2014-11-13 18:04:44 +08:00
yangxiao d50670af4b add comment to camera and scene 2014-11-13 17:30:49 +08:00
Dhilan007 e071e5c896 Fix Label may display incomplete for multiline text with outline feature enabled. 2014-11-12 17:24:35 +08:00
teivaz 7c355a087b - Optimization in CCClippingNode. 
Disable visiting when no objects has to be drawn under stencil.
 2014-11-11 21:09:58 +02:00
yangxiao 6ecb9a7b04 fix #9031 2014-11-10 12:48:42 +08:00
minggo db659107d3 Merge pull request #9052 from huangshiwu/v3_fixbug 
fix ui crash bug caused by DrawNode
 2014-11-07 10:33:08 +08:00
huangshiwu ace9933d72 fix ui crash bug caused by DrawNode 2014-11-07 10:05:29 +08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
minggo e56c84ebf0 Merge pull request #8983 from super626/camera 
fix wrong camera lookat computation
 2014-11-05 17:49:59 +08:00
minggo 98073632d4 Merge pull request #8908 from zawasp/v3-source 
fix some warnings / remove TABs
 2014-11-05 13:39:20 +08:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
yangxiao 642a601502 fix wrong look at 2014-10-31 11:32:10 +08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
Dale Stammen 32a5a2cbb8 Merge branch 'v3' into wp8-shader-fix 2014-10-28 22:08:04 -07:00
Dale Stammen 145156d698 disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones 2014-10-28 20:56:49 -07:00
Dale Stammen 6d46ee8f3d fixed location of renderer filter 2014-10-27 11:09:27 -07:00
Dale Stammen b483162128 added ignore warning 4756 2014-10-27 11:07:27 -07:00
minggo 23f922420a Merge pull request #8919 from ahlwong/v3 
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
 2014-10-27 11:48:50 +08:00
minggo baff367c94 Merge pull request #8918 from dumganhar/iss8843-drawpoint 
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
 2014-10-27 11:38:11 +08:00
Ahlwong dfcdf10898 Fix Label Additional Kerning All Strings 2014-10-24 08:57:37 -07:00
Dale Stammen 40e49cdc12 Merge branch 'v3' into wp8.1-universal 2014-10-24 07:08:55 -07:00
Ahlwong 012683bf6e Fix kerning on signle characters 2014-10-23 21:18:51 -07:00
James Chen 603700179e closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points. 2014-10-24 12:03:11 +08:00
Dale Stammen b6329c6c7b added correct options to compile c file 2014-10-23 13:27:24 -07:00
Dale Stammen b520e80e04 updated 2d and base file locations 2014-10-23 09:03:35 -07:00
Dale Stammen a4f13a91ab added CC_NO_GL_POINTSIZE preprocessor define 2014-10-23 07:36:23 -07:00
Dale Stammen 89d3d7b7cf added missing cocos2d files 2014-10-23 07:29:57 -07:00
Dale Stammen 753bc5034a removed winrt/wp8 code. no longer needed 2014-10-23 06:59:09 -07:00
Mircea Rila 3d276db6d2 fix some warnings / remove TABs 2014-10-23 12:54:15 +03:00
Dhilan007 20d372b356 Fixed Label shifting when outline feature enabled 2014-10-22 14:34:01 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
Dhilan007 0bb02fb34f Fix Label: endless loop if not using system font, and constrained length is less than one character width 2014-10-20 10:41:01 +08:00
yangxiao cfb6a7846f Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-17 18:08:55 +08:00
yangxiao 66dd0807eb add isVisibleByVisitingCamera check when visit 2014-10-17 18:07:45 +08:00
Dhilan007 4586954e0a fixed miss sqlite3 for release build on window. 2014-10-17 11:39:06 +08:00
Dale Stammen d5b0830c3b added missing files 2014-10-16 11:15:39 -07:00
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
minggo 68d58b05e9 Merge pull request #8700 from iSevenDays/v3 
CMake fix for Mac Os X
 2014-10-15 21:24:18 +08:00
SunLightJuly 74952d7258 added CCClippingRectangleNode.cpp to CMakeList 2014-10-15 14:17:04 +08:00
SunLightJuly 3352fb7bf3 reset wp8 project files 2014-10-15 14:14:02 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
SunLightJuly f2286eaf94 added ClippingRectangleNode 2014-10-15 13:38:14 +08:00
Dale Stammen 4bed458371 added missing protobuf-lite files 2014-10-14 17:41:40 -07:00
Dale Stammen 180fa4c324 added new cocos2d wp8 dll project files 2014-10-14 14:28:06 -07:00
Dale Stammen 9ef5f3a48f added wp8 and winrt property sheets 2014-10-14 14:27:29 -07:00
Dale Stammen 8983a57869 added Windows 8.1 universal app project files 2014-10-14 14:25:01 -07:00
Dale Stammen eb74b642da added Windows 8.1 universal app project files 2014-10-14 14:23:39 -07:00
Anton Sokolchenko fc35cc2efe CMake fix for Mac Os X. 
You can open project with CLion and see that everything works.
 2014-10-15 00:19:29 +03:00
Dale Stammen ec5af7ae90 added missing CC_USE_PHYSICS 2014-10-14 14:12:27 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
minggo 0ab3017094 Merge pull request #8658 from pipu/v3_pipu 
V3 pipu
 2014-10-14 14:25:46 +08:00
pipu a8febf9656 1. update wp8 projects. 2014-10-13 15:31:29 +08:00
pipu 72f5808678 Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters 2014-10-13 14:48:10 +08:00
minggo 0351000c97 Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap 
V3 add staggered tile map
 2014-10-13 13:50:50 +08:00
pipu 93a7e22eb6 Modifying libcocos2d.vcxproj.filters 2014-10-12 18:55:43 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
pipu 779e73dad0 1. change config.h in win32. 2014-10-12 15:27:41 +08:00
pipu 10e390557e Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters 2014-10-12 15:07:37 +08:00
minggo b144eb345a Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug 
fix DrawNode's memory leak -- delete vaos those are generated and forget...
 2014-10-11 17:31:17 +08:00
minggo 2db8217b09 Merge pull request #8543 from Dhilan007/v3-fixwarns 
fix warns and memory leak
 2014-10-11 16:07:54 +08:00
Huabing.Xu 7747e2ecf5 Merge branch 'v3' into v3_addStaggeredTileMap 2014-10-11 15:15:12 +08:00
Huabing.Xu 27f48b0011 add implementation for staggered tmx map 2014-10-11 14:22:31 +08:00
pipu 583a756d33 Reverting build/cocos2d-win32.vc2012.sln 
Reverting cocos/2d/libcocos2d.vcxproj
 2014-10-11 14:13:56 +08:00
huangshiwu 184d9356b8 fix DrawNode's memory leak -- delete vaos those are generated and forget to release 2014-10-11 12:00:14 +08:00
SunLightJuly a36dbf5362 ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +08:00
pipu efe22a0dd7 Modifying protocol buffers for win32 version 2014-10-10 21:55:59 +08:00
SunLightJuly ba064167a8 modified project files and make files 2014-10-10 18:43:40 +08:00
Huabing.Xu 766c9469d4 add staggered wrapper(using ortho for its implementation now) 2014-10-10 17:52:13 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
 2014-10-10 17:02:45 +08:00
minggo 4b7d5694b8 Merge pull request #8573 from Dhilan007/v3-labelatlas 
fix #8569: LabelAtlas opacity do not change when setting parent node's opacity
 2014-10-10 15:52:50 +08:00
andyque d5fe0758ed fix cocostudio include path 2014-10-10 13:48:49 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
minggo f928046f50 Merge pull request #8580 from Dhilan007/v3-labelfix 
issue #8492:fix endless loop when dimensions that are not enough to fit one character
 2014-10-09 17:05:39 +08:00
minggo b8c5ce6db3 Merge pull request #8588 from Dhilan007/v3-label8582 
fixed issue#8582: opacity of label
 2014-10-09 15:50:44 +08:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
Dhilan007 462e38cbc6 fixed opacity of label 2014-10-09 10:54:35 +08:00
SunLightJuly 1062dec335 modified project files and make files 2014-10-08 18:44:58 +08:00
Dhilan007 6f50143e0a Fixed LabelAtlas opacity do not change when setting parent node's opacity 2014-10-08 18:28:24 +08:00
Dhilan007 8ea473de7b fix endless loop when dimensions that are not enough to fit one character 2014-10-08 18:22:35 +08:00
minggo 8aa03e107f Merge pull request #8209 from boyu0/fix_physics_crash 
fix bug: physics crashes when remove/add children too quick.
 2014-10-08 13:48:03 +08:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada 42ace3e59c Adds lambda support in node 
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
 2014-10-02 21:25:55 -07:00
Ricardo Quesada 12e9d18ab7 Compiles on Windows Phone 8 2014-10-01 19:08:34 -07:00
Dhilan007 02fcb6488a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
 2014-09-30 14:19:27 +08:00
Dhilan007 7ebe4a5548 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/audio/AudioEngine.cpp
	cocos/audio/apple/AudioPlayer.h
	cocos/audio/include/AudioEngine.h
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
 2014-09-30 09:45:47 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
boyu0 2b0afa6063 fix bug: physics crashes when remove/add children too quick. 2014-09-30 08:15:46 +08:00
SunLightJuly fbbc90431e standardized codes 2014-09-29 15:42:56 +08:00
SunLightJuly e0b9878e58 added ClippingRegionNode 2014-09-29 15:07:05 +08:00
minggo 6583bf6b1f Merge pull request #8179 from MSOpenTech/wp8-v3-fix 
WP8 fixes for v3.3 app certification tests
 2014-09-29 13:42:40 +08:00
Dhilan007 f2f1331026 New Audio Engine[Win32] 2014-09-29 10:15:41 +08:00
Dhilan007 d52144d1e0 fix linker errors on WIN32 2014-09-28 21:45:09 +08:00
songchengjiang 39deb73c3a move light from 3d to base(Windows) 2014-09-28 17:23:25 +08:00
minggo 289c1edfe7 Merge pull request #8174 from lite3/v3 
fix compile error when CC_SPRITE_DEBUG_DRAW
 2014-09-28 16:21:04 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
Dale Stammen 3c7a22f776 removed CMakeLists.txt 2014-09-26 12:42:20 -07:00
Dale Stammen fd3177d350 removed WINRT 2014-09-26 11:41:12 -07:00
Dale Stammen 209f67f222 fixed property sheet 2014-09-26 11:01:43 -07:00
Dale Stammen f24312bc77 added UNICODE 2014-09-26 11:01:05 -07:00
lite3 da361810a3 fix compile error when CC_SPRITE_DEBUG_DRAW 2014-09-26 17:14:55 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao 6626655308 move render logic from Director to scene 2014-09-26 09:36:43 +08:00
minggo 9509f4cf9a Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix 
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
 2014-09-25 14:44:28 +08:00
minggo 9510d6d946 Merge pull request #8136 from andyque/moveWinEditBox 
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
 2014-09-25 13:38:19 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
toma d1faf75b58 [CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty 2014-09-25 01:46:17 +09:00
andyque 3c434ec354 remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp 2014-09-24 17:47:38 +08:00
cpascal a70f51b1e3 Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode 
I modified CC_PLATFORM_WINDOWS to CC_PLATFORM_WIN32.

--
In the CCPlatformConfig.h,
the definitions are..

// win32
#if defined(WIN32) && defined(_WINDOWS)
#undef
CC_TARGET_PLATFORM
#define CC_TARGET_PLATFORM
CC_PLATFORM_WIN32
#endif
 2014-09-23 17:35:57 +09:00
Dmitry Bushtets d242d79443 * added default value for _batchNode in CCSprite 2014-09-22 19:00:21 +03:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 
web view win32
 2014-09-22 09:30:29 +08:00
Jeff 2ffbe23c50 The files name: modify underline to hyphen 2014-09-19 10:24:17 +08:00
Jeff e4e2cea97a link error 2014-09-18 19:59:22 +08:00
Jeff 476ede6ccb link error 2014-09-18 19:56:53 +08:00
songchengjiang 3c67515378 Finished light reconstruction 2014-09-18 16:38:35 +08:00
Huabing.Xu cf4d0faad3 optimise update of particle system for free mode 2014-09-18 15:24:27 +08:00
minggo 442f30af1f Merge pull request #8091 from dabingnn/v3_PageTurnZFighting 
new version of avoid z fighting in pageTurn
 2014-09-18 10:50:31 +08:00
Jeff 1dffbd0a7b fix link errors 2014-09-18 01:52:08 +08:00
yangxiao 8c77130ae0 refactor light compile 2014-09-17 18:58:35 +08:00
Huabing.Xu 3a0e9be97e new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
minggo ccbf694927 Merge pull request #8086 from huangshiwu/v3_test 
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
 2014-09-17 14:50:42 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
huangshiwu c8bdba69ad fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView 2014-09-17 14:00:40 +08:00
minggo 38810eeb2e Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices 
change indices to short for fast tmx
 2014-09-17 11:31:58 +08:00
Huabing.Xu 725d107ae5 change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
huangshiwu 3907e5c1a2 fix ClippingNode's memory leak bug 2014-09-16 14:50:00 +08:00
huangshiwu d0d3e185ce fix wp8 and winrt compile error --add chipmunk static lib 2014-09-16 10:03:00 +08:00
joewan 93fdcf1f04 fix memory leak when use menu_selector. 2014-09-14 21:41:19 +08:00
minggo 0f42d9bbd8 Merge pull request #8022 from Dhilan007/v3-labelfix 
Label:It may display incorrectly with outline feature enabled.
 2014-09-12 17:54:02 +08:00
Dhilan007 23f1b740bf Label:It may display incorrectly with outline feature enabled. 2014-09-12 16:03:01 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
huangshiwu f1f6373b6e fix Cocos2dShaderCompile's compile error --use chipmunk static library 2014-09-12 15:29:10 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
huangshiwu 11d8829b3a Deprecate DrawPrimitives and enhance DrawNode --little modify 2014-09-12 14:50:41 +08:00
huangshiwu 6182a872c6 Deprecate DrawPrimitives and enhance DrawNode --more modify 2014-09-12 11:12:20 +08:00
huangshiwu 147bb7301b fix wp8 compile error --add BillBoard and BillBoardTest 2014-09-12 09:33:30 +08:00
huangshiwu 8922121ed1 Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
huangshiwu 8d8f4436db Deprecate DrawPrimitives and enhance DrawNode --fix android compile error 2014-09-11 17:55:47 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +08:00
andyque 67ad24e7c1 remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
andyque 1945c4f31e fix compile error 2014-09-11 14:45:55 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib 
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
 2014-09-10 10:00:15 +08:00
Ricardo Quesada d5a6289a9b compiles on wp8 2014-09-09 18:22:11 -07:00
Ricardo Quesada 6b4323642a compiles on winphone8 2014-09-09 18:15:16 -07:00
Ricardo Quesada 4d57e991ea Compiles in Win32 2014-09-09 18:07:24 -07:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
andyque 6a4397a3eb change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
minggo 905c429ff5 remove unneeded code 2014-09-09 10:58:07 +08:00
minggo 31c508ef6d deprecated Node::_setZOrder() 2014-09-09 10:55:27 +08:00
minggo 6b99ce6ec0 Merge pull request #7939 from minggo/remove-_setLocalZOrder 
remove Node::_setLocalZOrder()
 2014-09-09 10:49:09 +08:00
andyque d6b96d1e46 add chipmunk to wp project 2014-09-06 13:28:00 +08:00
andyque 2a8601ee1f Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib 2014-09-05 15:43:59 +08:00
huangshiwu 01358f0b62 fix wp8 compile error and modify default resource path 2014-09-05 15:43:08 +08:00
andyque 08c7f32627 add chipmunk static library for win32 2014-09-05 15:38:12 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +08:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
andyque 3451672365 restore some configs 2014-09-04 10:49:45 +08:00
Ricardo Quesada 047025696c Merge pull request #7680 from andyque/fixNormalizedPosition 
fix normalizedPosition bug
 2014-09-03 10:07:22 -07:00
andyque 87af0ecdd6 add back libbox2d and libspine project to our solution 2014-09-03 17:37:34 +08:00
minggo 5cca8cc87d remove Node::_setLocalZOrder() 2014-09-03 17:26:50 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
andyque 2e27a6865f update project to vs2013 2014-09-03 14:10:38 +08:00
minggo eee9ac626a Merge pull request #7815 from andyque/mergeExtensionEditBox 
merge extension EditBox to ui module
 2014-09-03 11:25:10 +08:00
minggo 9351caaa58 Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer 
fix transition scene stencil buffer
 2014-09-03 10:26:28 +08:00
andyque fab9a0052b fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
andyque dafbf28283 fix release mode compile error 2014-09-02 16:42:23 +08:00
andyque fadfa87afd fix vs2013 compile error 2014-09-02 16:42:04 +08:00
andyque dffdef1118 fix transition scene stencil buffer 2014-09-02 11:21:11 +08:00
andyque 6dc45f86e4 fix windows compile error 2014-09-02 10:05:22 +08:00
Huabing.Xu 6824453804 windows work for trianglesCommand 2014-09-01 15:08:09 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
songchengjiang 34070677ad Added testing Model Number 2014-08-29 17:11:18 +08:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
minggo afaea360fd Merge pull request #7908 from dabingnn/v3_fix_bugs 
V3 fix bugs
 2014-08-29 16:45:52 +08:00
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
minggo e4920ffdea fix conflict 2014-08-29 15:45:21 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
songchengjiang 43eb725c27 resolve conflict 2014-08-29 11:02:34 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-29 10:58:04 +08:00
minggo a125ed0453 Merge pull request #7906 from Teivaz/v3_WP8 
[WP8] Fixed project compilation.
 2014-08-29 10:03:25 +08:00
Huabing.Xu 7c870cfcc1 fix skew matrix bug 2014-08-29 09:50:26 +08:00
Ricardo Quesada 20d22a1c8a Users new `// MARK: ` feature to mark sections 
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
 2014-08-28 14:56:15 -07:00
teivaz 1d08acac08 * [WP8] Fixed project compilation. Removed references to deleted source files 2014-08-28 13:47:14 +03:00
minggo 50a2cb2b86 remove unneeded includes 2014-08-28 17:32:23 +08:00
minggo 7baf873bf6 remove unneeded includes 2014-08-28 17:03:29 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo 681c3c06f1 Merge pull request #7558 from newnon/v3_actions_by_tag_improvements 
stopAllActionsByTag && removeAllActionsByTag
 2014-08-28 14:24:37 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
yangxiao 74f98b36d6 merge cocos 2014-08-28 09:22:57 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
minggo 17ab047b7d fix compiling error on windows 2014-08-27 15:13:41 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
minggo d0ca9a4da5 remove unneeded include header files 2014-08-27 13:39:50 +08:00
minggo ac029c3d0d Merge pull request #7887 from super626/v3 
2d cull only for default camera
 2014-08-27 13:39:13 +08:00
yangxiao 26f7345693 2d cull only for default camera 2014-08-27 12:09:23 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
yangxiao 7d6b8ea706 merge cocos 2014-08-26 14:58:58 +08:00
yangxiao 03390a4f46 merge cocos 2014-08-26 14:05:59 +08:00
samuele3hu 07cf4d3526 Fix the win32 and android compile error 2014-08-25 14:10:13 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
minggo e5ac6e204b Merge pull request #7864 from minggo/module-devide 
Module devide
 2014-08-25 11:01:19 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
zii e8a5fc9fef Update CCActionManager.cpp 2014-08-23 17:06:46 +08:00
zii 4763531085 Update CCActionManager.cpp 2014-08-23 17:03:26 +08:00
minggo 0701fe1dfb Merge pull request #7853 from super626/v3 
Better reskin model support
 2014-08-22 19:18:47 +08:00
samuele3hu d1b4d43a0b Remove CCModuleManager.h/cpp and adjust the related project 2014-08-22 15:10:46 +08:00
samuele3hu 70cba1f64a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	cocos/Android.mk
 2014-08-22 14:01:17 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
minggo a0b19db670 Merge pull request #7840 from minggo/fix-warning 
fix warnings
 2014-08-22 13:41:31 +08:00
yangxiao 7818b28ee3 Merge branch 'newcode' into v3 2014-08-22 13:32:57 +08:00
andyque 84cf0ee834 add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
pandamicro 909dd0d397 Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
teivaz aecdb832a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-21 13:48:05 +03:00
teivaz a70688dc96 + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
yangxiao c26a81bb55 Merge branch 'newcode' into v3 2014-08-21 09:53:06 +08:00
yangxiao fcf4d79b06 setGLProgramState support 2014-08-20 19:01:04 +08:00
minggo bbf5c56e83 Merge pull request #7827 from andyque/ccRandom 
add c++11 random library support
 2014-08-20 13:35:12 +08:00
andyque 34629f1014 fix windows & win8 & wp8 compile error 2014-08-20 12:02:12 +08:00
Sergey 055a143f9d Label performance problem 2014-08-19 15:02:09 +04:00
teivaz db805ee2c8 * Fixed WP8 cocos library project 
* Fixed profiling macros
 2014-08-19 19:24:56 +03:00
minggo 22fa650bbf Merge pull request #7807 from samuele3hu/v3_3_3d_module 
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
 2014-08-18 22:38:58 +08:00
samuele3hu 6259aebdab Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-17 23:45:56 +08:00
songchengjiang 2b1efc59cb GLProgram Added Light Shader 
GLProgram Added Normal Matrix
 2014-08-15 19:15:14 +08:00
Dmitry Bushtets 1257f642c7 - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
 2014-08-15 17:43:04 +08:00
songmiao 361770e0f3 add BillBorad and BillBoardTest 2014-08-15 16:15:29 +08:00
minggo f2f8035724 Merge pull request #7708 from super626/obb 
AABB, OBB
 2014-08-15 15:32:14 +08:00
songchengjiang 1e9c02dfa3 Added Light Class 2014-08-15 14:51:23 +08:00
minggo aa052eb1c1 add CCModuleManager into vs project 2014-08-15 14:39:15 +08:00
songchengjiang 7ed40a8051 Added Light 2014-08-15 10:32:07 +08:00
teivaz 90e5870499 * Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project) 2014-08-14 15:35:36 +03:00
teivaz 885fd16b9e * Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project) 2014-08-14 15:20:48 +03:00
teivaz e9563696db * Fixed WP8 compilation errors (added path to CCGLView.h) 
- Modified filters for CCCamera.h/cpp
 2014-08-14 15:14:25 +03:00
yangxiao a508477eda remove unused code 2014-08-14 19:07:40 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
yangxiao 1942a27a5c Merge branch 'newcode' into v3_merge 2014-08-14 13:55:57 +08:00
yangxiao 032ba062a9 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
minggo f9e6dab507 Merge pull request #7770 from Dhilan007/v3-label-issue 
close issue#5734:Label:The letters sometimes slightly cut.
 2014-08-14 10:04:00 +08:00
yangxiao 4629d257e1 rename checkCameraMask to isVisibleByVisitingCamera 2014-08-14 09:58:11 +08:00
minggo e468beea86 Merge pull request #7760 from dabingnn/v3_addCallBackForRenderTexture 
add comment for the limit of RenderTextue::saveToFile
 2014-08-14 09:43:54 +08:00
minggo 0b86e129b0 Merge pull request #7762 from andyque/addAlignmentToUILabel 
add UITextField color & place hold color, fix double delete bug
 2014-08-14 09:38:57 +08:00
minggo 7d2ca95988 Merge pull request #7749 from zawasp/virtual_pause_resume 
virtual Node::pause() / Node::resume()
 2014-08-14 09:31:10 +08:00
Dhilan007 ff147b6cf8 close issue#5734:Label:The letters sometimes slightly cut. 2014-08-13 18:40:35 +08:00
yangxiao 76329f9e53 add camera mask check to visit 2014-08-13 12:06:51 +08:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
Huabing.Xu 5b99ee71c1 add comment for the limit of RenderTextue::saveToFile 2014-08-13 10:14:26 +08:00
minggo d223629477 Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture 
add callback for RenderTexture::saveToFile
 2014-08-13 10:05:08 +08:00
Mircea Rila 0154f7a94a virtual Node::pause() / Node::resume() 2014-08-12 21:05:09 +03:00
yangxiao 5ce9afbd69 create default camera at Scene constructor 2014-08-12 23:34:06 +08:00
yangxiao 46e59f1150 Merge branch 'newcode' into v3_merge 2014-08-12 17:34:58 +08:00
minggo 46cdd6f8dd Merge pull request #7701 from dabingnn/v3_renderPrimitive 
V3 render primitive
 2014-08-12 16:11:40 +08:00
yangxiao 32645c1622 fix default camera, add listener for projection change 2014-08-12 14:42:08 +08:00
Huabing.Xu 1145859d38 remove commented codes 2014-08-12 11:44:06 +08:00
Huabing.Xu 3a7b673164 add callback for RenderTexture::saveToFile 2014-08-12 10:50:57 +08:00
boyu0 790ef9e818 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step 
Conflicts:
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
 2014-08-12 10:20:34 +08:00
minggo b34e97cfd6 Merge pull request #7729 from andyque/fixCascadedColor 
fixed Widget's Children reload textures change RGBA issue
 2014-08-11 15:33:36 +08:00
andyque cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
minggo 43a3603a8b Merge pull request #7720 from samuele3hu/v3_module 
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
 2014-08-11 15:01:28 +08:00
Huabing.Xu 6aff707eab windows work now for renderPrimitive 2014-08-11 14:18:07 +08:00
yangxiao fd314261b7 Merge branch 'newcode' into obb 2014-08-11 13:21:44 +08:00
Huabing.Xu 2a28744dc5 Merge branch 'v3' into v3_renderPrimitive 2014-08-11 12:48:23 +08:00
yangxiao 6d15c26a61 move create default camera to Scene::initWithSize 2014-08-11 10:55:14 +08:00
yangxiao 2576622778 move create camera to Scene::initWithSize 2014-08-11 10:07:23 +08:00
minggo 437257e7e6 Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity 
Let Widget class don't support cascaded opacity and cascaded color on default.
 2014-08-11 09:37:51 +08:00
jimmystar 63c9780c49 Update CCScene.cpp 
in line 157, here need to create  and add camera, if not ,in the function createWithPhysics, will show black screen.
 2014-08-09 17:37:18 +08:00
samuele3hu 2dacbf6f26 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-08 16:59:33 +08:00
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +08:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
yangxiao1 61eaa082a2 fix windows 2014-08-08 15:33:30 +08:00
samuele3hu 6aa667c912 Add CC_DLL for FontFNT 2014-08-08 15:22:43 +08:00
lvlong fe58c43b2d add abb and obb to vc2012-project 2014-08-08 14:06:54 +08:00
yangxiao 4dce59582b visiting camera 2014-08-08 11:49:59 +08:00
minggo 800ab18457 Merge pull request #7700 from GavinThornton/patch-1 
Update CCSpriteBatchNode.cpp
 2014-08-08 11:49:39 +08:00
minggo b9e84370f6 Merge pull request #7699 from huangshiwu/v3_wp8fix 
V3 wp8fix
 2014-08-08 11:49:02 +08:00
minggo 2f638c67fd Merge pull request #7598 from AppleJDay/master 
Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...
 2014-08-08 10:43:32 +08:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
Huabing.Xu ba2ae6826c Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive 2014-08-07 15:36:41 +08:00
GavinThornton 8cc5e66e73 Update CCSpriteBatchNode.cpp 
Setting opacity of a sprite (via setOpacity or FadeOut/In action) has the sprite turning black, it should simply be opaque.  

Cause is in bool SpriteBatchNode::initWithTexture, third line, "if(tex->hasPremultipliedAlpha())" 
Fix is making it "!if(!tex->hasPremultipliedAlpha())"
 2014-08-07 00:31:33 -07:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
huangshiwu 0016c7af70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
minggo 7b11c6a74e Merge pull request #7237 from martell/v3 
Cmake update and remove old scripts from build folder
 2014-08-07 10:36:10 +08:00
minggo 4542b1882d Merge pull request #7617 from rny/SpriteFrameCache 
SpriteFrameCache load from plist file content data
 2014-08-07 10:20:36 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
andyque ab33e6f9a2 Let Widget class don't support cascaded opacity and cascaded color on default. 2014-08-06 16:21:00 +08:00
minggo 6ee0c4171f Merge pull request #7622 from rny/LabelTTF 
fix LabelTTF::getBoundingBox() position error
 2014-08-06 14:33:28 +08:00
minggo f786190349 Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox 
bug fix for LabelBMFont::getBoundingBox()
 2014-08-06 14:28:52 +08:00
andyque e2e8325f58 add safe guard when remove component from node componentContainer 2014-08-06 13:51:16 +08:00
minggo 9f51adfafa Merge pull request #7461 from joshuastray/fix_constructor_access 
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
 2014-08-06 10:15:02 +08:00
Huabing.Xu b1954ef516 clean up primitive code 2014-08-05 17:49:35 +08:00
Huabing.Xu 01b69c9e4f Merge branch 'v3' into v3_migrateFastTMX 2014-08-05 17:30:11 +08:00
Huabing.Xu 56551e6787 fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
minggo 1bad9ddbc2 Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr 
V3 wp8glviewhookpr
 2014-08-05 13:51:15 +08:00
minggo cd98034f16 Merge pull request #7631 from maltium/v3 
added 3D rotation support to the RotateTo action
 2014-08-05 13:30:43 +08:00
Huabing.Xu f7ad98b15b using primitve->draw in Fast_tmx on draw 2014-08-04 17:57:31 +08:00
huangshiwu 9c87522199 little more modefy 2014-08-04 17:34:50 +08:00
huangshiwu 9a3f231771 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +08:00
Huabing.Xu 414d67851f add _vertexBuffer back in Fast_tmx 2014-08-04 16:36:20 +08:00
Huabing.Xu bbf11f5d06 refactor vertex data 
using vertex data in fast_tmx
 2014-08-04 16:08:54 +08:00
huangshiwu efcb8b9962 wp8 glview hook solution 1 2014-08-04 14:17:14 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
Huabing.Xu a44f4c95e1 using indexBuffer instead of raw VBO 2014-08-04 10:40:07 +08:00
huangshiwu 372479d812 wp8 GLView Hook 2014-08-02 16:31:16 +08:00
xuzhiqiang 85dd898319 bug fix 2014-08-02 08:04:29 +08:00
Huabing.Xu 3d4bfe7780 using VertexBuffer instead of raw buffer 2014-08-01 17:50:22 +08:00
AppleJDay 2239fafade Merge branch 'v3' of github.com:AppleJDay/cocos2d-x 2014-08-01 17:22:43 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
AppleJDay bcecf09b6c Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git 2014-08-01 09:18:22 +08:00
maltium baba808391 RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02:00
maltium 98354e9f8e RotateTo action now uses Vec3() to keep track of the state 2014-07-31 23:05:58 +02:00
yangxiao e03d284e26 merge cocos2d 2014-07-31 18:55:41 +08:00
zhangbin d224c77bd4 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
songmiao 58c32e52c7 windows works 2014-07-31 14:08:05 +08:00
maltium 3d44439e2a added 3D rotation support to the RotateTo action 2014-07-30 21:42:47 +02:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
Ningyu d53cdc39df tab to spaces 2014-07-30 16:20:58 +08:00
Ningyu 52ca596b3d code tidy 2014-07-30 16:19:05 +08:00
Ningyu 61a87e7e8b fix LabelTTF::getBoundingBox() position error 2014-07-30 14:00:01 +08:00
Ningyu aebe8317bd spaces 2014-07-29 17:22:13 +08:00
Ningyu d5242ef4fa add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 17:06:43 +08:00
Ningyu 23e0ed3767 add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 16:58:33 +08:00
Huabing.Xu ea802580a2 add script to copy sqllite3.dll to output dir on windows 2014-07-29 15:02:34 +08:00
minggo 5d63ce17ad Merge pull request #7610 from dabingnn/v3_windowChangeModule 
V3 window change module
 2014-07-29 14:29:01 +08:00
boyu0 c63d64e385 set emission rate when setTotalParticles() 2014-07-29 10:48:20 +08:00
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
AppleJDay 0bd4b608b7 Merge pull request #1 from cocos2d/v3 
Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
 2014-07-29 08:34:15 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
minggo 7ad7b5b3f7 Merge pull request #7585 from wagulu/patch-1 
Update CCParticleSystem.cpp
 2014-07-28 10:54:05 +08:00
AppleJDay bd5ca6a244 Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions 2014-07-28 10:39:35 +08:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
LiuZhuo 2f10e8e468 Update CCParticleSystem.cpp 2014-07-25 11:40:23 +08:00
Huabing.Xu 58cd01b2f6 reverse cocos2d.vcxproj 2014-07-24 10:37:54 +08:00
wagulu 46ac5d12b2 Update CCParticleSystem.cpp 
diff is base on WorldSpace, when you scale scene,you will get the wrong value.
 2014-07-23 21:04:17 +08:00
minggo 3662077025 Merge pull request #7556 from Dhilan007/v3 
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
 2014-07-23 11:29:26 +08:00
LinWenhai 0fe02b3636 Update CCFontAtlasCache.cpp 2014-07-22 22:07:19 +08:00
LinWenhai 815d063a0a replace sprintf with snprintf 2014-07-22 22:05:56 +08:00
Sergey 84e82bf497 stopAllActionsByTag && removeAllActionsByTag 2014-07-22 17:14:27 +04:00
Sergey 2acce6771f software per decompression support 2014-07-22 15:49:36 +04:00
Dhilan007 f38b48914f fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments. 2014-07-22 18:31:53 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
Huabing.Xu e666ab88ed fix windows compile error 2014-07-21 14:59:47 +08:00
Jialong Zhai 012f5403d9 protected -> CC_CONSTRUCTOR_ACCESS 2014-07-21 11:17:58 +08:00
Huabing.Xu 23db16b0bd convert indention to space 2014-07-18 14:53:00 +08:00
Huabing.Xu 8afd7614d1 Merge branch 'v3' into v3_dll 2014-07-18 14:01:17 +08:00
minggo 462f9bdd78 Merge pull request #7502 from visiblelight/render_texture_disabled 
The orientation of render texture should be rotated
 2014-07-17 20:09:01 +08:00
visiblelight 7e7c3aeb1c The orientation of render texture should be rotated when _keepMatrix is true 2014-07-17 19:53:35 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
minggo 91a537dec6 Merge pull request #7493 from visiblelight/render_texture_disabled 
no need to save/restore for render texture when entering background
 2014-07-17 17:07:54 +08:00
vision a2413a6538 no need to save/restore for render texture when entering background 2014-07-17 17:03:10 +08:00
minggo c482e2e14f Merge pull request #7491 from Dhilan007/v3-320final 
fixed text line wrap issue in UITextField.
 2014-07-17 16:48:41 +08:00
Dhilan007 8ac1398037 fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
Huabing.Xu 3c6e87d34e Merge branch 'v3' into v3_dll 
Conflicts:
	cocos/base/ccUtils.h
 2014-07-17 14:12:10 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
minggo 2403bc2e50 Merge pull request #7343 from zhouxiaoxiaoxujian/feature/COC-10 
Add getChildByName method for get a node that can be cast to Type T
 2014-07-17 10:02:57 +08:00
Huabing.Xu a0be6d9ac7 remove Storage project, merge code into cocos2d 2014-07-16 14:49:05 +08:00
joshuastray 190460018f use CC_CONSTRUCTOR_ACCESS in ParallaxNode 2014-07-16 11:40:09 +08:00
Huabing.Xu 0350186589 Merge branch 'v3' into v3_dll 2014-07-16 11:15:16 +08:00
joshuastray da9563f623 fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS 2014-07-15 15:26:37 +08:00
Huabing.Xu 63de5f6acc add CC_DLL 2014-07-15 12:00:31 +08:00
Huabing.Xu 8bbce767f3 add CC_DLL for ActionEase 2014-07-14 22:42:44 +08:00
Dhilan007 5e10575ab0 disable warn on zero-sized structures. 2014-07-14 17:53:55 +08:00
Huabing.Xu 9806b37398 add CC_DLL of DrawPrimitive 2014-07-14 17:40:02 +08:00
minggo 981922eb95 Merge pull request #7432 from joshuastray/transition_ctor_access 
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
 2014-07-14 16:28:18 +08:00
Huabing.Xu 52c0bd365b add chipmunk.lib for release 2014-07-14 14:47:00 +08:00
Huabing.Xu 469dbea7da window dll version work now 2014-07-14 14:40:47 +08:00
joshuastray 98b1c0bbed add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
joshuastray e14c2587b5 move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
minggo cfc291e49d Merge pull request #7379 from joshuastray/v3 
move JumoTo's copy constuctor and operator= to private
 2014-07-12 20:19:03 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
Huabing.Xu 60dd7a4514 Merge branch 'v3' into v3_dll 2014-07-11 11:10:26 +08:00
Huabing.Xu f5cffba6c9 change pure virtual function to virtual function in action series 
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
 2014-07-11 10:19:49 +08:00
joshuastray 7396f447a4 move initWithDuration to CC_CONSTRUCTOR_ACCESS 2014-07-10 17:56:20 +08:00
minggo 831b0b332b Merge pull request #7371 from minggo/enumerateChildren-fix 
Node::enumerateChildren  just searches from itself
 2014-07-10 15:46:04 +08:00
minggo c7856b21fd Merge pull request #7366 from Dhilan007/v3-fixed-warn 
fixed warn and replace NULL with nullptr.
 2014-07-10 15:42:02 +08:00
joshuastray 30574af6c5 move JumoTo's copy constuctor and operator= to private 2014-07-10 14:30:08 +08:00
minggo 0ba3f6c1c9 Merge pull request #7376 from joshuastray/v3 
use CC_CONSTRUCTOR_ACCESS to replace protected/private
 2014-07-10 14:14:08 +08:00
joshuastray 6b22870e27 use CC_CONSTRUCTOR_ACCESS to replace protected 2014-07-10 14:00:23 +08:00
minggo 316564d58a Node::enumerateChildren just searches from itself 2014-07-10 11:07:39 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 
Make clear EVENT_COME_TO_FOREGROUND event.
 2014-07-09 23:03:04 +08:00
minggo f7af8938bd Merge pull request #7277 from darkdukey/fix_rotation3D 
Fix setRotation3D
 2014-07-08 22:05:27 +08:00
Dhilan007 10defddc2e fixed memory leak cause by singleton. 2014-07-08 18:22:48 +08:00
Frank.Xu 5db9fa6e4b Add getChildByName method for get a node that can be cast to Type T 2014-07-08 15:58:34 +08:00
Dhilan007 e31abe3f54 fixed opacity issue in SpriteBatchNode. 2014-07-08 14:08:53 +08:00
Dale Stammen 021ee7d1e7 check if _itemsPerRow == 0 to avoid divide by zero 2014-07-07 11:17:05 -07:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
mannewalis f238593bfb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x: (78 commits)
  fix ui::Helper::seekWigetByName can not find pages in pageview
  [AUTO][ci skip]: updating cocos2dx_files.json
  add const for getter. fixed redefinition of 'registerListeners'
  Update CCController-android.cpp
  fixed missing function
  issue #4689: Refactoring game controller API[ios]
  Add resources
  version1.2
  Remove useless codes
  Refactoring game controller API
  should not include android cpp files in win/wp project
  Remove useless codes
  Remove useless codes
  Add Lua bindings for utils and CaptureScreen test case
  revert Android.mk
  issue #4689: Refactor controller API.
  add setXXTEAKeyAndSign
  fix indent problems
  initialize member variable
  fix windows compile and running error
  ...
 2014-07-05 12:26:44 -07:00
minggo 83b7dccdfc Merge pull request #7314 from joshuastray/fix_win_proj 
should not include android cpp files in win/wp project
 2014-07-04 16:51:27 +08:00
joshuastray 8ab8caf751 should not include android cpp files in win/wp project 2014-07-04 16:44:10 +08:00
minggo 95fe74a34b Merge pull request #7299 from dabingnn/fast_tmx 
Fast tmx
 2014-07-04 09:49:30 +08:00
mannewalis 4b1f2ccc91 prefixing ivars 2014-07-03 10:16:10 -07:00
mannewalis 96605f801c prefixing ivars 2014-07-03 10:13:46 -07:00
mannewalis 69341095fe adding accessors to the on*Callback variables 2014-07-03 09:13:52 -07:00
mannewalis 92e08265cd changes needed for swift bindings to work 2014-07-03 08:42:06 -07:00
Huabing.Xu 0214131bb2 optimise tile map rendering 2014-07-02 17:16:03 +08:00
minggo d8c9f6a0a6 add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
Huabing.Xu efa452e0c4 support for fast tmx hex 2014-07-02 15:19:11 +08:00
Nite Luo 4cb59683e4 Add Sprite3DRotation test 2014-07-01 12:36:53 -07:00
Nite Luo a81bea886e Rotate around anchor point 2014-07-01 10:26:47 -07:00
minggo cc3a9d0737 fix crash caused by std::regex() 2014-07-01 16:09:25 +08:00
minggo eb6ddea26e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash 2014-07-01 10:01:24 +08:00
Dhilan007 3eea298428 unbind the VAO anyway to for safety. 2014-06-30 21:08:43 +08:00
Dhilan007 79264daf1e fix the crash on WP8 for FastTileMapTest 2014-06-30 20:56:59 +08:00
minggo 9bcc66912a fix crash cause by std::regex 2014-06-30 20:45:01 +08:00
Dhilan007 26f3445311 add missing files for the projects 2014-06-30 17:07:55 +08:00
Huabing.Xu d506cf613a fix bug for tileset searching 2014-06-30 11:08:57 +08:00
Huabing.Xu c50394c4f3 fix merge conflitcts on windows 2014-06-29 20:30:26 +08:00
Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
 2014-06-29 20:23:43 +08:00
minggo 4f79176da2 Merge pull request #7234 from boyu0/iss5614_physics_transform 
closed #5614: add transform support for physics
 2014-06-29 17:23:20 +08:00
Huabing.Xu 9227c4f30a refactor updateTiles 2014-06-27 19:41:34 +08:00
Huabing.Xu 46e5b8e5bd refactor FastTMXTiledMap::tilesetForLayer to a more elegant implementation 2014-06-27 18:28:59 +08:00
Huabing.Xu 3771654e66 remove deprecated function 
rename enum to static const member of class
remove hex tile map(we do not support it yet)
 2014-06-27 18:00:06 +08:00
boyu0 91126341bd fix transform for physics. 2014-06-27 17:30:21 +08:00
Huabing.Xu 33a8b6563f windows works for fast tmx 2014-06-27 16:56:26 +08:00
Huabing.Xu eba84b5dea fix wrong indentions 2014-06-27 14:45:30 +08:00
Huabing.Xu 1152f77ed7 clean up fast tmx code 2014-06-27 14:42:53 +08:00
Huabing.Xu b232896f85 roll back fps compute logic 
fix crash bug
 2014-06-27 13:41:06 +08:00
Huabing.Xu 6292ed05be improvement for fast tmx rendering 2014-06-27 11:50:44 +08:00
Huabing.Xu a04b5fc5d5 use custom command for fast_tmx rendering 2014-06-27 10:30:21 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
Huabing.Xu 81aa9c2c74 use custom command for rendering 2014-06-26 20:45:08 +08:00
Huabing.Xu 87e5e1460e adjust some code to reduce indentions 2014-06-26 11:45:15 +08:00
minggo 6a3d3aa4a4 Merge pull request #7186 from billtt/v3_fixNodeSetScale 
fix a bug that Node::setScale(float) may not work properly
 2014-06-25 14:41:15 +08:00
minggo 66703addb2 fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
Huabing.Xu c1b5984ce8 using stable sort for quads 2014-06-25 11:08:47 +08:00
Huabing.Xu 290897af14 Merge branch 'v3' into fast_tmx 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-25 10:10:08 +08:00
Huabing.Xu bda9708206 clean up Fast TMX code2 2014-06-25 10:06:37 +08:00
Huabing.Xu 67f83f43b0 clean up Fast TMX code 2014-06-25 10:04:20 +08:00
minggo 7155eb4ebb use reference instead 2014-06-24 18:23:10 +08:00
minggo 3336f7edad use reference instead 2014-06-24 14:53:02 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +08:00
minggo 4bb6545250 Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics 
closed #5541: Add rotation action support for physics.
 2014-06-24 10:46:10 +08:00
boyu0 f2ecb31958 closed #5541: add more warning for unsupported functions. 2014-06-24 10:33:21 +08:00
Zhou Yuntao 50a1449af9 fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ) 2014-06-24 10:05:52 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
yangxiao 2a6dfaf91b Merge branch 'newcode' into v3 2014-06-20 22:55:27 +08:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +08:00
lvlong 478ea8949a Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	tools/cocos2d-console
 2014-06-20 16:14:46 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
 2014-06-20 16:02:22 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
Huabing.Xu f82be936b5 Merge branch 'fast_tmx_copy' into fast_tmx 
Conflicts:
	cocos/2d/CCFastTMXLayer.cpp
 2014-06-19 18:10:44 +08:00
Huabing.Xu e03c412e71 refactor fast tmx rendering 2014-06-19 18:05:21 +08:00
boyu0 5f10ff2c29 issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2 2014-06-19 15:57:13 +08:00
lvlong 8493c4579b before switch branch save 2014-06-19 15:43:02 +08:00
minggo 136033c282 not set _orderOfArrival to 0 after visit 2014-06-19 15:09:27 +08:00
minggo e60e3c217d Merge pull request #7046 from Dhilan007/v3-label-improve 
1.Support setting up the line height and additional kerning of label.
 2014-06-19 09:44:51 +08:00
boyu0 d89c2176c3 issue #4437: add vertex z support, fix some bugs. 2014-06-18 18:19:13 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +08:00
minggo 08453b911d Merge pull request #7071 from pandamicro/Script_onEnter_fix 
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
 2014-06-18 13:37:57 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
minggo 6ecca08340 Merge pull request #7039 from minggo/get-child-by-name 
issue #4693: add getName(), setName() and getChildByName()
 2014-06-18 11:30:14 +08:00
Dale Stammen da9a652868 added missing files to project 2014-06-17 09:27:36 -07:00
minggo 4da24dfade issue #4693: correct comment 2014-06-17 16:21:24 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
minggo 53963a2441 issue #4693:enumerateChildren() support regular expression 2014-06-17 11:43:03 +08:00
lvlong ae5965f05f test new version and modify vs2012 project 2014-06-17 10:52:55 +08:00
yangxiao 452fdc047a Merge branch 'newcode' into v3 2014-06-16 22:36:01 +08:00
yangxiao 927d29f334 bug on Repeat when diff bigger than duration 2014-06-16 18:21:47 +08:00
pandamicro d00c9fe70a Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary) 2014-06-16 12:50:35 +08:00
minggo 111e08062f Merge pull request #7056 from visiblelight/render_texture 
Use RGBA when saving a file from render texture
 2014-06-16 10:44:30 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
pandamicro d524ba1013 Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB 2014-06-13 17:59:23 +08:00
vision 33fb1dd050 Make the API more extendable 2014-06-13 15:27:59 +08:00
vision 7e99121af7 Change the default pixel format from RGB to RGBA for render texture when saving as PNG. 2014-06-13 13:35:18 +08:00
boyu0 ee919b673f issue #4437: config for android and linux. 2014-06-13 11:07:21 +08:00
pandamicro 7ccff325b6 Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage 2014-06-13 10:29:40 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00
boyu0 acb87f414e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx 2014-06-12 14:44:28 +08:00
Dhilan007 b2d8e4fc93 add assert. 2014-06-12 14:41:01 +08:00
boyu0 a3f32cf894 closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld. 2014-06-12 12:45:21 +08:00
Dhilan007 3511d1e87e 1.Support setting up the line height and additional kerning of label. 
2.Add more annotation
 2014-06-12 12:01:15 +08:00
minggo 5c718e27da Merge pull request #7044 from Dhilan007/v3-label-improve 
Ensuring release cache texture in timely.
 2014-06-12 11:39:36 +08:00
minggo 05a65a68bb issue #4693: added enumerateChildren() 2014-06-12 10:41:08 +08:00
lvlong 9fe7c1a9da loader 2014-06-12 10:01:54 +08:00
Dale Stammen 775832a710 added missing files 2014-06-11 13:18:10 -07:00
Dhilan007 7cc3879257 Ensuring release cache texture in timely. 2014-06-11 22:03:10 +08:00
minggo 8a5bfb9840 issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08:00
pandamicro 8bc531a0fb Fixed #5533: Fix usage of new SpriteFrame in engine 2014-06-10 12:04:20 +08:00
pandamicro 92a33225ff Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues 2014-06-10 11:39:48 +08:00
pandamicro bb7cf801e6 Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected 2014-06-10 11:28:34 +08:00
minggo 0ca9a98f4a Merge pull request #6920 from minggo/orrderOfArrival 
don't have to set _orderOfArrival to 0 after visit
 2014-06-10 10:28:38 +08:00
minggo 9517f9b852 Merge pull request #6996 from newnon/v3_setparent_fix 
move node from one parent to another fix
 2014-06-09 17:13:59 +08:00