Commit Graph

5247 Commits

Author SHA1 Message Date
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
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
minggo c5851f988b fix conflict 2014-08-08 14:04:38 +08:00
minggo 29888b9d74 Merge pull request #7705 from zii/patch-1
让replaceScene更安全
2014-08-08 12:03:48 +08:00
minggo 3ccce066b0 Merge pull request #7712 from andyque/testLoadingBar
fixed loadingBar change direction affect position issue
2014-08-08 11:57:28 +08:00
yangxiao 911144b720 wrong parameter for visit 2014-08-08 11:52:40 +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 2a7e3dced8 Merge pull request #7711 from CocosRobot/update_lua_bindings_1407466030
[AUTO]: updating luabinding automatically
2014-08-08 11:49:14 +08:00
minggo b9e84370f6 Merge pull request #7699 from huangshiwu/v3_wp8fix
V3 wp8fix
2014-08-08 11:49:02 +08:00
andyque d00e3349a3 fixed loadingBar change direction affect position issue 2014-08-08 11:17:17 +08:00
CocosRobot aa68a63757 [AUTO]: updating luabinding automatically 2014-08-08 02:49:17 +00:00
huangshiwu 6ce16546b5 winrt compile fix -addtional 2014-08-08 10:47:14 +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
samuele3hu 201b33b465 Set intermediate directory for related lua bindings projects on win32 platform 2014-08-08 09:40:13 +08:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
zii 212e059917 让replaceScene更安全
如果可以这样的话 就不用担心用runWithScene还是replaceScene了. 可以省略getRunningScene判断.
2014-08-07 18:34:21 +08:00
yangxiao 1e15131b2b simplify code 2014-08-07 16:24:44 +08:00
samuele3hu 53eb0345a5 Remove useless library for cocos2d_lua_bindings 2014-08-07 16:15:42 +08:00
yangxiao 34f6368ff7 change function to const 2014-08-07 15:57:15 +08:00
yangxiao 579ae882e3 add to cocos2d.h 2014-08-07 15:33:23 +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
samuele3hu 3c31af4523 Update CMakeLists.txt for storage 2014-08-07 15:07:29 +08:00
huangshiwu b7aa046cd2 wp8 compile fix -additional 2014-08-07 14:09:22 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +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 1ece703945 Merge pull request #7694 from CocosRobot/update_lua_bindings_1407379142
[AUTO]: updating luabinding automatically
2014-08-07 10:56:04 +08:00
minggo a7d5b7af56 Merge pull request #7691 from Dhilan007/v3
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:52:59 +08:00
CocosRobot 91b297b085 [AUTO]: updating luabinding automatically 2014-08-07 02:40:46 +00: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
Dhilan007 9da4ba14f5 fixed can's set outline color for system font correctly on IOS. 2014-08-07 10:04:29 +08:00
martell b71e0cde3a Fix libaudio.a outpur directory 2014-08-06 15:45:27 +01:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
CocosRobot f47d11cce0 [AUTO]: updating luabinding automatically 2014-08-06 09:14:13 +00:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module
Split luabindings into serval modules and adjust project settings of test cases
2014-08-06 17:09:12 +08:00
samuele3hu 497847f7e8 Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files. 2014-08-06 14:46:30 +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
minggo 187dc29f6d Merge pull request #7679 from andyque/fixComponentContainerRemoveIssue
add safe guard when remove component from node componentContainer
2014-08-06 14:21:49 +08:00
samuele3hu 9912b596f8 Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake 2014-08-06 13:51:46 +08:00
andyque e2e8325f58 add safe guard when remove component from node componentContainer 2014-08-06 13:51:16 +08:00
Kenichi Hamada 771996f9f3 Added a function getAssetManager() on CCFileUtilsAndroid 2014-08-06 13:36:04 +09: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
samuele3hu 63b3f838b6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 09:56:07 +08:00
minggo e43b05955f Merge pull request #7674 from darkdukey/patch-12
Fix opacity for Slider
2014-08-06 09:50:47 +08:00