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

2430 Commits

Author SHA1 Message Date
minggo e800b3d9ba Merge pull request #9501 from joewan/v3-fix-mismatch 
V3 fix uninitialized members.
 2014-12-16 18:28:36 +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 8df8ee36db print more info 2014-12-04 19:18:54 +08:00
pipu 6d764bc2c8 Merge branch 'v3' into v3_flatbuffers 
Conflicts:
	tools/cocos2d-console
 2014-12-03 15:47:03 +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
Ricardo Quesada 71fec06a11 fixes indentation 2014-11-17 18:11:17 -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