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
zhukaixy
52280e6376
add 3d test case(skybox and texture cube) for lua project
2015-03-20 17:53:05 +08:00
tangziwen
814490ab44
add 3D doc, fixed typo
2015-03-20 17:20:22 +08:00
samuele3hu
865aa886a9
Update comments of some header files
2015-03-20 14:39:33 +08:00
minggo
7c4f8b238d
Merge pull request #11014 from pipu/InnerActionSpeed_flatbuffer_data
...
Create flat buffer format data for "InnerActionSpeed".
2015-03-20 13:39:09 +08:00
CocosRobot
7ea110134c
[AUTO]: updating luabinding automatically
2015-03-20 04:53:00 +00:00
Huabing.Xu
abaa8dba77
update comments
2015-03-20 11:24:52 +08:00
pipu
8791e36d3f
Create flat buffer format data for "InnerActionSpeed".
2015-03-20 11:10:22 +08:00
minggo
f3398eafbf
Merge pull request #11008 from andyque/change-jenkins-to-use-msbuild
...
use msbuild in windows slaves
2015-03-20 10:38:50 +08:00
andyque
a29a298ec3
fix wrong comment
2015-03-20 09:49:34 +08:00
Huabing.Xu
d075a2bf86
Merge pull request #11009 from dabingnn/v3_comments
...
[ci skip] update comments in renderer folder
2015-03-20 09:47:30 +08:00
Huabing.Xu
055b71569a
[ci skip] update comments in renderer folder
2015-03-20 09:46:08 +08:00
minggo
a5eca355fd
Merge pull request #11005 from CocosRobot/update_lua_bindings_1426774505
...
[AUTO]: updating luabinding automatically
2015-03-20 09:28:57 +08:00
CocosRobot
7da412a4e1
[AUTO]: updating luabinding automatically
2015-03-19 14:17:17 +00:00
minggo
78ff70a8f6
Merge pull request #10972 from pipu/fix_armaturenode_load
...
Avoid crash during parse armature node.
2015-03-19 22:10:34 +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
f4e2469730
update document for CCValue.h
2015-03-19 21:52:56 +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
dingpinglv
41822ef131
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
2015-03-19 21:27:52 +08:00
dingpinglv
3413c716df
Issue: Added js annotates to CCScheduler.h
2015-03-19 21:25:09 +08:00
minggo
8e32933dd3
Merge pull request #10340 from seobyeongky/network_bugfix2
...
receive content data even though status code is not 2xx
2015-03-19 21:12:51 +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
minggo
35078b70da
Merge pull request #10997 from CocosRobot/update_lua_bindings_1426768076
...
[AUTO]: updating luabinding automatically
2015-03-19 20:44:33 +08:00
CocosRobot
21e46efb00
[AUTO]: updating luabinding automatically
2015-03-19 12:30:15 +00: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
dingpinglv
baa723a899
Issue : Added js annotates to CCController.h
2015-03-19 20:26:44 +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
dingpinglv
1b179c2b02
Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h
2015-03-19 20:20:16 +08:00
minggo
0b19781d8c
Merge pull request #10989 from pipu/serialize_InnerActionSpeed
...
Serialize attribute "InnerActionSpeed" during create from .csd file.
2015-03-19 20:11:34 +08:00
minggo
1539b5de78
Merge pull request #10991 from VisualSJ/v3-docs
...
Add javascript notes...
2015-03-19 20:09:41 +08:00
minggo
8075cc1602
Merge pull request #10986 from samuele3hu/v3_5_comment
...
[ci skip]Update comments of some header files
2015-03-19 20:01:43 +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
minggo
5601eed02f
Merge pull request #10987 from samuele3hu/v3_5_f_bug
...
issue #10875 : fix a lua bindings bug for GLProgram::setUniformLocationF32
2015-03-19 19:59:28 +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
calfjohn
97048c8fdc
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-03-19 18:00:08 +08:00
calfjohn
c2cded367c
add document for physics
2015-03-19 17:58:08 +08:00
pipu
e9b6ca724d
Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator.
2015-03-19 17:54:26 +08:00
samuele3hu
5a5acc624a
issue #10875 : fix a lua bindings bug for GLProgram::setUniformLocationF32
2015-03-19 17:31:57 +08:00
samuele3hu
1eb1057875
Update comments of some header files
2015-03-19 16:59:21 +08:00
samuele3hu
31b34ddf77
Update comments of some header files
2015-03-19 16:45:53 +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
CocosRobot
0afd385412
[AUTO]: updating luabinding automatically
2015-03-19 08:29:09 +00:00
Vladimir Perminov
133be7e57f
Clean possible GL error
...
CHECK_GL_ERROR_DEBUG work debug only.
Clean need for correct check glTexImage2D and glCompressedTexImage2D
Release now work: If gl error before any code, initWithMipmaps return
false always
2015-03-19 11:10:49 +03:00
zhangbin
f196d213ee
Solve the error format of comments in header files.
2015-03-19 15:59:58 +08:00
zhukaixy
0587122ccc
Move Skybox.shader from Sprite3DTest to Shader3D folder
2015-03-19 15:11:24 +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
a8d29b6122
Merge pull request #10970 from CocosRobot/update_lua_bindings_1426737203
...
[AUTO]: updating luabinding automatically
2015-03-19 11:56:41 +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
CocosRobot
f2c49b3311
[AUTO]: updating luabinding automatically
2015-03-19 03:55:42 +00:00
minggo
194510dacc
Merge pull request #10969 from pipu/parse_csd_position
...
Fix that parse position from .csd file.
2015-03-19 11:53:31 +08:00
minggo
b3d9b72f27
Merge pull request #10944 from pipu/manage_actiontimelinedata_reference
...
Manage reference count of ActiontimelineData object.
2015-03-19 11:53:07 +08:00
minggo
aec86d7e61
Merge pull request #10967 from VisualSJ/v3-docs
...
Add javascript notes...
2015-03-19 11:52:44 +08:00
pipu
c1f147b7a1
Avoid crash during parse armature node.
2015-03-19 11:51:34 +08:00
minggo
74de66a286
Merge pull request #10964 from CocosRobot/update_lua_bindings_1426687157
...
[AUTO]: updating luabinding automatically
2015-03-19 11:49:54 +08:00
pipu
46741e1035
Fix that parse position from .csd file.
2015-03-19 11:22:11 +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
CocosRobot
b7881eab88
[AUTO]: updating luabinding automatically
2015-03-18 14:02:42 +00: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
8306aaaab2
Merge pull request #10955 from dabingnn/v3_comments
...
[ci skip] update comments CCRenderCommand.h
2015-03-18 21:48:47 +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
minggo
a9f13148f4
Merge pull request #10961 from minggo/add-documentation
...
[ci skip]update document for ccUtils.h
2015-03-18 21:46:20 +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
minggo
7f825d3dae
update document for ccUtils.h
2015-03-18 21:45:00 +08:00
VisualSJ
3576df4b89
Add javascript notes...
...
cocos/base/CCDirector.h
2015-03-18 21:39:50 +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
minggo
bf0d48e483
Merge pull request #10957 from natural-law/v3
...
[ci skip] Update comments of some header files.
2015-03-18 21:33:13 +08:00
minggo
0267faa7d1
Merge pull request #10958 from minggo/add-documentation
...
[ci skip]update document for CCUserDefault.h
2015-03-18 21:27:13 +08:00
minggo
85811bd710
update document for CCUserDefault.h
2015-03-18 21:24:31 +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
minggo
660cfdf964
Merge pull request #10954 from minggo/add-documentation
...
[ci skip]Add documentation
2015-03-18 20:43:33 +08:00
Jacky
2d50327323
update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache
2015-03-18 20:40:29 +08:00
minggo
19fc6a1495
update document for CCScheduler.h
2015-03-18 20:37:43 +08:00
minggo
10703bce66
Merge pull request #10952 from SuYaoHui/cocosapi
...
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
2015-03-18 20:33:00 +08:00
Huabing.Xu
0c8218581f
[ci skip] update comments CCRenderCommand.h
2015-03-18 20:30:52 +08:00
SuYaohui
31944da08c
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
2015-03-18 20:26:16 +08:00
Huabing.Xu
431b3593a7
[ci skip] update comments CCQuadCommand.h
2015-03-18 20:12:34 +08:00
calfjohn
e67a57512f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-03-18 20:10:16 +08:00
SuYaohui
ee8776f041
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
2015-03-18 20:07:00 +08:00
Huabing.Xu
a87c5755e9
[ci skip] update comments CCTrianglesCommand.h
2015-03-18 19:52:08 +08:00
Huabing.Xu
4ae4500a68
[ci skip]adjust comments
2015-03-18 19:32:10 +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
Huabing.Xu
fb1d9899c7
[ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h
2015-03-18 17:40:10 +08:00
Huabing.Xu
a71fb9f946
[ci skip]update comments CCVertexIndexBuffer.h
2015-03-18 17:18:25 +08:00
pipu
e7c89dadf1
Manage reference count of ActiontimelineData object in ObjectExtensionData.
2015-03-18 16:56:16 +08:00
calfjohn
83e69f4532
add comments for PhysicsWorld
2015-03-18 16:35:38 +08:00
minggo
0408fc0667
update document for CCRef.h
2015-03-18 15:02:03 +08:00
Huabing.Xu
eb2786f40d
[ci skip]update comments CCVertexIndexData.h
2015-03-18 14:43:44 +08:00
minggo
aa5f257243
Merge pull request #10938 from minggo/add-documentation
...
[ci skip]Add documentation
2015-03-18 14:11:30 +08:00
minggo
723244f62d
Merge pull request #10932 from lyubomirv/v3-bulgarian
...
Added Bulgarian language.
2015-03-18 14:01:26 +08:00
minggo
5271c75c11
Merge pull request #10936 from super626/v3
...
Camera mask for label
2015-03-18 14:00:44 +08:00
minggo
eeebe97547
Merge pull request #10937 from CocosRobot/update_lua_bindings_1426657990
...
[AUTO]: updating luabinding automatically
2015-03-18 13:57:08 +08:00
CocosRobot
611ec0a4a5
[AUTO]: updating luabinding automatically
2015-03-18 05:55:07 +00:00
Huabing.Xu
edf785cec3
[ci skip]update version
2015-03-18 13:52:52 +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
pipu
faf9d6b01c
Avoid crash during parse .csd file.
2015-03-18 10:28:12 +08:00
minggo
be2af44583
update document for CCDirector.h
2015-03-17 22:32:26 +08:00
lyubomirv
2aec39ad56
Added Bulgarian language.
2015-03-17 15:14:02 +02:00
minggo
44c04153a6
update document for CCDataVisitor.h
2015-03-17 20:54:47 +08:00
minggo
36bf7c6d39
update document for CCAutoreleaseData.h
2015-03-17 20:49:00 +08:00
minggo
5b55e873d0
update document for CCAutoreleasePool.h
2015-03-17 20:15:50 +08:00
minggo
1e271a9d96
Merge pull request #10899 from super626/v3
...
Bug fix
2015-03-17 19:29:21 +08:00
songchengjiang
73caf536da
fix the bug of lighting shader
2015-03-17 16:43:08 +08:00
lvlong
3ce0449c97
decompose
2015-03-17 15:17:23 +08:00
CocosRobot
9df3f57e0d
[AUTO]: updating luabinding automatically
2015-03-17 06:28:14 +00:00
minggo
aa573a9553
Merge pull request #10904 from pipu/fixed_widget_reader_actiontag
...
Optimize parse action tag for node and widget.
2015-03-17 14:18:22 +08:00
minggo
f51e2b9537
Merge pull request #10912 from perminovVS/v3-dev-console
...
Create Console before any sub systems
2015-03-17 14:17:35 +08:00
lvlong
733a89100e
remove old code!
2015-03-17 13:13:03 +08:00
lvlong
080132d072
modify sub node transform!
2015-03-17 12:15:03 +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
minggo
f7d5a16734
Merge pull request #10873 from konopka/fix_compiler_override_warnings
...
Fix compiler override warnings
2015-03-17 10:38:19 +08:00
Vladimir Perminov
e745d5949a
Create Console before any sub systems
...
Sub system use cocos2d::log in constructors.
2015-03-16 20:22:20 +03:00
Petr Babička
fa245c44b9
Spaces instead of tabs
2015-03-16 17:22:17 +01:00
Alok Sahay
80576b5903
Don't set scale and loadHTMLString on nil.
2015-03-16 17:00:01 +01:00
konopka
0387b13bb6
Adding missing virtual keywords
2015-03-16 16:39:43 +01:00
konopka
7fb79272ca
Undo changes that are not allowed by spine license
2015-03-16 16:35:41 +01:00
Dale Stammen
e2a5eb2f9f
updated to Angle ddbf057c52
2015-03-16 08:18:26 -07:00
Dale Stammen
08ceae3de2
removed no-gl_PointSize shaders for Windows Phone 8.1
2015-03-16 08:08:02 -07:00
pipu
a5e9ebc4e6
Fix parse action tag for widget.
2015-03-16 20:04:59 +08:00
yangxiao
8b3e116ed6
check running scene
2015-03-16 18:04:50 +08:00
Dale Stammen
ef5e6fc473
fixed use of Color4B
2015-03-16 02:17:05 -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
CocosRobot
a3ddd92307
[AUTO]: updating luabinding automatically
2015-03-16 07:11:12 +00:00
minggo
f25be54e95
Merge pull request #10671 from kpkhxlgy0/v3
...
enable setWritablePath on platform win32 and mac
2015-03-16 14:57:26 +08:00
minggo
d0753674b2
Merge pull request #10514 from cpascal/uiEditBox_Win32
...
Fixed missing ui::EditBox functionalities on Win32
2015-03-16 14:56:49 +08:00
minggo
23dbbf6d99
Merge pull request #10887 from CocosRobot/update_lua_bindings_1426488653
...
[AUTO]: updating luabinding automatically
2015-03-16 14:54:26 +08:00
CocosRobot
7a4e727ee2
[AUTO]: updating luabinding automatically
2015-03-16 06:53:18 +00:00
minggo
1916bc1f1f
Merge pull request #10693 from Mazyod/editbox-text-alpha-support
...
Support Color4B for editbox text
2015-03-16 14:52:36 +08:00
minggo
2ea88a30bb
Merge pull request #10817 from garfieldkwong/fix_autorelease_branch
...
fix issue autorelease will not release trigger by autorelease.
2015-03-16 14:47:30 +08:00
minggo
ebe5dff7a6
Merge pull request #10737 from newnon/v3_scale9_blend_func
...
blending function for Scale9Sprite
2015-03-16 14:45:08 +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
Nite Luo
cfa1f0c84f
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
...
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
2015-03-13 21:12:35 -07:00
Nite Luo
3194da4e7d
Merge pull request #10720 from darkdukey/hide_cursor
...
Hide cursor
2015-03-13 10:48:15 -07:00
SunLightJuly
6871e30b8d
define __G__TRACKBACK__ in cocos.init
2015-03-13 16:39:36 +08:00
CocosRobot
2f0eb6712d
[AUTO]: updating luabinding automatically
2015-03-13 07:15:34 +00:00
Huabing.Xu
639ed335b3
Merge pull request #10839 from pipu/node_load_callback
...
To add the function node load callback called during create node from csb file.
2015-03-13 15:06:14 +08: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
CocosRobot
fa2fe74986
[AUTO]: updating luabinding automatically
2015-03-13 06:19:29 +00:00
Huabing.Xu
1fa9145a56
Merge pull request #10832 from super626/v3
...
fix bugs
2015-03-13 14:13:24 +08:00
Huabing.Xu
c3aea9f6c0
update version string and releaseNotes for 3.5
2015-03-13 11:51:32 +08:00
Martin Konopka
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
pipu
56c3d1c6f6
To add the function node load callback called during create node from csb file.
2015-03-12 17:36:39 +08:00
pipu
7515fc78f5
To set csd version for serializing.
2015-03-12 16:15:17 +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
byeonggee.seo
a2274162b5
merged
2015-03-12 10:06:53 +09: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
GarfieldKwong
656842d6f1
fix issue autorelease will not release trigger by autorelease.
2015-03-11 15:31:06 +08:00
minggo
d2be2290a3
Merge pull request #10796 from Mazyod/http-client-mac
...
Http client mac
2015-03-11 14:26:08 +08:00
CocosRobot
e079216248
[AUTO]: updating luabinding automatically
2015-03-11 02:45:36 +00:00
minggo
04393854e8
Merge pull request #10789 from fusijie/fix-moveto-reverse
...
disable MoveTo::reverse()
2015-03-11 10:39:45 +08:00
minggo
c4ac2b5f47
Merge pull request #10795 from pipu/optimize_ButtonReader
...
To optimize ButtonReader for source path and source.
2015-03-11 10:05:48 +08:00
minggo
c701f89329
Merge pull request #10683 from Mazyod/mac-editbox-fix
...
Fix editbox on Mac
2015-03-11 10:00:50 +08:00
pipu
90da84a663
To modify that check whether or not string is not empty.
2015-03-11 09:59:07 +08:00
Jacky
605ce58293
disable MoveTo::reverse()
2015-03-11 09:55:32 +08:00
Mazyad Alabduljaleel
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
minggo
858178ad8e
Merge pull request #10772 from super626/v3
...
refactor init method
2015-03-10 17:50:06 +08:00
pipu
00bf9f5bfb
To optimize the situation that source path is existed, but source is not existed.
2015-03-10 17:48:48 +08:00
minggo
afb06b5c42
Merge pull request #10770 from m2q1n9/patch-1
...
fix cocostudio anchor point bug
2015-03-10 13:40:44 +08:00
minggo
8e6d9d5dd2
Merge pull request #10740 from newnon/v3_windows_network_path
...
Windows network path fix
2015-03-10 11:25:53 +08:00
minggo
f3567ba1af
Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha
...
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-10 11:19:29 +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
minggo
a4698eaaaf
Merge pull request #10781 from mogemimi/add-const-to-member-function
...
Add const to Value::getDescription() function
2015-03-10 09:49:56 +08:00
yangxiao
5131a23de4
solve conflict
2015-03-10 09:18:13 +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
mogemimi
de4105516a
Add const to Value::getDescription() function
2015-03-09 22:34:24 +09:00
Jongryul Kook
0d65dd13be
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-09 21:20:17 +09: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
yangxiao
45bd6180ad
fix create bundle using empty path
2015-03-09 17:09:18 +08:00
yangxiao
ff3eba6143
refact init
2015-03-09 16:29:57 +08:00
m2q1n9
c97742072f
fix cocostudio anchor point bug
...
fix a bug which will cause anchor point config not work
2015-03-09 14:30:41 +08:00
Dale Stammen
a9479a1585
updated WP8 precompiled shaders
2015-03-08 21:42:27 -07: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
minggo
badfa5501d
Merge pull request #10723 from pipu/reconstruct_parse_callbackbind
...
To reconstruct callback binding for nest node
2015-03-09 10:55:47 +08:00
pipu
c21538e6e2
Merge branch 'v3' into reconstruct_parse_callbackbind
2015-03-09 10:38:02 +08:00
CocosRobot
1f78b18d22
[AUTO]: updating luabinding automatically
2015-03-09 02:27:14 +00:00
pipu
1fa9b2577a
Merge branch 'v3' into reconstruct_parse_callbackbind
2015-03-09 10:16:14 +08:00
Mazyad Alabduljaleel
ce377c4a1e
Fix compilation issues on Android and Win
2015-03-06 16:05:05 +04: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
minggo
2238cb0dbb
Merge pull request #10546 from krishnanm86/knarasimhan_sourcerefactor_jni_audio
...
Sourcr Refactor. Abstracted common functionality from two jni methods an...
2015-03-06 16:14:59 +08:00
minggo
15853a435e
Merge pull request #10738 from newnon/v3_mingw_build_fix
...
MinGW build fix
2015-03-06 15:49:13 +08:00
minggo
65926a9f0b
Merge pull request #10734 from pipu/projectnode_animation_innerspeed
...
Serialize and parse attribute "innerspeed" for ProjectNode.
2015-03-06 15:43:57 +08:00
songchengjiang
4ca90341b9
support win8.1
2015-03-06 15:35:02 +08:00
minggo
c96f3b135a
Merge pull request #10733 from pipu/modify_layout_attribute_name
...
To modify layout attribute name that are used in serialized and parsed.
2015-03-06 15:00:33 +08:00
yangxiao
457ac3fdd7
reset unproject with viewport cocostudio using it
2015-03-06 11:29:40 +08:00
yangxiao
d7c1d6b6aa
add billboard to transparent queue
2015-03-06 09:57:48 +08:00
andyque
e93f39fae1
fix typo
2015-03-05 17:05:08 +08:00
andyque
a229793e31
fix Linux glfw linker error on v3
2015-03-05 16:34:51 +08:00
Sergey
8270355ad6
blending function for Scale9Sprite
2015-03-05 11:13:51 +03:00
Sergey
de284c98ce
MinGW build fix
2015-03-05 11:11:13 +03:00
Sergey Perepelitsa
215fe8a0c9
Windows network path fix
2015-03-05 11:10:03 +03:00
pipu
fadac31868
Serialize and parse attribute "inner speed" for ProjectNode.
2015-03-05 15:48:17 +08:00
songchengjiang
444dbfdf9e
replace .mesh with .c3b
...
modify ParticleUniverse file structure
2015-03-05 14:54:32 +08:00
pipu
be1b0b7239
To modify layout attribute name that are used in serialized and parsed.
2015-03-05 14:34:35 +08:00
yangxiao
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
Jacky
c38c4a1373
fixed source coding error.
2015-03-04 18:15:05 +08:00
Krishna
35403439f3
Fixed compilation issue. Introduced missing CLASS_NAME
2015-03-04 10:48:30 +01:00
Krishna
ec3a8d49f9
Fixed compilation error.
2015-03-04 10:43:31 +01:00
pipu
010a077fa8
To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader.
2015-03-04 17:29:40 +08:00
yangxiao
ea7dfe1147
lua test
2015-03-04 10:42:08 +08:00
yangxiao
68eaadaffb
merge cocos
2015-03-04 09:57:42 +08:00
Dale Stammen
e93fe1b13b
Merge branch 'v3' into v3-wp8-fix
2015-03-03 08:40:07 -08:00
CocosRobot
93c2b48779
[AUTO]: updating luabinding automatically
2015-03-03 15:15:43 +00:00
minggo
13e4525772
Merge pull request #10659 from super626/v3
...
Remove expolosion particle
2015-03-03 23:03:02 +08:00
cpascal
db9985d7cd
Added new line with the left curl bracket.
2015-03-03 20:39:25 +09:00
yangxiao
3db3d9ae11
merge cocos
2015-03-03 17:23:33 +08:00
byeonggee.seo
b3335f34ae
Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2
2015-03-03 16:33:48 +09:00
byeonggee.seo
3811c9f1a3
connError added
2015-03-03 16:33:35 +09:00
Nite Luo
49912c2f62
clean up the formatting
2015-03-02 23:29:15 -08:00
Chad
395c14f07d
Hide Cursor - Feature Request #8766
...
Added the ability to hide or show the cursor on desktop builds.
2015-03-02 23:21:18 -08:00
tangziwen
840b531a9a
update
2015-03-03 14:14:50 +08:00
cpascal
a6ee1451f4
changed one more indentation.
...
I made mistake, (now replacing the spaces to tab)
2015-03-03 13:44:43 +09:00
cpascal
4058e16f16
Added line break & removed function call in compare operator.
2015-03-03 13:40:40 +09:00
yangxiao
38636dc8b7
allow transition time to 0
2015-03-03 11:04:34 +08:00
yangxiao
874f7c7f99
fix transparent render bug
2015-03-03 10:42:47 +08:00
Dale Stammen
44b951a51a
Merge branch 'v3' into v3-wp8-fix
2015-03-02 16:42:05 -08:00
Mazyad Alabduljaleel
9d5fdcb973
Support Color4B for editbox text
2015-03-02 15:31:59 +04:00
songchengjiang
5c460ebb2d
add/update particle files
2015-03-02 13:07:32 +08:00
Mazyad Alabduljaleel
4387844176
Fix editbox on Mac
2015-03-01 23:56:18 +04:00
kpkhxlgy0
99dea9395d
enable setWritablePath on platform win32 and mac
2015-02-28 18:21:57 +08:00
yangxiao
56f3f34ee3
add Animate3D::setTransitionTime
2015-02-28 17:40:25 +08:00
CocosRobot
84fb4094fc
[AUTO]: updating luabinding automatically
2015-02-28 03:23:08 +00: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
fd11984e0a
disable LTCG
2015-02-27 11:21:36 -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
seobyeongky
91b0104fd0
Fix an issue with iOS HTTP Request code ( https://github.com/cocos2d/cocos2d-x/pull/10543 )
2015-02-27 21:31:33 +09:00
Wenhai Lin
5af895b24d
Fixed the position of physics body is wrong when the position of parent node has been change.
2015-02-27 17:55:25 +08:00
minggo
7805adce94
Merge pull request #10325 from seobyeongky/httpclient_bugfix
...
HttpResponse reference counting bug fixed
2015-02-27 14:32:41 +08:00
CocosRobot
8a310c09c0
[AUTO]: updating luabinding automatically
2015-02-27 03:54:42 +00:00
yangxiao
dd070e177e
modify unproject
2015-02-27 10:20:32 +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
minggo
e69e648d7c
Merge pull request #10483 from redism/ios-network-header-fix
...
apply custom request header for every request type (ios)
2015-02-26 16:40:12 +08:00
minggo
e37bbee1c2
Merge pull request #10545 from Mazyod/ios-http-request-leaks
...
Fix major memory leaks in iOS http request
2015-02-26 15:41:10 +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
Krishna
58df860b4e
Made the loadeffect utility method into a static method. Removed declaration of old method from header file
2015-02-26 06:53:20 +01:00
Nite Luo
dbba9e36a1
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
...
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
minggo
366a938a86
Merge pull request #10603 from sun-ray/v3
...
CocosStudio 3DReader
2015-02-26 11:01:28 +08:00
minggo
5d8071bdcf
Merge pull request #10597 from loadrunner/v3
...
added Romanian language
2015-02-26 10:51:46 +08:00
Ray
bfb5c1ca23
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-02-26 10:44:20 +08:00
minggo
39d2f0629c
[ci skip] update version
2015-02-26 10:40:30 +08:00
minggo
e6ce627632
[ci skip]update version
2015-02-26 10:39:37 +08:00
minggo
31e8d0dccd
Merge pull request #10521 from ryule/fix_httpclient-ios
...
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-26 10:32:20 +08:00
Ray
1a2aa8633f
fix w8 project
2015-02-26 10:27:12 +08:00
Ray
a2dc8b85c4
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-02-26 09:20:16 +08:00
Ray
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
Dale Stammen
38d513648a
added missing UserCameraReader files to Universal App project
2015-02-25 08:33:19 -08:00
loadrunner
9e310ba272
added Romanian language
2015-02-25 17:25:19 +02:00
minggo
524c723daa
Merge pull request #10587 from sun-ray/v3
...
CocosStudio 3DReader
2015-02-25 20:19:06 +08:00
Krishna
3b54af1763
Introduced missing function declarators
2015-02-25 10:26:59 +01:00
pandamicro
9bf22a51ea
Fix ListView::setDirection issue
2015-02-25 16:17:43 +08:00
Mazyad Alabduljaleel
23093b9c53
Just a few more leak fixes
2015-02-25 10:56:25 +04:00
Mazyad Alabduljaleel
c80312bea6
Two more memory leaks
2015-02-25 10:52:15 +04:00
Mazyad Alabduljaleel
3e60e0ddf6
For some reason, this is causing a conflict
2015-02-25 10:44:00 +04:00
Ray
2f4fbbf4e8
fix the define problem
2015-02-25 14:28:39 +08:00
Ray
94523b667a
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-02-25 14:19:37 +08:00
Ray
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
lvlong
ac5d34b93d
recover bundle3d
2015-02-25 10:56:01 +08:00
lvlong
2d89ee34ef
recover bundle3d
2015-02-25 10:54:49 +08:00
lvlong
7437bfad15
recover bundle3D.
2015-02-25 10:33:16 +08:00
minggo
c2479adc59
Merge pull request #10549 from mogemimi/fix-typo
...
Fix typo in Image::Format
2015-02-25 09:32:58 +08:00
Dale Stammen
b39b078593
fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms
2015-02-24 14:39:21 -08:00
minggo
0d2566c202
Merge pull request #10520 from mannewalis/v3
...
adding CC_DEPRECATE(version) macro
2015-02-24 09:30:21 +08:00
mogemimi
d384f7ce1e
Fix typo: unkown -> unknown
2015-02-24 02:39:50 +09:00
mogemimi
9e7ce0cd85
Fix typo in Image::Format
2015-02-24 02:36:20 +09:00
Krishna Narasimhan
80ea81884b
Source refactor. Corrected compile issue
2015-02-23 13:01:19 +01:00
Krishna Narasimhan
239a5f307f
Sourcr Refactor. Abstracted common functionality from two jni methods and saved space/resources
2015-02-23 10:20:12 +01:00
Ray
c5cc1ebaa2
fix test project
2015-02-23 16:35:46 +08:00
Mazyad Alabduljaleel
839f1a851d
One more memory leak fix:
...
When you get the allHeaderFields, the net retain count is 0, because it is autoreleased.
Then, a copy message is issued +1
After that the property itself retains it +1
Total = 2, released once in the dealloc -> leak.
2015-02-23 11:52:49 +04:00
Mazyad Alabduljaleel
a2f9956d00
Fix major memory leaks in iOS http request
...
... and other small fixes
Brief:
1. In iOS, whenever you have a new spawned thread with its own run loop (i.e. while true), you must wrap it with an autorelease pool, so it cleans up the objects at the end of each loop cycle.
2. There were a few "alloc" and "new" objects that weren't released.
3. The HttpAsync class itself was missing dealloc, also property assignment should use `self.property` so the previous value gets released as appropriate.
4. Resolved a small warning
**NOTE**: I have a cocos2d-x game that heavily relies on the HTTP requests, with cookies, but without SSL, so I couldn't test the SSL.
I haven't tested the cookies and SSL yet, but for starters, these improvements are meant to fix the memory issues only, not the logic.
2015-02-23 10:38:33 +04:00
cpascal
8d9da362e5
changed indentation.
2015-02-23 11:55:27 +09:00
Ray
fbe9e5b767
complate project file
2015-02-23 00:52:50 +08:00
Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
Ray
8eb201797d
工程文件修改
2015-02-19 17:52:50 +08:00
Ray
73e40f1c4b
Node3DReader Test
2015-02-19 16:18:54 +08:00
Ray
2f01deee89
3D Editor Reader
...
Node3DReader
2015-02-19 12:08:09 +08:00
Jongryul Kook
c05dd4357d
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-18 16:51:12 +09:00
mannewalis
21dbc29ad1
adding CC_DEPRECATE(version) macro
2015-02-17 13:01:53 -08:00
Dale Stammen
0801160a37
added precompiled Particle3D shaders
2015-02-16 11:28:24 -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
cpascal
e7a39287f1
Fixed missing ui::EditBox functionalities on Win32
...
1. There was 100-byte input limit at ui::EditBoxImplWin::openKeyboard()
2. Implemented MaxLength as LengthFilter, not ByteFilter. (same as
Android's InputFilter - LengthFilter)
3. Users can input unicode characters that is not supported by CP_ACP.
2015-02-16 18:21:26 +09:00
CocosRobot
6a91450f7c
[AUTO]: updating luabinding automatically
2015-02-15 11:53:55 +00:00
minggo
c8eaa4aeba
Merge pull request #10447 from super626/particle_merge
...
add 3d particle (Particle Universe)
2015-02-15 19:48:18 +08:00
minggo
d5e82521de
Merge pull request #10359 from flamefox/3dattachnode
...
getAttachNode should failed when there is no bone with name
2015-02-15 19:03:52 +08:00
minggo
dd7d8a61ef
Merge pull request #8980 from fspadoni/v3
...
CCPhysicsWorld.cpp Remove cpArbiterIgnore call from collisionPreSolveCallback
2015-02-15 18:58:17 +08:00
samuele3hu
3a7cbe9d67
Add Particle3DTest for Lua and update related configure files
2015-02-15 15:56:20 +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
yangxiao
d4ace2a08c
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-02-13 09:49:07 +08:00
yangxiao
2789ad1393
remove unused code
2015-02-13 09:48:27 +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
Jeff Oh
e33854f3eb
apply custom request header for every request type (ios)
2015-02-12 20:07:19 +09:00
CocosRobot
a643691795
[AUTO]: updating luabinding automatically
2015-02-12 10:47:08 +00: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
minggo
3a4e9ced46
Merge pull request #10442 from Dhilan007/v3-accelerometer-fix
...
Fixed Accelerometer has lagged on iOS
2015-02-12 17:20:07 +08:00
yangxiao
58bfae2e57
adjust and remove unused code
2015-02-12 16:58:34 +08:00
minggo
f44ea6468e
Merge pull request #10461 from ntotani/fix-lua-framework-v3
...
fix SpriteEx
2015-02-12 16:17:46 +08:00
yangxiao
8f290b2d24
modify according to minggo
2015-02-12 16:09:08 +08:00
minggo
9d6f399584
Merge pull request #10467 from minggo/audio-issue
...
audio resume issue
2015-02-12 15:39:48 +08:00
Wenhai Lin
eb7a7a9fb7
Fixed audio can't resume after the interruption of audio session has ended on iOS.
2015-02-12 15:38:44 +08:00
sawada_yasuharu
cf8a7cd6da
Changed the option to be passed to calculate bounding rect size for
...
strings.
As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
2015-02-12 15:30:46 +08:00
Naoyuki Totani
2b43c12b88
fix SpriteEx
2015-02-12 15:16:48 +09: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
WenhaiLin
20ad425407
Fixed Accelerometer has lagged on iOS
2015-02-11 16:28:43 +08:00
lvlong
6304a89462
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
2015-02-11 14:27:25 +08:00
KompjoeFriek
7f28230311
Fixed merge error
2015-02-10 21:37:18 +01:00
kompjoefriek
00edc542cb
Merged with upstream/v3
...
Merged with upstream/v3 and resolved merge conflicts
2015-02-10 21:27:20 +01: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
Vladimir Timofeev
653bf1549d
win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable.
2015-02-09 02:23:01 +03:00
yangxiao
2ac0b35283
fix render state
2015-02-06 10:09:23 +08:00
Nite Luo
ee2781e6a6
Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
...
Cmake build system fixes for MSVC (partial)
2015-02-04 23:18:08 -08:00
lvlong
6152925739
If parse the vertex attribute is fail, then discard the vertex attribute.
2015-02-04 16:19:30 +08:00
flamefox
4b405db77d
fix tab to space
2015-02-04 10:36:16 +08:00
flamefox
c2e17d6b1d
getAttachNode should failed when there is no bone with name
2015-02-04 10:32:44 +08:00
XiaoYang
c9fe5251a9
Merge pull request #229 from lvlonggame/v3
...
add Camera::project
2015-02-04 09:38:31 +08:00
yangxiao
19edeb971b
fix warning
2015-02-03 17:51:16 +08:00
yangxiao
66da4e8096
mac work
2015-02-03 17:38:40 +08:00
byeonggee.seo
753335726a
receive content data even though status code is not 2xx
2015-02-03 16:28:23 +09: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
Nite Luo
6f53719772
Merge pull request #10317 from darkdukey/G17hao-patch-12
...
Improve group command
2015-02-02 14:12:50 -08:00
yangxiao
265e6fec1a
fix index
2015-02-02 16:54:55 +08:00
yangxiao
f608377bdb
make vao work
2015-02-02 15:44:47 +08:00
byeonggee.seo
23e0320cac
HttpResponse reference counting bug fixed
2015-02-02 12:23:15 +09:00
lvlonggame
23df00b0b9
Merge branch 'v3' of github.com:lvlonggame/cocos2d-x into v3
2015-02-01 21:17:12 +08:00
lvlonggame
4c65332550
add project function to camera
2015-02-01 21:14:37 +08:00
Nite Luo
e9b4e4e19c
Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:59 -08:00
Nite Luo
07cda0db37
Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:31 -08:00
samuele3hu
fec0d9c41d
Set default value for `Content-Type` of headfield in `PUT` method
2015-01-31 22:15:15 +08:00
samuele3hu
75dc45bfea
Remove useless blank line
2015-01-31 15:21:03 +08:00
samuele3hu
e6d50d7086
Fix the error that the binary data would be truncated
2015-01-31 14:31:24 +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
806a5011e5
solve the problems noted in comments
2015-01-30 17:23:30 +08:00
tangziwen
10eced8b98
bug fix upload new sample texture
2015-01-30 15:46:39 +08:00
minggo
8efbafd09e
Merge pull request #10281 from Dhilan007/v3-win32-fix
...
Fixed compile error on win32
2015-01-29 19:48:29 +08:00
WenhaiLin
6873713c31
Fixed compile error on win32
2015-01-29 19:38:55 +08:00
minggo
dff7d6f639
Merge pull request #10277 from super626/v3
...
fix bug on loading .mtl
2015-01-29 19:21:31 +08: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
tangziwen
89cff149fc
add new ray intersection method ,add new Doc to explain the terrain
2015-01-29 18:06:00 +08:00
yangxiao
3eeeaf051f
fix load mtl
2015-01-29 17:54:22 +08:00
kompjoefriek
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
minggo
73e8026336
Merge pull request #10274 from darkdukey/forceDepthTest
...
Force depth test
2015-01-29 16:29:13 +08:00
Nite Luo
f914297703
Fix force depth write logic
2015-01-28 23:55:26 -08:00
minggo
18a45e36eb
Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix
...
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 13:56:11 +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
WenhaiLin
05db3bfd72
Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 11:55:49 +08:00
CocosRobot
fcf0a2272f
[AUTO]: updating luabinding automatically
2015-01-29 02:27:42 +00:00
minggo
de3e9be2c5
Merge pull request #10265 from samuele3hu/v3_4_fi
...
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-29 10:16:49 +08:00
minggo
8b635fea1c
Merge pull request #10250 from samuele3hu/v3_4_rc1
...
Fix the error that HttpClient-android didn’t set responseCode when connecting failed
2015-01-29 10:14:00 +08:00
minggo
2f04e7a6ac
Merge pull request #10239 from super626/v3
...
fix bug on uniform cache
2015-01-29 10:13:11 +08:00
zhukaixy
ee99700ec1
add test case TextureCube
2015-01-29 09:28:14 +08:00
samuele3hu
0ec8510f00
Fix linux compile error
2015-01-29 09:19:57 +08:00
kompjoefriek
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
Nite Luo
c0ff8d1177
Don't clear depth between queues
2015-01-28 15:28:14 -08:00
Nite Luo
94d5810efd
Merge pull request #10254 from super626/fixbillboard
...
Tested locally fix the billboad testcase
2015-01-28 14:06:53 -08:00
samuele3hu
80c2e0c153
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-28 21:47:52 +08:00
andyque
ac3d79a516
add constructor to AnimationInfo
2015-01-28 16:59:27 +08:00
minggo
34c132280e
Merge pull request #10244 from geron-cn/fixProjectNodeLoader
...
Fix project node crash in simulator and add its test-cpp
2015-01-28 15:30:53 +08:00
minggo
757c4a6cdb
Merge pull request #10253 from CocosRobot/update_lua_bindings_1422429538
...
[AUTO]: updating luabinding automatically
2015-01-28 15:24:52 +08:00
minggo
80cf4439f2
Merge pull request #10241 from Dhilan007/v3-scheduled-fix
...
Fixed may access wrong memory address in Scheduler::schedule
2015-01-28 15:22:40 +08:00
yangxiao
fc1dbf49fb
fix billboard
2015-01-28 15:21:57 +08:00
CocosRobot
ba5b23d2a5
[AUTO]: updating luabinding automatically
2015-01-28 07:21:15 +00: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
minggo
2738745614
Merge pull request #10248 from dabingnn/v3_fixRenderer
...
V3 fix renderer
2015-01-28 15:15:08 +08:00
samuele3hu
93665c5c6d
Fix the error that HttpClient didn’t setResponseCode when connecting failed
2015-01-28 13:49:19 +08:00
CocosRobot
78463a4a66
[AUTO]: updating luabinding automatically
2015-01-28 05:46:25 +00:00
minggo
f54916cf69
Merge pull request #10247 from samuele3hu/v3_4_fi
...
Add more 3D test case and adjust some binding function
2015-01-28 13:41:34 +08:00
samuele3hu
cd42806367
Fix the error of tolua_cocos2d_Mat4_decompose
2015-01-28 11:12:12 +08:00
Huabing.Xu
c8a783e4ac
use const auto&
2015-01-28 10:59:29 +08:00
samuele3hu
82a95bf2fc
Modify some script files
2015-01-28 10:57:30 +08:00
Huabing.Xu
5f5c00b7d2
remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE
2015-01-28 10:32:22 +08:00
minggo
8d681dfe7d
Merge pull request #10218 from andyque/fixIssue10183
...
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
2015-01-28 09:57:34 +08:00
samuele3hu
6208e9cba5
Add more test cases about 3D
2015-01-28 09:40:20 +08:00
Nite Luo
be6ca1b6d2
add force depth write
2015-01-27 17:05:51 -08:00
Nite Luo
c364323bbc
Not using static value to save previous render state since other commands like custom command could change them
2015-01-27 16:26:31 -08:00
Nite Luo
8f539a0107
Make PositionZ independent from global Z
2015-01-27 15:41:58 -08:00
Nite Luo
b89e255099
Finish organize the render queue
2015-01-27 14:41:16 -08:00
Nite Luo
78d8a694c8
Merge branch 'v3' into v3_fixRenderer
...
Conflicts:
cocos/renderer/CCRenderer.cpp
cocos/renderer/CCRenderer.h
2015-01-27 11:23:48 -08:00
Nite Luo
3c635d044e
Add Queue_count for render queues
2015-01-27 11:12:51 -08:00
Nite Luo
2be140fccc
Merge pull request #10225 from darkdukey/saveRenderState
...
save/restore render state
2015-01-27 11:12:05 -08:00
Nite Luo
75253d66ff
Merge branch 'v3' into v3_fixRenderer
2015-01-27 10:56:28 -08:00
geron-cn
df10a974fa
fix projectnode
2015-01-27 23:19:27 +08:00
minggo
f09626bcfb
Merge pull request #10235 from pipu/modify_parse_ignoresize
...
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 18:44:01 +08:00
WenhaiLin
d9bb6192dc
Fixed may access wrong memory in Scheduler::schedule
2015-01-27 17:29:12 +08:00
Huabing.Xu
cee1df2278
Merge branch 'v3' into v3_fixRenderer
2015-01-27 16:54:35 +08:00
yangxiao
220b34d105
Merge branch 'newcode' into v3
2015-01-27 16:35:54 +08:00
yangxiao
fad8f9f1da
format
2015-01-27 16:31:15 +08:00
yangxiao
af8a6c16b1
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-01-27 16:24:07 +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
lvlong
57970da398
Do some optimize
2015-01-27 15:50:05 +08:00
minggo
15bf919000
Merge pull request #10231 from geron-cn/fixanimationlistclone
...
FIX BUG: animationinfos lost after actiontimeline clone
2015-01-27 15:24:25 +08:00
tangziwen
9ec366a130
update terrain test add new method to get normal
2015-01-27 15:18:59 +08:00
pipu
ed1b7edce7
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 15:09:48 +08:00
Huabing.Xu
a38b210803
add depth in renderCommand
...
refactor rendering order of renderQueue
2015-01-27 14:29:09 +08:00
minggo
5a4fbf691b
Merge pull request #10234 from CocosRobot/update_lua_bindings_1422338223
...
[AUTO]: updating luabinding automatically
2015-01-27 14:00:36 +08:00
CocosRobot
4792a44a87
[AUTO]: updating luabinding automatically
2015-01-27 05:58:53 +00:00
minggo
880abfe814
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
...
Fix loading bar reload texture issue
2015-01-27 13:50:38 +08:00
minggo
e1afb7c789
Merge pull request #10226 from andyque/removeDuplicateCode
...
remove unused code
2015-01-27 13:50:15 +08:00
minggo
2a94ede427
Merge pull request #10227 from cpascal/add_EditBox_getDescription
...
Added override of ui::EditBox::getDescription()
2015-01-27 13:49:55 +08:00
geron-cn
390c336a19
FIX animationfio lost after actiontimeline clone
2015-01-27 12:04:14 +08:00
andyque
7b81f3a811
remove unused code
2015-01-27 10:17:41 +08:00
cpascal
d857164768
Added override of ui::EditBox::getDescription()
2015-01-27 11:10:04 +09:00
Nite Luo
15adaf2877
save/restore render state
2015-01-26 16:37:11 -08:00
geron-cn
d3baae0304
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader
2015-01-26 21:21:31 +08:00
geron-cn
a1a7273436
fix bug: fix crash when lack of projected file
2015-01-26 21:20:26 +08:00
lvlong
bb419719aa
fix bug: about caching uniform.
2015-01-26 18:40:00 +08:00
andyque
95e8072afa
fixed issue #10183
2015-01-26 18:26:59 +08:00
minggo
f54c6c93bb
Merge pull request #10215 from andyque/fixIssue10210
...
don't release the scale9Image when updateSprites
2015-01-26 17:58:21 +08:00
andyque
732050d940
don't release the scale9Image when updateSprites
2015-01-26 16:04:43 +08:00
minggo
5dc09d8489
Merge pull request #10208 from pipu/modify_parse_TMXTiledMap
...
Checking whether tileset is valid during parses TMXTiledMap.
2015-01-26 15:52:18 +08:00
Vladimir Timofeev
b6201f9328
cmake: try to fix lua-bindings for msvc
2015-01-26 10:09:49 +03:00
Vladimir Timofeev
991ea4532d
cmake: fix using of external/xxhash for msvc generated project
2015-01-26 10:03:49 +03:00
andyque
0e67cfcbff
improve loading Bar Test
2015-01-26 14:39:44 +08:00
minggo
cba0e19252
Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield
...
Change the order of detach and attach of TextField::upadate
2015-01-26 14:00:58 +08:00
minggo
4ac50f2c26
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
...
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
andyque
fdbf84a118
add uploading switch scale9 tests
2015-01-26 13:49:54 +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
pipu
35c1e73b8f
Checking whether tileset is valid during parses TMXTiledMap in GameMapReader.
2015-01-26 13:14:17 +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
minggo
bc1b588062
Merge pull request #10202 from dabingnn/v3_fixCrashWithNoVAO
...
V3 fix crash with no vao
2015-01-26 09:48:25 +08:00
WenhaiLin
9afa871164
Improved the parsing performance of bitmap fonts
2015-01-24 16:23:30 +08:00
Wenhai Lin
81198583f1
Fixed sets the page's base URL for WebView doesn't work.
2015-01-23 18:30:12 +08:00
Huabing.Xu
285a280bb4
enable attribute cache as before
2015-01-23 18:19:25 +08:00
Huabing.Xu
030394bffe
refactor the rendering and creation of DrawNode
...
make LayerColor rendering safer
2015-01-23 18:19:03 +08:00
tangziwen
d6c3320d49
fix memory leak
2015-01-23 18:14:44 +08:00
tangziwen
d04b3feb50
add new test, fix memory leak
2015-01-23 18:09:54 +08:00
minggo
ebc75579a2
Merge pull request #9838 from htlxyz/v3_origin
...
modify trans lua value to fontdefinition error
2015-01-23 16:55:01 +08:00
minggo
0addc3fb1d
Merge pull request #10173 from tmr111116/fix_random_int_overflow
...
fix random int overflow
2015-01-23 16:38:08 +08:00
minggo
516c6f1387
Merge pull request #10187 from joshuastray/fix-win32-editbox-clip
...
Fix win32 editbox content not clipped correctly
2015-01-23 16:16:00 +08:00
minggo
42b6fbd1c6
Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
...
Lua load chunks from zip supports folder structured lua
2015-01-23 16:13:09 +08:00
Huabing.Xu
421310f3a8
Merge branch 'v3' into v3_fixCrashNoVAO
...
Conflicts:
cocos/renderer/ccGLStateCache.cpp
2015-01-23 14:50:21 +08:00
Huabing.Xu
550fc44187
disbale cache for s_attributeFlags
2015-01-23 14:32:36 +08:00
Jialong Zhai
b295c8e817
fix indentation
2015-01-23 14:13:36 +08:00
Jialong Zhai
7ef80e9dae
Update UIEditBoxImpl-win32.cpp
2015-01-23 14:11:22 +08:00
minggo
44bcee60c7
Merge pull request #10182 from super626/v3
...
Fix bug on loading .obj's .mtl file
2015-01-23 12:02:00 +08:00
yangxiao
e336a4c86c
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-01-23 11:23:47 +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
minggo
38b0d25bc5
Merge pull request #10175 from andyque/fixSliderProgressRender
...
fix slider scale9 render
2015-01-22 17:59:17 +08:00
minggo
f9116f7c6d
Merge pull request #10166 from pipu/parse_anchorpointframe
...
Modify bug that parses AnchorPointFrame.
2015-01-22 17:58:08 +08:00
lvlong
662117e878
mtlPath
2015-01-22 17:33:24 +08:00
lvlong
c5f955466a
fixbug: load obj file's material.
2015-01-22 17:28:35 +08:00
andyque
94e35d8d95
fix slider scale9 render
2015-01-22 15:53:33 +08:00
tmr111116
757bc03ba8
fix random int overflow
...
before:
```
random(2147483648, 2147483649): -2147483648
```
after:
```
random(2147483648, 2147483649): 2147483649
```
code:
```
int64_t min = int64_t(INT_MAX) + 1;
int64_t max = int64_t(INT_MAX) + 2;
auto rand = cocos2d::random(min, max);
CCLOG("random(%lld, %lld): %lld", min, max, rand);
```
2015-01-22 16:46:57 +09:00
Ryo Miyajima
75847bc383
make CCTMXObjectGroup::getGroupName const
2015-01-22 16:37:51 +09:00
CocosRobot
ad9e5e21c3
[AUTO]: updating luabinding automatically
2015-01-22 06:08:11 +00:00
Huabing.Xu
a505c0e6e6
Merge pull request #10165 from samuele3hu/v3_4_rc1
...
Update Lua LayoutComponent Test case of UIEditTest
2015-01-22 14:02:31 +08:00
pipu
c0a662ff13
Modify bug that parses AnchorPointFrame.
2015-01-22 11:20:01 +08:00
samuele3hu
d74fb0e8b5
Update LayoutComponent Test case of UIEditTest
2015-01-22 10:21:38 +08:00
minggo
ece379bc64
Merge pull request #10162 from Dhilan007/v3-label-blockfix
...
Fixed label may become white/black block after resume from background on android
2015-01-22 09:48:10 +08:00
minggo
3eba023f2a
Merge pull request #10059 from cpascal/v3
...
Fixed inconsistent time-scale in Httpclient.
2015-01-22 09:47:40 +08:00
Dale Stammen
e5b54f8c47
updated precompiled shaders for wp8
2015-01-21 10:50:44 -08: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
a0091058f6
Merge pull request #10157 from dabingnn/v3_fixandroidCrashWithoutneon
...
only mathUtil.cpp compiles with neon
2015-01-21 20:23:20 +08:00
minggo
954f372775
Merge pull request #10156 from vovkasm/fix-warnings
...
Fix warnings
2015-01-21 20:23:00 +08:00
Huabing.Xu
daa6d47b40
only mathUtil.cpp compiles with neon
2015-01-21 18:29:28 +08:00
Vladimir Timofeev
6e01cab380
Fix, thanks @minggo!
2015-01-21 13:19:43 +03:00
Vladimir Timofeev
610e24b453
Fix warning: CCLOG_STRING_TAG not used by enclosing it in platform ifdef. Provide empty SendLogToWindow implementation by default.
2015-01-21 13:07:21 +03:00
Vladimir Timofeev
4e25ffbc7f
Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences.
2015-01-21 12:59:53 +03:00
CocosRobot
5e273da0ec
[AUTO]: updating luabinding automatically
2015-01-21 09:33:26 +00:00
minggo
72fb059aeb
Merge pull request #10144 from andyque/fixButtonPressActionIssue
...
fix button pressAction scale issue
2015-01-21 16:37:59 +08:00
WenhaiLin
5fd9ccfecb
Fixed AudioEngine causes game 'freeze' on Android
2015-01-21 16:18:47 +08:00
minggo
86b1f4594a
Merge pull request #10147 from geron-cn/fixProjectNodeLoader
...
ProjectNode's actiontimeline should jump to 0 frame when after nest i...
2015-01-21 15:49:39 +08:00
geron-cn
2fc79e2da5
ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd
2015-01-21 15:21:23 +08:00
minggo
97f29adf84
Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas
...
fix crash for textureAtlas
2015-01-21 15:02:06 +08:00
andyque
d58426db99
fix button pressAction scale issue
2015-01-21 14:54:37 +08:00
CocosRobot
4f7b6608c4
[AUTO]: updating luabinding automatically
2015-01-21 06:46:49 +00: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
Huabing.Xu
0ca47ab40f
fix crash for textureAtlas
2015-01-21 14:14:53 +08:00
minggo
335f69d95d
Merge pull request #10110 from super626/v3
...
Fix Animate3D speed bug and add parameter to Ray::intersects
2015-01-21 14:11:11 +08:00
minggo
607ae4c2ca
Merge pull request #10136 from andyque/fixSliderProgressBarRender
...
fix progress bar render issue when switch scale9
2015-01-21 14:10:18 +08:00
CocosRobot
b31b22491d
[AUTO]: updating luabinding automatically
2015-01-21 05:44:30 +00:00
andyque
7f7506fb99
fix progress bar render issue when switch scale9
2015-01-21 13:41:40 +08:00
minggo
08d392dd5f
Merge pull request #10132 from samuele3hu/v3_4_issue9537
...
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
2015-01-21 13:39:29 +08:00
samuele3hu
205ead5b63
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
2015-01-21 11:48:34 +08:00
minggo
342d12201b
Merge pull request #10131 from CocosRobot/update_lua_bindings_1421809643
...
[AUTO]: updating luabinding automatically
2015-01-21 11:12:42 +08:00
CocosRobot
8f099c7f0d
[AUTO]: updating luabinding automatically
2015-01-21 03:09:35 +00: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
abc6511ceb
Merge pull request #10125 from samuele3hu/v3_4_issue9537
...
issue #10107 : Binding AnimationInfo to lua
2015-01-21 11:02:11 +08:00
minggo
dca1edccd7
Merge pull request #10113 from liamcindy/Scale9Error
...
update for ui object scale9 state refresh
2015-01-21 10:51:55 +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
0d95e6595a
Merge pull request #10124 from CocosRobot/update_lua_bindings_1421806130
...
[AUTO]: updating luabinding automatically
2015-01-21 10:13:05 +08:00
CocosRobot
2f75d56c9b
[AUTO]: updating luabinding automatically
2015-01-21 02:10:47 +00:00
samuele3hu
666af29681
issue #10107 : Binding AnimationInfo to lua
2015-01-21 10:06:48 +08:00
minggo
5f37ba8096
Merge pull request #10095 from super626/fixnode
...
fix anchor point bug
2015-01-21 09:58:00 +08:00
minggo
e8b6705d29
Merge pull request #10071 from liamcindy/Text_2.4
...
fix uitext size error
2015-01-21 09:40:34 +08:00
minggo
f65e2690f3
Merge pull request #10122 from CocosRobot/update_lua_bindings_1421804049
...
[AUTO]: updating luabinding automatically
2015-01-21 09:37:28 +08:00
minggo
eb2ca9eef5
Merge pull request #10069 from liamcindy/Button_2.4
...
add function for ui button
2015-01-21 09:36:35 +08:00
CocosRobot
dae3e365ed
[AUTO]: updating luabinding automatically
2015-01-21 01:36:21 +00:00
minggo
6870692cfe
Merge pull request #10072 from liamcindy/TextBMFont
...
BMFont need to refresh size by refresh the string
2015-01-21 09:32:54 +08:00
minggo
38fbe91a5f
Merge pull request #10097 from doomsdayer/v3_version_1
...
Flatbuffer generation updated
2015-01-21 09:25:11 +08:00
minggo
b61a28633e
Merge pull request #10102 from andyque/addListViewReuseCell
...
Refactoring bad coding style
2015-01-21 09:24:56 +08:00
Liam
902fba0638
fix slider and loadingbar scale9 error
2015-01-20 20:57:54 +08:00
G17hao
29c4f83fd8
Update CCGroupCommand.cpp
...
add a vector container for save unused id.
traversal unordered_map is too slow, use vector to replace it
2015-01-20 19:28:30 +08:00
G17hao
ff1731eded
Update CCGroupCommand.h
...
add a vector container for save unused id.
traversal unordered_map is too slow, use vector to replace it
2015-01-20 19:27:01 +08:00